[Esbox-commits] r891 - in branches/micaSplit: org.indt.esbox.core.compatibility org.indt.esbox.core.compatibility/src/org/indt/esbox/internal/compatibility/core org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands org.maemo.esbox.maemosdk.ui org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/command org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/scratchbox org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/provider org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/scratchbox/sb1/sdk org.maemo.esbox.scratchbox.sb2 org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/provider org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/adapters org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/scratchbox/ui/actions
eswartz at garage.maemo.org
eswartz at garage.maemo.org
Fri Oct 24 03:22:54 EEST 2008
Author: eswartz
Date: 2008-10-24 03:22:53 +0300 (Fri, 24 Oct 2008)
New Revision: 891
Added:
branches/micaSplit/org.indt.esbox.core.compatibility/src/org/indt/esbox/internal/compatibility/core/ESboxOldCppProjectBuilder.java
branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/GazpachoPreferencePage.java
branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/XServerPreferencePage.java
Removed:
branches/micaSplit/org.indt.esbox.core.compatibility/src/org/indt/esbox/internal/compatibility/core/ESboxOldCppProjectBuilder.java
branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/ESboxGazpachoPreferencePage.java
branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/ESboxXServerPreferencePage.java
Modified:
branches/micaSplit/org.indt.esbox.core.compatibility/plugin.xml
branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/MaemoExecutionEnvironment.java
branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/X11ExecutionEnvironment.java
branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoLauncher.java
branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java
branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/OldStyleProjectProperties.java
branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/Scratchbox1PrepareTargetProcessLaunchAdapter.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/ESboxProductTestSuite.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1ProcessLauncher.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2ProcessLauncher.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/MockProcessLauncher.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestCreateTargetCommand.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestCreateTargetSb2Command.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGetCurrentTargetCommand.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListCommands.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListSb2Commands.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveCommand.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveSb2Command.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxCommand.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxFacade.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestSelectTargetCommand.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestShowPathMappingSb2Command.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestShowTargetCommand.java
branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestSimpleCommand.java
branches/micaSplit/org.maemo.esbox.maemosdk.ui/plugin.xml
branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java
branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/XDropdownMenuAction.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/SimpleCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/AddSbrshCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/ConfigureSbrshCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/MountTargetSbrshCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/UnmountTargetSbrshCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDKTarget.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/ScratchboxSDK.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/MaemoGdbServerSupportAdapter.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/command/ScratchboxCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/scratchbox/ScratchboxException.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDK.java
branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDKTarget.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/CreateTargetCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetCurrentTargetCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetGdbQemuCommandPatternCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetVersionScratchboxCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/KillallCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListCompilersCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListCputranspCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListDevkitsCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListSessionsCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListTargetsCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/RemoveTargetCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ResetTargetCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/RootstrapCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/SelectTargetCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ShowTargetCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDKTarget.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/provider/Scratchbox1SDKProvider.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1TargetWizard.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/TargetWizardDevkitsPage.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/scratchbox/sb1/sdk/IScratchbox1SDK.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/plugin.xml
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/CreateMaemoRootstrapSb2Command.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/CreateTargetSb2Command.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetCurrentTargetSb2Command.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetGdbQemuCommandPatternCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetMaemoRootstrapLocationCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetVersionScratchboxCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListAvailableMaemoRootstrapsSb2Command.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListCompilersSb2Command.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListCputranspSb2Command.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListInstalledMaemoRootstrapsSb2Command.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListTargetsCommand.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoRootstrapSb2Command.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/RemoveMaemoRootstrapSb2Command.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/RemoveTargetSb2Command.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ShowPathMappingSb2Command.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2FileSystemMapping.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/provider/Scratchbox2SDKProvider.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/MaemoRootstrapContentLabelProvider.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/NewScratchbox2TargetWizard.java
branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java
branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java
branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/TargetWizardCPUMethod.java
branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/TargetWizardCompilerPage.java
branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/scratchbox/ui/actions/ValidateVirtualMachineCommand.java
Log:
Remove "ESbox" from Mica plugins.
Modified: branches/micaSplit/org.indt.esbox.core.compatibility/plugin.xml
===================================================================
--- branches/micaSplit/org.indt.esbox.core.compatibility/plugin.xml 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.indt.esbox.core.compatibility/plugin.xml 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
point="org.eclipse.core.resources.natures">
<runtime>
<run
- class="org.maemo.mica.cpp.project.core.OldESboxProjectNature">
+ class="org.maemo.mica.internal.api.cpp.project.core.OldESboxProjectNature">
</run>
</runtime>
</extension>
Deleted: branches/micaSplit/org.indt.esbox.core.compatibility/src/org/indt/esbox/internal/compatibility/core/ESboxOldCppProjectBuilder.java
===================================================================
--- branches/micaSplit/org.indt.esbox.core.compatibility/src/org/indt/esbox/internal/compatibility/core/ESboxOldCppProjectBuilder.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.indt.esbox.core.compatibility/src/org/indt/esbox/internal/compatibility/core/ESboxOldCppProjectBuilder.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.indt.esbox.internal.compatibility.core;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.maemo.mica.common.project.core.IOldESboxProjectBuilder;
-
-import java.util.Map;
-
-/**
- * This builder runs when old projects are detected, and merely emits a Problem about the project
- * being out of date.
- * @author eswartz
- *
- */
-public class ESboxOldCppProjectBuilder extends IncrementalProjectBuilder implements IOldESboxProjectBuilder {
-
- public ESboxOldCppProjectBuilder() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IncrementalProjectBuilder#build(int, java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
- */
- @Override
- protected IProject[] build(final int kind, Map args, IProgressMonitor monitor)
- throws CoreException {
-
- if (kind == AUTO_BUILD)
- return null;
-
- IProject project = getProject();
-
- IMarker[] markers = project.findMarkers(IMarker.PROBLEM, false, 0);
-
- boolean found = false;
- for (IMarker marker : markers) {
- if (marker.getAttribute(IOldESboxProjectBuilder.ATTR_NEEDS_CONVERSION) != null) {
- found = true;
- break;
- }
- }
-
- if (!found) {
- IMarker marker = project.createMarker(IMarker.PROBLEM);
- marker.setAttribute(IMarker.MESSAGE, "Outdated project format; please convert (File > New > Convert to Maemo C/C++ Project)");
- marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- marker.setAttribute(IOldESboxProjectBuilder.ATTR_NEEDS_CONVERSION, Boolean.TRUE);
- }
-
- return null;
- }
-
-
-}
Added: branches/micaSplit/org.indt.esbox.core.compatibility/src/org/indt/esbox/internal/compatibility/core/ESboxOldCppProjectBuilder.java
===================================================================
--- branches/micaSplit/org.indt.esbox.core.compatibility/src/org/indt/esbox/internal/compatibility/core/ESboxOldCppProjectBuilder.java (rev 0)
+++ branches/micaSplit/org.indt.esbox.core.compatibility/src/org/indt/esbox/internal/compatibility/core/ESboxOldCppProjectBuilder.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.indt.esbox.internal.compatibility.core;
+
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.maemo.mica.common.project.core.IOldESboxProjectBuilder;
+
+import java.util.Map;
+
+/**
+ * This builder runs when old projects are detected, and merely emits a Problem about the project
+ * being out of date.
+ * @author eswartz
+ *
+ */
+public class ESboxOldCppProjectBuilder extends IncrementalProjectBuilder implements IOldESboxProjectBuilder {
+
+ public ESboxOldCppProjectBuilder() {
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.resources.IncrementalProjectBuilder#build(int, java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected IProject[] build(final int kind, Map args, IProgressMonitor monitor)
+ throws CoreException {
+
+ if (kind == AUTO_BUILD)
+ return null;
+
+ IProject project = getProject();
+
+ IMarker[] markers = project.findMarkers(IMarker.PROBLEM, false, 0);
+
+ boolean found = false;
+ for (IMarker marker : markers) {
+ if (marker.getAttribute(IOldESboxProjectBuilder.ATTR_NEEDS_CONVERSION) != null) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ IMarker marker = project.createMarker(IMarker.PROBLEM);
+ marker.setAttribute(IMarker.MESSAGE, "Outdated project format; please convert (File > New > Convert to Maemo C/C++ Project)");
+ marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
+ marker.setAttribute(IOldESboxProjectBuilder.ATTR_NEEDS_CONVERSION, Boolean.TRUE);
+ }
+
+ return null;
+ }
+
+
+}
Property changes on: branches/micaSplit/org.indt.esbox.core.compatibility/src/org/indt/esbox/internal/compatibility/core/ESboxOldCppProjectBuilder.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/MaemoExecutionEnvironment.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/MaemoExecutionEnvironment.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/MaemoExecutionEnvironment.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -17,7 +17,7 @@
import org.eclipse.swt.widgets.Shell;
import org.maemo.esbox.internal.api.maemosdk.core.tools.MaemoScriptLauncher;
import org.maemo.esbox.internal.maemosdk.core.Activator;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.ISDKTarget;
import org.maemo.mica.common.project.core.ProjectManager;
@@ -53,7 +53,7 @@
MaemoScriptLauncher.getInstance().startMaemo(sdkTarget);
}
}
- } catch (ESboxException e) {
+ } catch (MicaException e) {
Activator.getErrorLogger().logAndShowError(
"Error querying Maemo status", e);
// don't fail the launch
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/X11ExecutionEnvironment.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/X11ExecutionEnvironment.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/X11ExecutionEnvironment.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -17,7 +17,7 @@
import org.eclipse.swt.widgets.Shell;
import org.maemo.esbox.internal.api.maemosdk.core.tools.MaemoScriptLauncher;
import org.maemo.esbox.internal.maemosdk.core.Activator;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.ISDKTarget;
import org.maemo.mica.common.project.core.ProjectManager;
@@ -50,7 +50,7 @@
ISDKTarget sdkTarget;
try {
sdkTarget = ProjectManager.getInstance().getSDKTarget(project);
- } catch (ESboxException e1) {
+ } catch (MicaException e1) {
throw new CoreException(Activator.createErrorStatus(
"Not an ESbox project: " + project, e1));
}
@@ -64,7 +64,7 @@
MaemoScriptLauncher.getInstance().startX();
}
}
- } catch (ESboxException e) {
+ } catch (MicaException e) {
Activator.getErrorLogger().logAndShowError(
"Error querying X status", e);
// don't fail the launch
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoLauncher.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoLauncher.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoLauncher.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -54,7 +54,7 @@
this.sdkTarget = sdkTarget;
}
- private void performCommand(List<String> params) throws ESboxException {
+ private void performCommand(List<String> params) throws MicaException {
String maemoCommand = sdkTarget.getPreferenceValue(
MaemoPreferenceConstants.MAEMO_COMMAND);
maemoCommand = this.replaceActions(maemoCommand,params.get(0));
@@ -104,7 +104,7 @@
}
ErrorLogger errorLogger = Activator.getErrorLogger();
errorLogger.logAndShowError("Error launching maemo",
- new ESboxException(content));
+ new MicaException(content));
}
});
@@ -120,9 +120,9 @@
}
}
- public void startMaemoCommand(ISDKTarget sdkTarget) throws ESboxException {
+ public void startMaemoCommand(ISDKTarget sdkTarget) throws MicaException {
if (sdkTarget == null) {
- throw new ESboxException("No SDK target specified");
+ throw new MicaException("No SDK target specified");
}
List<String> params = getParamList(MaemoPreferenceConstants.MAEMO_START_ACTION);
@@ -130,9 +130,9 @@
performCommand(params);
}
- public void stopMaemoCommand(ISDKTarget sdkTarget) throws ESboxException {
+ public void stopMaemoCommand(ISDKTarget sdkTarget) throws MicaException {
if (sdkTarget == null) {
- throw new ESboxException("No SDK target specified");
+ throw new MicaException("No SDK target specified");
}
List<String> params = getParamList(MaemoPreferenceConstants.MAEMO_STOP_ACTION);
@@ -140,9 +140,9 @@
}
public void restartMaemoCommand(ISDKTarget sdkTarget)
- throws ESboxException {
+ throws MicaException {
if (sdkTarget == null) {
- throw new ESboxException("No SDK target specified");
+ throw new MicaException("No SDK target specified");
}
List<String> params = getParamList(MaemoPreferenceConstants.MAEMO_RESTART_ACTION);
@@ -167,11 +167,11 @@
*
* @param sdkTarget
* @return true if maemo process found
- * @throws ESboxException
+ * @throws MicaException
* if query is impossible
*/
private boolean testMaemoLauncher(ISDKTarget sdkTarget)
- throws ESboxException {
+ throws MicaException {
List<IProcess> runningProcesses = getMaemoLaunchers(sdkTarget.getSDK()
.getMachine());
return runningProcesses.size() > 0;
@@ -193,7 +193,7 @@
* @param sdkTarget
* @return flag
*/
- public boolean isMaemoRunning(ISDKTarget sdkTarget) throws ESboxException {
+ public boolean isMaemoRunning(ISDKTarget sdkTarget) throws MicaException {
return testMaemoLauncher(sdkTarget);
}
@@ -201,12 +201,12 @@
* Start maemo if it's not running.
*
* @param sdkTarget
- * @throws ESboxException
+ * @throws MicaException
* if already running or cannot be started
*/
- public void startMaemo(ISDKTarget sdkTarget) throws ESboxException {
+ public void startMaemo(ISDKTarget sdkTarget) throws MicaException {
if (isMaemoRunning(sdkTarget))
- throw new ESboxException("Maemo is already running");
+ throw new MicaException("Maemo is already running");
MaemoCommand maemoCommand = new MaemoCommand(sdkTarget);
maemoCommand.startMaemoCommand(sdkTarget);
@@ -216,10 +216,10 @@
* Stop maemo if it's running
*
* @param sdkTarget
- * @throws ESboxException
+ * @throws MicaException
* if not running or cannot be stopped
*/
- public void stopMaemo(ISDKTarget sdkTarget) throws ESboxException {
+ public void stopMaemo(ISDKTarget sdkTarget) throws MicaException {
// always try... may be half-initialized
// if (!isMaemoRunning(sdkTarget))
// throw new
@@ -233,10 +233,10 @@
* Restart maemo
*
* @param sdkTarget
- * @throws ESboxException
+ * @throws MicaException
* if cannot be restarted
*/
- public void restartMaemo(ISDKTarget sdkTarget) throws ESboxException {
+ public void restartMaemo(ISDKTarget sdkTarget) throws MicaException {
MaemoCommand maemoCommand = new MaemoCommand(sdkTarget);
maemoCommand.restartMaemoCommand(sdkTarget);
}
@@ -245,9 +245,9 @@
* Kill maemo by forcibly killing instances of the launcher left behind
*
* @param sdkTarget
- * @throws ESboxException
+ * @throws MicaException
*/
- public void killMaemo(ISDKTarget sdkTarget) throws ESboxException {
+ public void killMaemo(ISDKTarget sdkTarget) throws MicaException {
List<IProcess> pids = getMaemoLaunchers(sdkTarget.getSDK().getMachine());
if (pids.size() == 0)
return;
@@ -270,7 +270,7 @@
process.kill();
}
} catch (IOException e) {
- throw new ESboxException("Could not kill " + MAEMO_LAUNCHER_APP, e);
+ throw new MicaException("Could not kill " + MAEMO_LAUNCHER_APP, e);
}
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -65,7 +65,7 @@
/**
* Method that start X-environment for Scratchbox
*/
- public void startX() throws ESboxException {
+ public void startX() throws MicaException {
XLauncher.getInstance().startX(
CorePreferenceManager.getInstance().getPreferenceProvider());
@@ -74,11 +74,11 @@
/**
* Method that stop X-environment for Scratchbox
*/
- public void stopX(ISDKTarget sdkTarget) throws ESboxException {
+ public void stopX(ISDKTarget sdkTarget) throws MicaException {
if (sdkTarget != null
&& MaemoLauncher.getInstance().isMaemoRunning(sdkTarget))
- throw new ESboxException("Maemo is still running. Stop Maemo first");
+ throw new MicaException("Maemo is still running. Stop Maemo first");
XLauncher.getInstance().stopX(
CorePreferenceManager.getInstance().getPreferenceProvider());
@@ -93,7 +93,7 @@
* the user-visible name for the process
*/
public void killProcess(IMachine machine, String processName,
- String processLabel) throws ESboxException {
+ String processLabel) throws MicaException {
List<IProcess> processes = machine.getProcessLister().getProcesses(
new ProcessFilterCmdLineRegexp(".*" + processName + ".*"));
@@ -101,7 +101,7 @@
try {
process.terminate();
} catch (IOException e) {
- throw new ESboxException("Error killing " + processName, e);
+ throw new MicaException("Error killing " + processName, e);
}
}
}
@@ -110,9 +110,9 @@
* Method that run command autogen.sh for the project
*
* @param project
- * @throws ESboxException
+ * @throws MicaException
*/
- public void runAutogen(IProject project) throws ESboxException {
+ public void runAutogen(IProject project) throws MicaException {
runAutogen(project, null, null);
}
@@ -130,7 +130,7 @@
* @return exit code, if monitor is not null
*/
public int runAutogen(IProject project, IProgressMonitor monitor, IPath path)
- throws ESboxException {
+ throws MicaException {
ensureBuildMachine(project, null);
return runScript(path != null ? path : project.getLocation(),
"./autogen.sh", "Running automake script (autogen.sh) ["
@@ -142,9 +142,9 @@
* run ./configure for the project
*
* @param project
- * @throws ESboxException
+ * @throws MicaException
*/
- public void runConfigure(IProject project) throws ESboxException {
+ public void runConfigure(IProject project) throws MicaException {
runConfigure(project, null, null);
}
@@ -160,10 +160,10 @@
* if <code>null</code>, use the project location, else override
* the directory
* @return exit code, if monitor is not null
- * @throws ESboxException
+ * @throws MicaException
*/
public int runConfigure(IProject project, IProgressMonitor monitor,
- IPath path) throws ESboxException {
+ IPath path) throws MicaException {
ensureBuildMachine(project, null);
return runScript(path != null ? path : project.getLocation(),
"./configure", "Running automake script (configure) ["
@@ -190,7 +190,7 @@
*/
public void runEstablishAutoMakefiles(IProject project,
IProgressMonitor monitor, IPath path, String makefileName)
- throws ESboxException {
+ throws MicaException {
if (monitor == null)
monitor = new NullProgressMonitor();
@@ -302,14 +302,14 @@
// final check
if (failedConfigure || failedAutogen) {
String message = "Autogen or configure ran with errors.\nCheck the Console for autotools messages.";
- throw new ESboxException(message);
+ throw new MicaException(message);
} else if (!makefile.exists()) {
String message = "Cannot find or create " + makefileName
+ " in project '" + project.getName() + "'.\n";
if (triedToAutomake)
message += "\nCheck the Console for autotools messages.";
- throw new ESboxException(message);
+ throw new MicaException(message);
}
monitor.done();
@@ -400,7 +400,7 @@
*/
private int runScript(IPath path, String scriptname, final String comment,
String errormessage, IProgressMonitor monitor,
- final IProject project) throws ESboxException {
+ final IProject project) throws MicaException {
verifyFiles(new IPath[] { path.append(scriptname) });
IPath wd = path;
@@ -495,7 +495,7 @@
} catch (OperationCanceledException e) {
// ignore
} catch (Exception e) {
- throw new ESboxException(e);
+ throw new MicaException(e);
}
return exits[0];
}
@@ -508,7 +508,7 @@
* @return IStatus status of build
*/
public void createDebianPackage(final IProject project,
- IProgressMonitor monitor) throws ESboxException {
+ IProgressMonitor monitor) throws MicaException {
monitor.beginTask("", IProgressMonitor.UNKNOWN);
monitor.subTask("Creating package");
@@ -542,7 +542,7 @@
try {
exit = waitForProcess(sbp, monitor);
if (exit != 0) {
- throw new ESboxException(
+ throw new MicaException(
"Package creation failed; see Console (exit code "
+ exit + ")");
}
@@ -550,10 +550,10 @@
project.refreshLocal(IResource.DEPTH_INFINITE,
new NullProgressMonitor());
} catch (CoreException e) {
- throw new ESboxException(e);
+ throw new MicaException(e);
}
} catch (InterruptedException e1) {
- throw new ESboxException("Package creation interrupted");
+ throw new MicaException("Package creation interrupted");
}
monitor.done();
@@ -597,10 +597,10 @@
}
}
- private void verifyFiles(IPath[] files) throws ESboxException {
+ private void verifyFiles(IPath[] files) throws MicaException {
for (IPath file : files) {
if (!file.toFile().exists())
- throw new ESboxException("File " + file.toPortableString()
+ throw new MicaException("File " + file.toPortableString()
+ " does not exist");
}
}
@@ -618,7 +618,7 @@
throws CoreException {
try {
createDebianPackage(project, monitor);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
return Activator.createErrorStatus(
"Failed to create Debian package", e);
}
@@ -633,19 +633,19 @@
try {
if (!isXServerStarted(sdkTarget))
return false;
- } catch (ESboxException e1) {
+ } catch (MicaException e1) {
}
try {
return MaemoLauncher.getInstance().isMaemoRunning(sdkTarget);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
Activator.getErrorLogger().logError("Cannot test maemo status", e);
return false;
}
}
public boolean isXServerStarted(IPreferenceProvider prefProvider)
- throws ESboxException {
+ throws MicaException {
return XLauncher.getInstance().isXServerStarted(prefProvider);
}
@@ -675,7 +675,7 @@
*/
/** Stop Maemo if it is running. */
- public void stopMaemo(ISDKTarget sdkTarget) throws ESboxException {
+ public void stopMaemo(ISDKTarget sdkTarget) throws MicaException {
// maemo processes can still be running...
// if (!isXServerStarted(sdkTarget))
// throw new
@@ -690,7 +690,7 @@
* This kills maemo if X is not running, since maemo may be left hanging is
* X is killed.
*/
- public void startMaemo(ISDKTarget sdkTarget) throws ESboxException {
+ public void startMaemo(ISDKTarget sdkTarget) throws MicaException {
if (!XLauncher.getInstance().isXServerStarted(sdkTarget)) {
MaemoLauncher.getInstance().killMaemo(sdkTarget);
}
@@ -706,7 +706,7 @@
* This kills maemo if X is not running, since maemo may be left hanging is
* X is killed.
*/
- public void restartMaemo(ISDKTarget sdkTarget) throws ESboxException {
+ public void restartMaemo(ISDKTarget sdkTarget) throws MicaException {
if (!XLauncher.getInstance().isXServerStarted(sdkTarget)) {
MaemoLauncher.getInstance().killMaemo(sdkTarget);
}
@@ -720,7 +720,7 @@
/**
* Kill maemo. Does not kill X.
*/
- public void killMaemo(ISDKTarget target) throws ESboxException {
+ public void killMaemo(ISDKTarget target) throws MicaException {
MaemoLauncher.getInstance().killMaemo(target);
}
@@ -733,17 +733,17 @@
* @param monitor
*/
public void ensureBuildMachine(IProject project, IProgressMonitor monitor)
- throws ESboxException {
+ throws MicaException {
if (monitor == null)
monitor = new NullProgressMonitor();
ISDK sdk = ProjectManager.getInstance().getSDK(project);
if (sdk == null)
- throw new ESboxException("Invalid SDK for project: " + project);
+ throw new MicaException("Invalid SDK for project: " + project);
IMachine machine = sdk.getMachine();
IStatus status = MachineManager.getInstance().acquireMachine(machine,
monitor);
if (!status.isOK())
- throw new ESboxException(status.getMessage(), status.getException());
+ throw new MicaException(status.getMessage(), status.getException());
}
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -58,13 +58,13 @@
* @param display
* the DISPLAY value, e.g. ":2" or ":0.0" or "myhost:0"
* @return true if connection succeeded
- * @throws ESboxException
+ * @throws MicaException
* if query is impossible
*/
- private boolean testXConnection(String display) throws ESboxException {
+ private boolean testXConnection(String display) throws MicaException {
String[] parts = display.split(":");
if (parts.length != 2)
- throw new ESboxException(
+ throw new MicaException(
MessageFormat
.format(
"DISPLAY variable ''{0}'' does not have expected syntax [host]:<number>[.<number>]",
@@ -90,7 +90,7 @@
try {
displayNumber = Integer.parseInt(displayParts[0]);
} catch (NumberFormatException e) {
- throw new ESboxException(
+ throw new MicaException(
MessageFormat
.format(
"DISPLAY variable ''{0}'' does not have expected syntax [host]:<number>[.<number>]",
@@ -113,13 +113,13 @@
* @return
*/
public boolean isXServerStarted(IPreferenceProvider prefProvider)
- throws ESboxException {
+ throws MicaException {
return testXConnection(getDisplayValue(prefProvider));
}
/** Be nice and start X if needed before starting/restarting maemo */
public void startXIfNeeded(IPreferenceProvider prefProvider)
- throws ESboxException {
+ throws MicaException {
waitForXLaunch();
if (!isXServerStarted(prefProvider)) {
startX(prefProvider);
@@ -154,11 +154,11 @@
}
public void startX(final IPreferenceProvider prefProvider)
- throws ESboxException {
+ throws MicaException {
waitForXLaunch();
if (isXServerStarted(prefProvider))
- throw new ESboxException("X Server is already running");
+ throw new MicaException("X Server is already running");
String viewer = getDisplayXServerCommand(prefProvider);
final String display = getDisplayValue(prefProvider);
@@ -171,7 +171,7 @@
IMachine localMachine = MachineRegistry.getInstance()
.getLocalMachine();
if (localMachine == null)
- throw new ESboxException("Cannot find local machine");
+ throw new MicaException("Cannot find local machine");
IProcessLauncherFactory factory = localMachine.getProcessLauncherFactory();
IEnvironmentModifierBlock envBlock = null;
@@ -201,7 +201,7 @@
try {
if (testXConnection(display))
break;
- } catch (ESboxException e) {
+ } catch (MicaException e) {
return Activator.createErrorStatus(
"Failed to check X connection", e);
}
@@ -256,11 +256,11 @@
}
- public void stopX(IPreferenceProvider prefProvider) throws ESboxException {
+ public void stopX(IPreferenceProvider prefProvider) throws MicaException {
waitForXLaunch();
if (!isXServerStarted(prefProvider))
- throw new ESboxException(
+ throw new MicaException(
"X Server was not started. Start X Server first");
String server = getDisplayXServerCommand(prefProvider);
@@ -273,7 +273,7 @@
IMachine localMachine = MachineRegistry.getInstance()
.getLocalMachine();
if (localMachine == null)
- throw new ESboxException("Cannot find local machine");
+ throw new MicaException("Cannot find local machine");
MaemoScriptLauncher.getInstance().killProcess(localMachine,
cmdLine.get(0), "X Server");
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/OldStyleProjectProperties.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/OldStyleProjectProperties.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/OldStyleProjectProperties.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -17,7 +17,7 @@
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
import org.maemo.esbox.scratchbox.core.sdk.ScratchboxSDKFacade;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.execEnv.*;
import org.maemo.mica.common.core.sdk.ISDK;
import org.maemo.mica.common.core.sdk.ISDKTarget;
@@ -107,12 +107,12 @@
* Get the SDK target (SDK + target name) for the project's configured SDK
*
* @return SDK target, never <code>null</code>
- * @throws ESboxException
+ * @throws MicaException
* if no target known
*/
- public ISDKTarget getSDKTarget() throws ESboxException {
+ public ISDKTarget getSDKTarget() throws MicaException {
if (!project.isOpen())
- throw new ESboxException(MessageFormat.format(
+ throw new MicaException(MessageFormat.format(
"Project ''{0}'' is not open", project.getName()));
ISDK sdk = getSDK();
@@ -120,7 +120,7 @@
ISDKTarget target = sdk.findSDKTarget(targetName);
if (target == null) {
- throw new ESboxException(MessageFormat.format(
+ throw new MicaException(MessageFormat.format(
"Project ''{0}'' references an unavailable target ''{1}''",
project.getName(), targetName));
}
@@ -132,10 +132,10 @@
* Get the SDK for the project
*
* @return SDK, never <code>null</code>
- * @throws ESboxException
+ * @throws MicaException
* if no SDK known
*/
- public ISDK getSDK() throws ESboxException {
+ public ISDK getSDK() throws MicaException {
ISDK sdk = null;
String version = readProperty(scratchboxVersionProperty);
@@ -154,7 +154,7 @@
}
if (sdk == null) {
- throw new ESboxException(
+ throw new MicaException(
MessageFormat
.format(
"Project ''{0}'' uses an unsupported scratchbox version {1}",
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/Scratchbox1PrepareTargetProcessLaunchAdapter.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/Scratchbox1PrepareTargetProcessLaunchAdapter.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/Scratchbox1PrepareTargetProcessLaunchAdapter.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -17,7 +17,7 @@
import org.maemo.esbox.internal.maemosdk.core.Activator;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.sb1.sdk.IScratchbox1SDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.GeneralUtils;
import org.maemo.mica.common.core.adapters.IPrepareTargetProcessLaunchAdapter;
import org.maemo.mica.common.core.process.*;
@@ -40,7 +40,7 @@
this.sdkTarget = sdkTarget;
}
- public void prepareTargetForProcessLaunch() throws ESboxException {
+ public void prepareTargetForProcessLaunch() throws MicaException {
IScratchbox1SDK sdk = ((IScratchbox1SDK) sdkTarget.getSDK());
final String currentTarget = sdk.getCurrentTarget();
final String targetName = sdkTarget.getName();
@@ -97,12 +97,12 @@
// maemo-launcher.
try {
MaemoLauncher.getInstance().killMaemo(sdkTarget);
- } catch (ESboxException e2) {
+ } catch (MicaException e2) {
// ignore
}
try {
XLauncher.getInstance().stopX(sdkTarget);
- } catch (ESboxException e2) {
+ } catch (MicaException e2) {
// ignore
}
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/ESboxProductTestSuite.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/ESboxProductTestSuite.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/ESboxProductTestSuite.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -11,7 +11,7 @@
package org.maemo.esbox.scratchbox.tests;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.machine.*;
import junit.framework.Test;
@@ -33,16 +33,16 @@
for (IBuildMachine machine : MachineRegistry.getInstance().getBuildMachines()) {
try {
MachineUtils.acquireMachine(machine);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
}
}
- suite.addTest(org.maemo.mica.common.core.tests.ESboxCoreTestSuite.suite());
+ suite.addTest(org.maemo.mica.common.core.tests.MicaCoreTestSuite.suite());
suite.addTest(org.maemo.esbox.scratchbox.tests.ESboxMaemoSDKTestSuite.suite());
- suite.addTest(org.maemo.mica.linux.tests.ESboxLinuxTestSuite.suite());
- suite.addTest(org.maemo.mica.cpp.tests.ESboxCppTestSuite.suite());
- suite.addTest(org.maemo.mica.python.tests.ESboxPythonTestSuite.suite());
- suite.addTest(org.maemo.mica.protocol.tests.ESboxDeviceTestSuite.suite());
+ suite.addTest(org.maemo.mica.linux.tests.MicaLinuxTestSuite.suite());
+ suite.addTest(org.maemo.mica.cpp.tests.MicaCppTestSuite.suite());
+ suite.addTest(org.maemo.mica.python.tests.MicaPythonTestSuite.suite());
+ suite.addTest(org.maemo.mica.protocol.tests.MicaDeviceTestSuite.suite());
//$JUnit-BEGIN$
//$JUnit-END$
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.eclipse.core.filesystem.provider.FileInfo;
import org.eclipse.core.runtime.*;
import org.junit.Test;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.env.EnvironmentManager;
import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
import org.maemo.mica.common.core.machine.IMachine;
@@ -48,7 +48,7 @@
super.setUp();
}
- protected List<ISDK> getSDKs() throws ESboxException {
+ protected List<ISDK> getSDKs() throws MicaException {
ArrayList<ISDK> sdks = new ArrayList<ISDK>();
for (IMachine machine : MachineRegistry.getInstance().getBuildMachines()) {
if (machine.getOS().equals(Platform.OS_LINUX))
@@ -267,7 +267,7 @@
new ByteArrayOutputStream());
int exit = process.exitValue();
assertTrue(exit != 0);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1ProcessLauncher.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1ProcessLauncher.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1ProcessLauncher.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import org.eclipse.core.runtime.*;
import org.junit.Test;
import org.maemo.esbox.internal.scratchbox.sb1.provider.Scratchbox1SDKProvider;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.env.EnvironmentManager;
import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
import org.maemo.mica.common.core.process.*;
@@ -60,7 +60,7 @@
@SuppressWarnings("unchecked")
@Override
- protected List<ISDK> getSDKs() throws ESboxException {
+ protected List<ISDK> getSDKs() throws MicaException {
if (sdks == null) {
if (sb1Provider == null)
sdks = Collections.EMPTY_LIST;
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.junit.Test;
import org.maemo.esbox.internal.scratchbox.sb1.provider.Scratchbox1SDKProvider;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.machine.ILocalMachine;
import org.maemo.mica.common.core.sdk.*;
import org.maemo.mica.common.core.tests.core.BaseTest;
@@ -155,7 +155,7 @@
// at least don't throw
//assertEquals(sbPath, target.convertHostToTargetPath(hostPath));
target.convertHostToTargetPath(hostPath);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
fail(e.getMessage());
}
}
@@ -182,7 +182,7 @@
try {
sbPath = target.convertHostToTargetPath(hostPath);
fail();
- } catch (ESboxException e) {
+ } catch (MicaException e) {
}
IPath rootstrapPath = ((IScratchboxSDKTarget) target).getRootstrapPath();
@@ -194,7 +194,7 @@
assertTrue(store.fetchInfo().exists());
assertTrue(store.getChild("/lib").fetchInfo().exists());
}
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// just handle it
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2ProcessLauncher.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2ProcessLauncher.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2ProcessLauncher.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -63,7 +63,7 @@
@SuppressWarnings("unchecked")
@Override
- protected List<ISDK> getSDKs() throws ESboxException {
+ protected List<ISDK> getSDKs() throws MicaException {
if (sdks == null) {
if (sb2Provider == null)
sdks = Collections.EMPTY_LIST;
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.junit.Test;
import org.maemo.esbox.internal.scratchbox.sb2.provider.Scratchbox2SDKProvider;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.machine.ILocalMachine;
import org.maemo.mica.common.core.sdk.*;
@@ -123,7 +123,7 @@
if (target.getSDK().getMachine() instanceof ILocalMachine) {
try {
sbPath = target.convertHostToTargetPath(hostPath);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
fail(e.toString());
}
assertEquals(hostPath, sbPath);
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/MockProcessLauncher.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/MockProcessLauncher.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/MockProcessLauncher.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -14,7 +14,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.ui.console.MessageConsole;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
import org.maemo.mica.common.core.process.IProcessLauncher;
import org.maemo.mica.common.core.process.IStreamLineMonitor;
@@ -42,7 +42,7 @@
/* (non-Javadoc)
* @see org.maemo.esbox.common.core.IProcessLauncher#createProcess()
*/
- public Process createProcess() throws ESboxException {
+ public Process createProcess() throws MicaException {
theProcess = new Process() {
@Override
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestCreateTargetCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestCreateTargetCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestCreateTargetCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxCommand;
import org.maemo.esbox.scratchbox.sb1.sdk.IScratchbox1SDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.ArrayList;
@@ -45,7 +45,7 @@
private final String TARGET_NAME = "TEST_TARGET";
- public void testPerformCommand() throws ESboxException {
+ public void testPerformCommand() throws MicaException {
ScratchboxCommand createTargetCommand = new CreateTargetCommand(sb1Sdk, sb1Command);
List<String> param = new ArrayList<String>();
@@ -56,7 +56,7 @@
try {
createTargetCommand.performCommand(param);
fail("Number of args is invalid");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
param.add("qemu-arm-0.8.2-sb2");
@@ -80,7 +80,7 @@
try {
createTargetCommand.performCommand(param);
fail("Cannot create a TARGET without a compiler.");
- } catch (ESboxException se) {
+ } catch (MicaException se) {
// expected
}
targetsAvailable = new ListTargetsCommand(sb1Command)
@@ -88,7 +88,7 @@
assertTrue(!targetsAvailable.contains(TARGET_NAME));
}
- private void removeTestTarget() throws ESboxException {
+ private void removeTestTarget() throws MicaException {
ScratchboxCommand removeCommand = new RemoveTargetCommand(sb1Sdk, sb1Command);
List<String> removeParam = new ArrayList<String>();
removeParam.add(TARGET_NAME);
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestCreateTargetSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestCreateTargetSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestCreateTargetSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -2,7 +2,7 @@
import org.maemo.esbox.internal.scratchbox.sb2.command.CreateTargetSb2Command;
import org.maemo.esbox.scratchbox.core.command.ScratchboxCommand;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import java.util.ArrayList;
import java.util.List;
@@ -14,7 +14,7 @@
private final String COMPILER = "/opt/maemo/tools/arm-2007q3/bin/arm-none-linux-gnueabi-gcc";
private final String CPUTRANSP = "sb2-qemu-arm";
- public void testPerformCommand() throws ESboxException {
+ public void testPerformCommand() throws MicaException {
MockCommandAbstractor mockCommandAbstractor = getSb2MockCommandAbstractor(null);
ScratchboxCommand createTargetCommand = new CreateTargetSb2Command(sb2Sdk,
mockCommandAbstractor);
@@ -26,7 +26,7 @@
try {
createTargetCommand.performCommand(param);
fail("Number of args is invalid");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
param.add(CPUTRANSP);
@@ -40,7 +40,7 @@
assertEquals("sb2-init -c " + CPUTRANSP + " " + TARGET_NAME + " " + COMPILER, command);
}
- public void testPerformCommandNoCpuTransp() throws ESboxException {
+ public void testPerformCommandNoCpuTransp() throws MicaException {
MockCommandAbstractor mockCommandAbstractor = getSb2MockCommandAbstractor(null);
ScratchboxCommand createTargetCommand = new CreateTargetSb2Command(sb2Sdk,
mockCommandAbstractor);
@@ -52,7 +52,7 @@
try {
createTargetCommand.performCommand(param);
fail("Number of args is invalid");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
param.add(null);
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -12,7 +12,7 @@
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
import org.maemo.esbox.scratchbox.core.sdk.ScratchboxSDKFacade;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
/**
@@ -20,7 +20,7 @@
*/
public class TestGdbQemuCommand extends BaseTest {
- public void testQemuVersionCommand() throws ESboxException {
+ public void testQemuVersionCommand() throws MicaException {
for (IScratchboxSDKTarget sdkTarget : ScratchboxSDKFacade.getInstance().getScratchboxSDKTargets()) {
String pattern = sdkTarget.getGdbQemuCommandPattern(
sdkTarget.getArchitecture());
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGetCurrentTargetCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGetCurrentTargetCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGetCurrentTargetCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import org.maemo.esbox.internal.api.scratchbox.core.commands.ScratchboxInvalidOperationException;
import org.maemo.esbox.internal.scratchbox.sb1.command.GetCurrentTargetCommand;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import java.util.ArrayList;
@@ -28,7 +28,7 @@
*
* @throws ScratchboxInvalidOperationException
*/
- public void testPerformCommand() throws ESboxException {
+ public void testPerformCommand() throws MicaException {
GetCurrentTargetCommand getCurrentTargetCommand = new GetCurrentTargetCommand(sb1Command, sb1Sdk);
String currentTarget = getCurrentTargetCommand
.performCommand(new ArrayList<String>());
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListCommands.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListCommands.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListCommands.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -14,7 +14,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.command.*;
import org.maemo.esbox.internal.scratchbox.sb1.core.Scratchbox1SDK;
import org.maemo.esbox.scratchbox.core.sdk.ScratchboxSDKFacade;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.HostUtils;
import org.maemo.mica.common.core.process.IProcessLauncher;
import org.maemo.mica.common.core.process.ProcessLauncherCreator;
@@ -31,7 +31,7 @@
* Test method for
* {@link embedded.core.scratchbox.command.ListCompilersCommand#performCommand(java.util.List)}.
*/
- public void testListCompilersCommand() throws ESboxException {
+ public void testListCompilersCommand() throws MicaException {
List<String> fakeParam = new ArrayList<String>();
fakeParam.add("param");
@@ -47,7 +47,7 @@
try {
listCompilersCommand.performCommand(fakeParam);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
compilers = listCompilersCommand
@@ -75,7 +75,7 @@
* Test method for
* {@link embedded.core.scratchbox.command.ListCputranspCommand#performCommand(java.util.List)}.
*/
- public void testListCputranspCommand() throws ESboxException {
+ public void testListCputranspCommand() throws MicaException {
List<String> fakeParam = new ArrayList<String>();
fakeParam.add("param");
@@ -130,7 +130,7 @@
try {
listCputranspCommand.performCommand(fakeParam);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
@@ -157,7 +157,7 @@
* Test method for
* {@link embedded.core.scratchbox.command.ListDevkitsCommand#performCommand(java.util.List)}.
*/
- public void testListDevkitsCommand() throws ESboxException {
+ public void testListDevkitsCommand() throws MicaException {
List<String> fakeParam = new ArrayList<String>();
fakeParam.add("param");
@@ -174,7 +174,7 @@
try {
listDevkitsCommand.performCommand(fakeParam);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
@@ -219,7 +219,7 @@
try {
listSessionsCommand.performCommand(fakeParam);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
@@ -268,7 +268,7 @@
* Test method for
* {@link embedded.core.scratchbox.command.ListTargetsCommand#performCommand(java.util.List)}.
*/
- public void testListTargetsCommand() throws ESboxException {
+ public void testListTargetsCommand() throws MicaException {
List<String> fakeParam = new ArrayList<String>();
fakeParam.add("param");
@@ -287,7 +287,7 @@
try {
listTargetsCommand.performCommand(fakeParam);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListSb2Commands.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListSb2Commands.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListSb2Commands.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -29,7 +29,7 @@
public class TestListSb2Commands extends BaseTest {
private final String COMPILER = "arm-none-linux-gnueabi-gcc";
- public void testListCompilersCommand() throws ESboxException {
+ public void testListCompilersCommand() throws MicaException {
List<String> fakeParam = new ArrayList<String>();
fakeParam.add("fake");
@@ -41,7 +41,7 @@
try {
listCompilersCommand.performCommand(fakeParam);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
compilers = listCompilersCommand
@@ -67,7 +67,7 @@
* Test method for
* {@link embedded.core.scratchbox.command.ListCputranspCommand#performCommand(java.util.List)}.
*/
- public void testListCputranspCommand() throws ESboxException {
+ public void testListCputranspCommand() throws MicaException {
List<String> fakeParam = new ArrayList<String>();
fakeParam.add("param");
@@ -83,7 +83,7 @@
try {
listCputranspCommand.performCommand(fakeParam);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
@@ -111,7 +111,7 @@
* Test method for
* {@link embedded.core.scratchbox.command.ListTargetsCommand#performCommand(java.util.List)}.
*/
- public void testListTargetsCommand() throws ESboxException {
+ public void testListTargetsCommand() throws MicaException {
List<String> fakeParam = new ArrayList<String>();
fakeParam.add("param");
@@ -126,7 +126,7 @@
try {
listTargetsCommand.performCommand(fakeParam);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
@@ -145,7 +145,7 @@
assertTrue(matched);
}
- public void testListAvailableRootstrapsCommand() throws ESboxException {
+ public void testListAvailableRootstrapsCommand() throws MicaException {
List<String> fakeParam = new ArrayList<String>();
fakeParam.add("param");
@@ -160,7 +160,7 @@
try {
listRootstrapsCommand.performCommand(fakeParam);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
@@ -170,7 +170,7 @@
HostUtils.getTemporaryPath().append("esbox_commands.txt").toOSString());
try {
rootstraps = listRootstrapsCommand.performCommand(new ArrayList<String>());
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// try again with proxy, manually set -- the JUnit workspace is prolly empty.
ICommandAbstractor altCommandAbstractor = new ICommandAbstractor() {
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -14,7 +14,7 @@
import org.maemo.esbox.internal.api.scratchbox.core.commands.ScratchboxInvalidOperationException;
import org.maemo.esbox.internal.scratchbox.sb1.command.RemoveTargetCommand;
import org.maemo.esbox.scratchbox.core.command.ScratchboxCommand;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import java.util.ArrayList;
import java.util.List;
@@ -28,10 +28,10 @@
* Test method for
* {@link embedded.core.scratchbox.command.RemoveTargetCommand#performCommand(java.util.List)}.
*
- * @throws ESboxException
+ * @throws MicaException
* @throws ScratchboxInvalidOperationException
*/
- public void testPerformCommand() throws ESboxException {
+ public void testPerformCommand() throws MicaException {
final String TARGET_DOESNT_EXIST = "GHOST";
ScratchboxCommand removeCommand = new RemoveTargetCommand(sb1Sdk, sb1Command);
@@ -40,7 +40,7 @@
try {
removeCommand.performCommand(param);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// TODO: handle exception
}
@@ -50,7 +50,7 @@
removeCommand.performCommand(param);
fail("The target " + TARGET_DOESNT_EXIST
+ " does not exist. An error must be throwed.");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// the test is OK, so far.
}
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestRemoveSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import org.maemo.esbox.internal.api.scratchbox.core.sdk.CacheUtils;
import org.maemo.esbox.internal.scratchbox.sb2.command.RemoveTargetSb2Command;
import org.maemo.esbox.scratchbox.core.command.ScratchboxCommand;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import java.util.*;
@@ -21,7 +21,7 @@
*/
public class TestRemoveSb2Command extends BaseTest {
- public void testPerformCommand() throws ESboxException {
+ public void testPerformCommand() throws MicaException {
final String TARGET_DOESNT_EXIST = "GHOST";
ScratchboxCommand removeCommand = new RemoveTargetSb2Command(sb2Sdk, sb2Command);
@@ -30,7 +30,7 @@
try {
removeCommand.performCommand(param);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// TODO: handle exception
}
@@ -40,7 +40,7 @@
removeCommand.performCommand(param);
fail("The target " + TARGET_DOESNT_EXIST
+ " does not exist. An error must be throwed.");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// the test is OK, so far.
}
}
@@ -50,7 +50,7 @@
try {
sb2Sdk.createTarget(TARGET,sb2Sdk.getCompilers().get(0), null,null);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// don't worry if it fails, as it might, since installing a
// bogus target in sb2 often fails to initialize properly
}
@@ -58,7 +58,7 @@
List<String> targets = new ArrayList<String>();
try {
targets = sb2Sdk.getTargets();
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// again, ignore error
}
@@ -73,7 +73,7 @@
CacheUtils.getInstance().clearCachedData();
targets = sb2Sdk.getTargets();
assertFalse(targets.contains(TARGET));
- } catch (ESboxException e) {
+ } catch (MicaException e) {
throw e;
}
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.command.AbstractSB1Command;
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -36,7 +36,7 @@
}
public Object performCommand(List<String> param)
- throws ESboxException {
+ throws MicaException {
return null;
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxFacade.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxFacade.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchboxFacade.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -16,7 +16,7 @@
import org.maemo.esbox.internal.scratchbox.sb2.core.Scratchbox2SDK;
import org.maemo.esbox.scratchbox.core.sdk.ScratchboxSDKFacade;
import org.maemo.esbox.scratchbox.sb1.sdk.IScratchbox1SDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.HostUtils;
import org.maemo.mica.common.core.machine.IMachine;
import org.maemo.mica.common.core.machine.MachineRegistry;
@@ -58,10 +58,10 @@
* Test method for
* {@link org.maemo.esbox.common.core.scratchbox.ScratchboxFacade#getCompilers()}.
*
- * @throws ESboxException
+ * @throws MicaException
*/
@Test
- public void testGetCompilers() throws ESboxException {
+ public void testGetCompilers() throws MicaException {
List<String> compilersExpected = new ArrayList<String>();
compilersExpected.add("host-gcc");
compilersExpected.add("cs2005q3.2-glibc-arm");
@@ -89,9 +89,9 @@
/**
* @return
- * @throws ESboxException
+ * @throws MicaException
*/
- private List<String> getCompilers() throws ESboxException {
+ private List<String> getCompilers() throws MicaException {
if (cachedCompilers == null)
cachedCompilers = sdk.getCompilers();//ScratchboxFacade.getInstance().getCompilers(sdk);
List<String> compilers = cachedCompilers;
@@ -102,10 +102,10 @@
* Test method for
* {@link org.maemo.esbox.common.core.scratchbox.ScratchboxFacade#getCputransp()}.
*
- * @throws ESboxException
+ * @throws MicaException
*/
@Test
- public void testGetCputransp() throws ESboxException {
+ public void testGetCputransp() throws MicaException {
List<String> cputranspExpected = new ArrayList<String>();
cputranspExpected
.add("/scratchbox/devkits/cputransp/bin/qemu-arm-0.7.0-sb2");
@@ -171,9 +171,9 @@
/**
* @return
- * @throws ESboxException
+ * @throws MicaException
*/
- private List<String> getCputransps() throws ESboxException {
+ private List<String> getCputransps() throws MicaException {
if (cachedCputransps == null)
cachedCputransps = sdk.getCputransp();//ScratchboxFacade.getInstance().getCputransp(sdk);
List<String> cputransps = cachedCputransps;
@@ -184,10 +184,10 @@
* Test method for
* {@link org.maemo.esbox.common.core.scratchbox.ScratchboxFacade#getDevkits()}.
*
- * @throws ESboxException
+ * @throws MicaException
*/
@Test
- public void testGetDevkits() throws ESboxException {
+ public void testGetDevkits() throws MicaException {
List<String> devkitsExpected = new ArrayList<String>();
devkitsExpected.add("cputransp");
devkitsExpected.add("debian");
@@ -219,10 +219,10 @@
* Test method for
* {@link org.maemo.esbox.common.core.scratchbox.ScratchboxFacade#getTargets()}.
*
- * @throws ESboxException
+ * @throws MicaException
*/
@Test
- public void testGetTargets() throws ESboxException {
+ public void testGetTargets() throws MicaException {
List<String> targetsExpected = new ArrayList<String>();
targetsExpected.add("SDK_ARMEL");
targetsExpected.add("SDK_X86");
@@ -257,7 +257,7 @@
* Test method for
* {@link org.maemo.esbox.common.core.scratchbox.ScratchboxFacade#getSessions()}.
*
- * @throws ESboxException
+ * @throws MicaException
*/
@Test
public void testGetSessions() throws Exception {
@@ -314,10 +314,10 @@
* Test method for
* {@link org.maemo.esbox.common.core.scratchbox.ScratchboxFacade#getCurrentTarget()}.
*
- * @throws ESboxException
+ * @throws MicaException
*/
@Test
- public void testGetCurrentTarget() throws ESboxException {
+ public void testGetCurrentTarget() throws MicaException {
String currentTarget = sdk.getCurrentTarget();//ScratchboxFacade.getInstance().getCurrentTarget(sdk);
assertTrue(currentTarget.length() > 0);
assertNotNull(sdk.findSDKTarget(currentTarget));
@@ -329,10 +329,10 @@
* and
* {@link org.maemo.esbox.common.core.scratchbox.ScratchboxFacade#removeTarget(java.lang.String)}.
*
- * @throws ESboxException
+ * @throws MicaException
*/
@Test
- public void testCreateAndRemoveTarget() throws ESboxException {
+ public void testCreateAndRemoveTarget() throws MicaException {
final String TARGET_NAME = "TEST_TARGET";
// pick actual compiler and cputransp
@@ -375,10 +375,10 @@
* Test method for
* {@link org.maemo.esbox.common.core.scratchbox.ScratchboxFacade#selectTarget(java.lang.String)}.
*
- * @throws ESboxException
+ * @throws MicaException
*/
@Test
- public void testSelectTarget() throws ESboxException {
+ public void testSelectTarget() throws MicaException {
final String TARGET_DOESNT_EXIST = "GHOST";
try {
@@ -386,7 +386,7 @@
sdk.removeTarget(TARGET_DOESNT_EXIST);
fail("The target " + TARGET_DOESNT_EXIST
+ " does not exist. An error must be throwed.");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// the test is OK, so far.
}
@@ -417,7 +417,7 @@
* Test method for
* {@link org.maemo.esbox.common.core.scratchbox.ScratchboxFacade#getCurrentSbox1Version()}.
*
- * @throws ESboxException
+ * @throws MicaException
*/
@Test
public void testGetCurrentSboxVersion() {
@@ -426,14 +426,14 @@
try {
sbox1Version = Scratchbox1SDK.getCurrentSboxVersion(machine);//ScratchboxFacade.getInstance().getCurrentSbox1Version(machine);
assertTrue(sbox1Version.matches("1\\.0\\.\\d+"));
- } catch (ESboxException e) {
+ } catch (MicaException e) {
System.out.println("No Scratchbox 1 on " + machine);
}
String sbox2Version;
try {
sbox2Version = Scratchbox2SDK.getCurrentSboxVersion(machine);//ScratchboxFacade.getInstance().getCurrentSbox1Version(machine);
assertTrue(sbox2Version.matches("1\\.99\\..*|2\\..*"));
- } catch (ESboxException e) {
+ } catch (MicaException e) {
System.out.println("No Scratchbox 2 on " + machine);
}
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestSelectTargetCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestSelectTargetCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestSelectTargetCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.command.*;
import org.maemo.esbox.scratchbox.core.command.ScratchboxCommand;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import java.util.ArrayList;
import java.util.List;
@@ -23,7 +23,7 @@
*/
public class TestSelectTargetCommand extends BaseTest {
- public void testPerformCommand() throws ESboxException {
+ public void testPerformCommand() throws MicaException {
final String TARGET_DOESNT_EXIST = "GHOST";
@@ -34,7 +34,7 @@
try {
selectCommand.performCommand(param);
fail("Invalid number of param");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// the test is OK, so far.
}
@@ -44,7 +44,7 @@
selectCommand.performCommand(param);
fail("The target " + TARGET_DOESNT_EXIST
+ " does not exist. An error must be throwed.");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// the test is OK, so far.
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestShowPathMappingSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestShowPathMappingSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestShowPathMappingSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -2,14 +2,14 @@
import org.eclipse.core.runtime.IPath;
import org.maemo.esbox.internal.scratchbox.sb2.command.ShowPathMappingSb2Command;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.machine.IFileSystemAccess;
import java.util.*;
public class TestShowPathMappingSb2Command extends BaseTest {
- public void testPerformCommand() throws ESboxException {
+ public void testPerformCommand() throws MicaException {
if (sb2ArmelTargetCommand == null)
return;
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestShowTargetCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestShowTargetCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestShowTargetCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.Scratchbox1SDK;
import org.maemo.esbox.scratchbox.core.command.ScratchboxCommand;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxTarget;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import java.util.ArrayList;
import java.util.List;
@@ -25,7 +25,7 @@
*/
public class TestShowTargetCommand extends BaseTest {
- public void testPerformCommand() throws ESboxException {
+ public void testPerformCommand() throws MicaException {
String theTarget = sb1Sdk.getSDKTargetNames()[0];
ScratchboxCommand showTargetCommand = new ShowTargetCommand(sb1Command);
@@ -35,7 +35,7 @@
try {
showTargetCommand.performCommand(param);
fail("Number of args is invalid");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
// expected
}
param.add(theTarget);
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestSimpleCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestSimpleCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestSimpleCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import org.junit.Test;
import org.maemo.esbox.internal.api.scratchbox.core.commands.SimpleCommand;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import java.util.ArrayList;
import java.util.List;
@@ -25,10 +25,10 @@
/**
* Test method for {@link org.maemo.esbox.internal.api.scratchbox.core.commands.common.core.command.scratchbox.SimpleCommand#performCommand(java.util.List)}.
- * @throws ESboxException
+ * @throws MicaException
*/
@Test
- public void testPerformCommand() throws ESboxException {
+ public void testPerformCommand() throws MicaException {
// String currentTarget = ScratchboxFacade.getInstance().getCurrentTarget(sb1Sdk);
String currentTarget = sb1Sdk.getCurrentTarget();
@@ -39,7 +39,7 @@
try {
simpleCommand.performCommand(params);
fail("Invalid number of params");
- } catch (ESboxException e) {
+ } catch (MicaException e) {
}
params.add("sb-conf");
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.ui/plugin.xml
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.ui/plugin.xml 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.ui/plugin.xml 2008-10-24 00:22:53 UTC (rev 891)
@@ -6,7 +6,7 @@
<page
name="Gazpacho"
category="org.maemo.mica.common.ui.preferenceCategory.maemo"
- class="org.maemo.esbox.internal.maemosdk.ui.preferences.ESboxGazpachoPreferencePage"
+ class="org.maemo.esbox.internal.maemosdk.ui.preferences.GazpachoPreferencePage"
id="org.maemo.mica.maemosdk.ui.preferencePage.gazpacho">
</page>
@@ -14,7 +14,7 @@
<page
name="X Server"
category="org.maemo.mica.common.ui.preferenceCategory.maemo"
- class="org.maemo.esbox.internal.maemosdk.ui.preferences.ESboxXServerPreferencePage"
+ class="org.maemo.esbox.internal.maemosdk.ui.preferences.XServerPreferencePage"
id="org.maemo.mica.maemosdk.ui.preferencePage.xserver">
</page>
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -24,7 +24,7 @@
import org.eclipse.ui.part.FileEditorInput;
import org.maemo.esbox.internal.api.maemosdk.core.tools.MaemoScriptLauncher;
import org.maemo.esbox.internal.maemosdk.ui.UIActivator;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.ISDKTarget;
import org.maemo.mica.common.project.core.ProjectManager;
import org.maemo.mica.common.ui.dialogs.SelectSDKTargetDialog;
@@ -136,7 +136,7 @@
if (target == null)
return;
MaemoScriptLauncher.getInstance().startMaemo(target);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
errorDialog("Error starting maemo", e);
}
}
@@ -150,7 +150,7 @@
if (target == null)
return;
MaemoScriptLauncher.getInstance().restartMaemo(target);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
errorDialog("Error restarting maemo", e);
}
}
@@ -165,12 +165,12 @@
return;
MaemoScriptLauncher.getInstance().stopMaemo(target);
MaemoScriptLauncher.getInstance().killMaemo(target);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
errorDialog("Error stopping maemo", e);
}
}
- private void errorDialog(final String string, final ESboxException e) {
+ private void errorDialog(final String string, final MicaException e) {
Display.getDefault().syncExec(new Runnable() {
public void run() {
@@ -191,7 +191,7 @@
try {
ISDKTarget theSdkTarget = ProjectManager.getInstance().getSDKTarget(selectedProject);
sdkTarget = theSdkTarget;
- } catch (ESboxException e) {
+ } catch (MicaException e) {
}
}
Modified: branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/XDropdownMenuAction.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/XDropdownMenuAction.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/XDropdownMenuAction.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -24,7 +24,7 @@
import org.eclipse.ui.IWorkbenchWindowPulldownDelegate;
import org.maemo.esbox.internal.api.maemosdk.core.tools.MaemoScriptLauncher;
import org.maemo.esbox.internal.maemosdk.ui.UIActivator;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import java.text.MessageFormat;
@@ -113,13 +113,13 @@
protected void startClicked() {
try {
MaemoScriptLauncher.getInstance().startX();
- } catch (ESboxException e){
+ } catch (MicaException e){
errorDialog("Scratchbox error", e);
}
}
- private void errorDialog(String string, ESboxException e) {
+ private void errorDialog(String string, MicaException e) {
Shell shell = pulldownmenu.getShell();
MessageDialog.openError(shell, "X Error",
MessageFormat.format("{0}:\n\n{1}",
@@ -133,7 +133,7 @@
protected void stopClicked() {
try {
MaemoScriptLauncher.getInstance().stopX(null);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
errorDialog("Error stopping X", e);
}
}
Deleted: branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/ESboxGazpachoPreferencePage.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/ESboxGazpachoPreferencePage.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/ESboxGazpachoPreferencePage.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 INdT.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Paulo Romulo (UFCG) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.maemosdk.ui.preferences;
-
-import org.eclipse.jface.preference.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
-
-
-/**
- * Preference page for Gazpacho
- *
- * @author romulo
- */
-public class ESboxGazpachoPreferencePage extends FieldEditorPreferencePage implements
- IWorkbenchPreferencePage {
-
- /**
- * Field for using the X command
- */
- private BooleanFieldEditor feUseXhostCmd = null;
-
- /**
- * Field for the X command
- */
- private StringFieldEditor feXhostCmd = null;
-
- /**
- * Field for Gazpacho command
- */
- private StringFieldEditor feGazpachoCmd = null;
-
- /**
- * The constructor
- */
- public ESboxGazpachoPreferencePage() {
- super(GRID);
- setPreferenceStore(MaemoPreferenceConstants.getPreferenceStore());
- setDescription("Preferences for Running Gazpacho User Interface Editor:");
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
- */
- public void createFieldEditors() {
- Composite oParent = getFieldEditorParent();
-
- feGazpachoCmd =
- new StringFieldEditor(MaemoPreferenceConstants.GAZPACHO_COMMAND.toString(),
- "Command to start Gazpacho:",
- oParent);
-
- feUseXhostCmd =
- new BooleanFieldEditor(MaemoPreferenceConstants.USE_X_HOST.toString(),
- "Use 'xhost' command starting Gazpacho in Maemo",
- oParent);
-
- feXhostCmd =
- new StringFieldEditor(MaemoPreferenceConstants.X_HOST_CMD.toString(),
- "Command template for starting Xhost:",
- oParent);
-
- addField(feGazpachoCmd);
- addField(feUseXhostCmd);
- addField(feXhostCmd);
-
- initializeValues();
- }
-
- /**
- * Initializes the field values
- */
- private void initializeValues() {
- IPreferenceStore store = getPreferenceStore();
- store.setDefault(MaemoPreferenceConstants.GAZPACHO_COMMAND.toString(), "/usr/bin/gazpacho");
- store.setDefault(MaemoPreferenceConstants.USE_X_HOST.toString(), true);
- store.setDefault(MaemoPreferenceConstants.X_HOST_CMD.toString(), "DISPLAY=:0");
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
- public void init(IWorkbench workbench) {
- // Nothing to do
- }
-
-}
Deleted: branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/ESboxXServerPreferencePage.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/ESboxXServerPreferencePage.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/ESboxXServerPreferencePage.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 INdT, (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Paulo Romulo (UFCG) - initial API and implementation
- * Ed Swartz (Nokia)
- *******************************************************************************/
-
-package org.maemo.esbox.internal.maemosdk.ui.preferences;
-
-import org.eclipse.jface.preference.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
-
-
-/**
- * The preference page for X server
- *
- * @author romulo
- */
-public class ESboxXServerPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage, IPreferencePage {
-
- private StringFieldEditor xServerSyntax = null;
- private StringFieldEditor xDisplay;
- private StringFieldEditor xPath;
-
- /**
- * The constructor
- */
- public ESboxXServerPreferencePage() {
- super(GRID);
- setPreferenceStore(MaemoPreferenceConstants.getPreferenceStore());
- setDescription("Preferences for running X:\n\n"
- + "(The X server is launched on the host machine, so use a command syntax and display appropriate to the host.)\n");
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
- */
- public void createFieldEditors() {
- xServerSyntax = new StringFieldEditor(
- MaemoPreferenceConstants.DISPLAY_X_COMMAND,
- "Command template to launch server:",
- getFieldEditorParent());
-
- // make this string manageable
- GC gc = new GC(getFieldEditorParent().getShell());
- GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.widthHint = gc.getAdvanceWidth('m') * 32;
- gc.dispose();
- xServerSyntax.getTextControl(getFieldEditorParent()).setLayoutData(gridData);
-
- xDisplay = new StringFieldEditor(
- MaemoPreferenceConstants.X_DISPLAY,
- "DISPLAY setting for server:",
- getFieldEditorParent());
-
- // make this string manageable
- xDisplay.getTextControl(getFieldEditorParent()).setLayoutData(gridData);
-
-
- xPath = new StringFieldEditor(
- MaemoPreferenceConstants.X_PATH,
- "Additional PATH entries for server:",
- getFieldEditorParent());
-
- // make this string manageable
- xPath.getTextControl(getFieldEditorParent()).setLayoutData(gridData);
-
-
- addField(xServerSyntax);
- addField(xDisplay);
- addField(xPath);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
- public void init(IWorkbench workbench) {
- // Nothing to do
- }
-
-}
Copied: branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/GazpachoPreferencePage.java (from rev 884, branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/ESboxGazpachoPreferencePage.java)
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/GazpachoPreferencePage.java (rev 0)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/GazpachoPreferencePage.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 INdT.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Paulo Romulo (UFCG) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.maemosdk.ui.preferences;
+
+import org.eclipse.jface.preference.*;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
+
+
+/**
+ * Preference page for Gazpacho
+ *
+ * @author romulo
+ */
+public class GazpachoPreferencePage extends FieldEditorPreferencePage implements
+ IWorkbenchPreferencePage {
+
+ /**
+ * Field for using the X command
+ */
+ private BooleanFieldEditor feUseXhostCmd = null;
+
+ /**
+ * Field for the X command
+ */
+ private StringFieldEditor feXhostCmd = null;
+
+ /**
+ * Field for Gazpacho command
+ */
+ private StringFieldEditor feGazpachoCmd = null;
+
+ /**
+ * The constructor
+ */
+ public GazpachoPreferencePage() {
+ super(GRID);
+ setPreferenceStore(MaemoPreferenceConstants.getPreferenceStore());
+ setDescription("Preferences for Running Gazpacho User Interface Editor:");
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+ */
+ public void createFieldEditors() {
+ Composite oParent = getFieldEditorParent();
+
+ feGazpachoCmd =
+ new StringFieldEditor(MaemoPreferenceConstants.GAZPACHO_COMMAND.toString(),
+ "Command to start Gazpacho:",
+ oParent);
+
+ feUseXhostCmd =
+ new BooleanFieldEditor(MaemoPreferenceConstants.USE_X_HOST.toString(),
+ "Use 'xhost' command starting Gazpacho in Maemo",
+ oParent);
+
+ feXhostCmd =
+ new StringFieldEditor(MaemoPreferenceConstants.X_HOST_CMD.toString(),
+ "Command template for starting Xhost:",
+ oParent);
+
+ addField(feGazpachoCmd);
+ addField(feUseXhostCmd);
+ addField(feXhostCmd);
+
+ initializeValues();
+ }
+
+ /**
+ * Initializes the field values
+ */
+ private void initializeValues() {
+ IPreferenceStore store = getPreferenceStore();
+ store.setDefault(MaemoPreferenceConstants.GAZPACHO_COMMAND.toString(), "/usr/bin/gazpacho");
+ store.setDefault(MaemoPreferenceConstants.USE_X_HOST.toString(), true);
+ store.setDefault(MaemoPreferenceConstants.X_HOST_CMD.toString(), "DISPLAY=:0");
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+ */
+ public void init(IWorkbench workbench) {
+ // Nothing to do
+ }
+
+}
Property changes on: branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/GazpachoPreferencePage.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/XServerPreferencePage.java (from rev 884, branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/ESboxXServerPreferencePage.java)
===================================================================
--- branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/XServerPreferencePage.java (rev 0)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/XServerPreferencePage.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 INdT, (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Paulo Romulo (UFCG) - initial API and implementation
+ * Ed Swartz (Nokia)
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.maemosdk.ui.preferences;
+
+import org.eclipse.jface.preference.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
+
+
+/**
+ * The preference page for X server
+ *
+ * @author romulo
+ */
+public class XServerPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage, IPreferencePage {
+
+ private StringFieldEditor xServerSyntax = null;
+ private StringFieldEditor xDisplay;
+ private StringFieldEditor xPath;
+
+ /**
+ * The constructor
+ */
+ public XServerPreferencePage() {
+ super(GRID);
+ setPreferenceStore(MaemoPreferenceConstants.getPreferenceStore());
+ setDescription("Preferences for running X:\n\n"
+ + "(The X server is launched on the host machine, so use a command syntax and display appropriate to the host.)\n");
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+ */
+ public void createFieldEditors() {
+ xServerSyntax = new StringFieldEditor(
+ MaemoPreferenceConstants.DISPLAY_X_COMMAND,
+ "Command template to launch server:",
+ getFieldEditorParent());
+
+ // make this string manageable
+ GC gc = new GC(getFieldEditorParent().getShell());
+ GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+ gridData.widthHint = gc.getAdvanceWidth('m') * 32;
+ gc.dispose();
+ xServerSyntax.getTextControl(getFieldEditorParent()).setLayoutData(gridData);
+
+ xDisplay = new StringFieldEditor(
+ MaemoPreferenceConstants.X_DISPLAY,
+ "DISPLAY setting for server:",
+ getFieldEditorParent());
+
+ // make this string manageable
+ xDisplay.getTextControl(getFieldEditorParent()).setLayoutData(gridData);
+
+
+ xPath = new StringFieldEditor(
+ MaemoPreferenceConstants.X_PATH,
+ "Additional PATH entries for server:",
+ getFieldEditorParent());
+
+ // make this string manageable
+ xPath.getTextControl(getFieldEditorParent()).setLayoutData(gridData);
+
+
+ addField(xServerSyntax);
+ addField(xDisplay);
+ addField(xPath);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+ */
+ public void init(IWorkbench workbench) {
+ // Nothing to do
+ }
+
+}
Property changes on: branches/micaSplit/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/XServerPreferencePage.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/SimpleCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/SimpleCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/SimpleCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -39,7 +39,7 @@
* .List)
*/
public List<String> performCommand(List<String> params)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (params.size() == 0)
throw new ScratchboxInvalidParameterException(
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/AddSbrshCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/AddSbrshCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/AddSbrshCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxCommand;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -51,7 +51,7 @@
* .util.List)
*/
public Object performCommand(List<String> params)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(params))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/ConfigureSbrshCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/ConfigureSbrshCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/ConfigureSbrshCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxCommand;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -51,7 +51,7 @@
* .util.List)
*/
public Object performCommand(List<String> params)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(params))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/MountTargetSbrshCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/MountTargetSbrshCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/MountTargetSbrshCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxCommand;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -50,7 +50,7 @@
* .util.List)
*/
public Object performCommand(List<String> params)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(params))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/UnmountTargetSbrshCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/UnmountTargetSbrshCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/commands/sbrsh/UnmountTargetSbrshCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxCommand;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -50,7 +50,7 @@
* .util.List)
*/
public Object performCommand(List<String> params)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(params))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -19,7 +19,7 @@
import org.maemo.esbox.internal.api.scratchbox.core.commands.sbrsh.*;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
import org.maemo.mica.common.core.machine.*;
import org.maemo.mica.common.core.process.*;
@@ -117,7 +117,7 @@
* @see
* org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK#getCommandAbstractor()
*/
- public ICommandAbstractor getCommandAbstractor() throws ESboxException {
+ public ICommandAbstractor getCommandAbstractor() throws MicaException {
MachineUtils.acquireMachine(this.getMachine());
ICommandAbstractor commandAbstractor = new ICommandAbstractor() {
@@ -150,7 +150,7 @@
* @see
* org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK#getCurrentSDKTarget()
*/
- public IScratchboxSDKTarget getCurrentSDKTarget() throws ESboxException {
+ public IScratchboxSDKTarget getCurrentSDKTarget() throws MicaException {
String targetName = getCurrentTarget();
return (IScratchboxSDKTarget) this.findSDKTarget(targetName);
}
@@ -163,7 +163,7 @@
* lang.String, java.lang.String, java.lang.String)
*/
public boolean configureSbrsh(String targetName, String targetDeviceAddr,
- String nfsServerAddr) throws ESboxException {
+ String nfsServerAddr) throws MicaException {
ConfigureSbrshCommand configureSbrshCommand = new ConfigureSbrshCommand(
getCommandAbstractor());
@@ -183,7 +183,7 @@
* .lang.String, java.lang.String, java.lang.String)
*/
public boolean addSbrshAccessList(String targetDeviceAddr, String username,
- String ipAddr) throws ESboxException {
+ String ipAddr) throws MicaException {
AddSbrshCommand addSbrshCommand = new AddSbrshCommand(
getCommandAbstractor());
@@ -203,7 +203,7 @@
* org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK#mountTarget(java.lang
* .String)
*/
- public boolean mountTarget(String targetName) throws ESboxException {
+ public boolean mountTarget(String targetName) throws MicaException {
MountTargetSbrshCommand mountTargetCommand = new MountTargetSbrshCommand(
getCommandAbstractor());
@@ -220,7 +220,7 @@
* org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK#unmountTarget(java.lang
* .String)
*/
- public boolean unmountTarget(String targetName) throws ESboxException {
+ public boolean unmountTarget(String targetName) throws MicaException {
UnmountTargetSbrshCommand unmountTargetCommand = new UnmountTargetSbrshCommand(
getCommandAbstractor());
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDKTarget.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDKTarget.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDKTarget.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import org.eclipse.core.runtime.Platform;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.machine.IFileSystemAccess;
import org.maemo.mica.common.core.machine.MachineUtils;
import org.maemo.mica.common.core.process.IProcessLauncherFactory;
@@ -48,7 +48,7 @@
* Get a command launcher for an SDK target. These must be executed within
* the context of scratchbox.
*/
- public ICommandAbstractor getCommandAbstractor() throws ESboxException {
+ public ICommandAbstractor getCommandAbstractor() throws MicaException {
// ensure machine is alive
MachineUtils.acquireMachine(this.getSDK().getMachine());
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/ScratchboxSDK.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/ScratchboxSDK.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/ScratchboxSDK.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.eclipse.core.runtime.IPath;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.machine.ILocalMachine;
import org.maemo.mica.common.core.machine.IMachine;
import org.maemo.mica.common.core.sdk.IPreferenceProvider;
@@ -79,69 +79,69 @@
}
public boolean addSbrshAccessList(String targetDeviceAddr, String username,
- String ipAddr) throws ESboxException {
+ String ipAddr) throws MicaException {
// TODO Auto-generated method stub
return false;
}
public boolean configureSbrsh(String targetName, String targetDeviceAddr,
- String nfsServerAddr) throws ESboxException {
+ String nfsServerAddr) throws MicaException {
// TODO Auto-generated method stub
return false;
}
public boolean createTarget(String targetName, String compiler,
- String devkits, String cputransp) throws ESboxException {
+ String devkits, String cputransp) throws MicaException {
// TODO Auto-generated method stub
return false;
}
- public ICommandAbstractor getCommandAbstractor() throws ESboxException {
+ public ICommandAbstractor getCommandAbstractor() throws MicaException {
// TODO Auto-generated method stub
return null;
}
- public List<String> getCompilers() throws ESboxException {
+ public List<String> getCompilers() throws MicaException {
// TODO Auto-generated method stub
return null;
}
- public List<String> getCputransp() throws ESboxException {
+ public List<String> getCputransp() throws MicaException {
// TODO Auto-generated method stub
return null;
}
- public String getCurrentSboxVersion(IMachine machine) throws ESboxException {
+ public String getCurrentSboxVersion(IMachine machine) throws MicaException {
// TODO Auto-generated method stub
return null;
}
- public IScratchboxSDKTarget getCurrentSDKTarget() throws ESboxException {
+ public IScratchboxSDKTarget getCurrentSDKTarget() throws MicaException {
// TODO Auto-generated method stub
return null;
}
- public String getCurrentTarget() throws ESboxException {
+ public String getCurrentTarget() throws MicaException {
// TODO Auto-generated method stub
return null;
}
- public List<String> getTargets() throws ESboxException {
+ public List<String> getTargets() throws MicaException {
// TODO Auto-generated method stub
return null;
}
- public boolean mountTarget(String targetName) throws ESboxException {
+ public boolean mountTarget(String targetName) throws MicaException {
// TODO Auto-generated method stub
return false;
}
- public boolean removeTarget(String targetName) throws ESboxException {
+ public boolean removeTarget(String targetName) throws MicaException {
// TODO Auto-generated method stub
return false;
}
- public boolean unmountTarget(String targetName) throws ESboxException {
+ public boolean unmountTarget(String targetName) throws MicaException {
// TODO Auto-generated method stub
return false;
}
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/MaemoGdbServerSupportAdapter.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/MaemoGdbServerSupportAdapter.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/MaemoGdbServerSupportAdapter.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import java.text.MessageFormat;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.launch.adapters.IGdbServerSupportAdapter;
import org.maemo.esbox.internal.scratchbox.core.Activator;
import org.maemo.esbox.scratchbox.core.SBPreferenceConstants;
@@ -55,7 +55,7 @@
String commandPattern = sdkTarget
.getGdbQemuCommandPattern(architecture);
return commandPattern;
- } catch (ESboxException e) {
+ } catch (MicaException e) {
String msg = MessageFormat.format(
"Cannot determine gdb server command pattern for ''{0}''",
sdkTarget.getName());
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/command/ScratchboxCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/command/ScratchboxCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/command/ScratchboxCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -163,7 +163,7 @@
* @throws ScratchboxException
* failure to launch process
*/
- public Process createProcess(List<String> cmdLine) throws ESboxException {
+ public Process createProcess(List<String> cmdLine) throws MicaException {
IProcessLauncher processLauncher = ProcessLauncherCreator
.createProcessLauncher(commandAbstractor
.getProcessLauncherFactory(), null, cmdLine);
@@ -187,7 +187,7 @@
* @throws ScratchboxException
* failure to launch process
*/
- public Process createProcess(String commandline) throws ESboxException {
+ public Process createProcess(String commandline) throws MicaException {
return createProcess(commandline, null);
}
@@ -203,7 +203,7 @@
* failure to launch process
*/
public Process createProcess(String commandline,
- IEnvironmentModifierBlock envBlock) throws ESboxException {
+ IEnvironmentModifierBlock envBlock) throws MicaException {
List<String> cmdLine = CommandLineArguments
.createFromCommandLine(commandline);
IProcessLauncher processLauncher = ProcessLauncherCreator
@@ -235,7 +235,7 @@
protected IStatus runAndWaitForProcess(String jobName,
final String commandline, IEnvironmentModifierBlock envBlock,
- long timeout) throws ESboxException {
+ long timeout) throws MicaException {
final IProcessLauncher processLauncher = ProcessLauncherCreator
.createProcessLauncher(
commandAbstractor.getProcessLauncherFactory(),
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/scratchbox/ScratchboxException.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/scratchbox/ScratchboxException.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/scratchbox/ScratchboxException.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -11,12 +11,12 @@
*******************************************************************************/
package org.maemo.esbox.scratchbox.core.scratchbox;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
/**
* General exception generated by communication API.
*/
-public class ScratchboxException extends ESboxException {
+public class ScratchboxException extends MicaException {
/**
* Serial version number of exception.
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDK.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDK.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDK.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import java.util.List;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.ISDK;
/**
@@ -41,48 +41,48 @@
* Return the list of available compilers in Scratchbox.
*
* @return a list with the available compilers in Scratchbox.
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
- public List<String> getCompilers() throws ESboxException;
+ public List<String> getCompilers() throws MicaException;
/**
* Return the list of available cputransp method at Scratchbox.
*
*
* @return a list with the available cputransp method at Scratchbox.
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
- public List<String> getCputransp() throws ESboxException;
+ public List<String> getCputransp() throws MicaException;
/**
* Return the list of available targets at Scratchbox.
*
* @return a list with the available targets at Scratchbox.
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
- public List<String> getTargets() throws ESboxException;
+ public List<String> getTargets() throws MicaException;
/**
* Return the current target name of the Scratchbox.
*
*
* @return the current target of the Scratchbox.
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
- public String getCurrentTarget() throws ESboxException;
+ public String getCurrentTarget() throws MicaException;
/**
* Return the current target of the Scratchbox.
*
* @return the current target of Scratchbox.
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
- public IScratchboxSDKTarget getCurrentSDKTarget() throws ESboxException;
+ public IScratchboxSDKTarget getCurrentSDKTarget() throws MicaException;
/**
* Create a new target for Scratchbox. An target must have a name, and the
@@ -98,11 +98,11 @@
* @param cputransp
* the cputransp method of the new target.
* @return true, if the target is created successfully.
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
public boolean createTarget(String targetName, String compiler,
- String devkits, String cputransp) throws ESboxException;
+ String devkits, String cputransp) throws MicaException;
/**
* Remove a target from the Scratchbox. A target with the given name must
@@ -111,11 +111,11 @@
* @param targetName
* the name of the target to be removed.
* @return true, if the operation is performed successfully.
- * @throws ESboxException
+ * @throws MicaException
* if the name of the target to be removed does not exist or if
* some problem related to Scratchbox communication occurs.
*/
- public boolean removeTarget(String targetName) throws ESboxException;
+ public boolean removeTarget(String targetName) throws MicaException;
/**
* Configure sbrsh settings of an certain target.
@@ -130,11 +130,11 @@
* the IP of NFS server.
* @return true, if the configuration is performed successfully; false,
* otherwise.
- * @throws ESboxException
+ * @throws MicaException
* if any problem related to Scratchbox communication occurs.
*/
public boolean configureSbrsh(String targetName, String targetDeviceAddr,
- String nfsServerAddr) throws ESboxException;
+ String nfsServerAddr) throws MicaException;
/**
* Add the target to an access list. Such list contains all targets that can
@@ -148,11 +148,11 @@
* the IP of the desktop.
* @return true, if the configuration is performed successfully; false,
* otherwise.
- * @throws ESboxException
+ * @throws MicaException
* if any problem related to Scratchbox communication occurs.
*/
public boolean addSbrshAccessList(String targetDeviceAddr, String username,
- String ipAddr) throws ESboxException;
+ String ipAddr) throws MicaException;
/**
* Mount a target at the remove device.
@@ -161,10 +161,10 @@
* the name of the target to be mounted.
* @return true, if the configuration is performed successfully; false,
* otherwise.
- * @throws ESboxException
+ * @throws MicaException
* if any problem related to Scratchbox communication occurs.
*/
- public boolean mountTarget(String targetName) throws ESboxException;
+ public boolean mountTarget(String targetName) throws MicaException;
/**
* Unmount a target at the remote device.
@@ -173,10 +173,10 @@
* the name of the target to be unmounted.
* @return true, if the configuration is performed successfully; false,
* otherwise.
- * @throws ESboxException
+ * @throws MicaException
* if any problem related to Scratchbox communication occurs.
*/
- public boolean unmountTarget(String targetName) throws ESboxException;
+ public boolean unmountTarget(String targetName) throws MicaException;
/**
* @return version number of the Scratchbox
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDKTarget.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDKTarget.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sdk/IScratchboxSDKTarget.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -12,7 +12,7 @@
package org.maemo.esbox.scratchbox.core.sdk;
import org.eclipse.core.runtime.IPath;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.process.IProcessLauncherFactory;
import org.maemo.mica.maemosdk.core.IMaemoSDKTarget;
@@ -47,9 +47,9 @@
* Get the pattern to launch QEMU with gdbserver support for the given SDK target.
* @param architecture
* @return a command template
- * @throws ESboxException
+ * @throws MicaException
*/
- String getGdbQemuCommandPattern(String architecture) throws ESboxException;
+ String getGdbQemuCommandPattern(String architecture) throws MicaException;
/**
* Get the version of scratchbox this represents.
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/CreateTargetCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/CreateTargetCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/CreateTargetCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.sb1.sdk.IScratchbox1SDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -43,7 +43,7 @@
* embedded.core.scratchbox.command.IScratchboxCommand#performCommand(java
* .lang.Object)
*/
- public Object performCommand(List<String> param) throws ESboxException {
+ public Object performCommand(List<String> param) throws MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetCurrentTargetCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetCurrentTargetCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetCurrentTargetCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -16,7 +16,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.sb1.sdk.IScratchbox1SDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -43,7 +43,7 @@
* .lang.Object)
*/
public String performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetGdbQemuCommandPatternCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetGdbQemuCommandPatternCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetGdbQemuCommandPatternCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -18,7 +18,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import org.osgi.framework.Version;
@@ -50,7 +50,7 @@
* .lang.Object)
*/
public String performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
@@ -113,7 +113,7 @@
*
* @return qemu name, or <code>null</code> if not using qemu
*/
- protected String getConfiguredQemu() throws ESboxException {
+ protected String getConfiguredQemu() throws MicaException {
// we use sb-select show <target> to find out if qemu is even used for
// this target.
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetVersionScratchboxCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetVersionScratchboxCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetVersionScratchboxCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -50,7 +50,7 @@
* .util.List)
*/
public String performCommand(List<String> params)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(params))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/KillallCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/KillallCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/KillallCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -14,7 +14,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -38,7 +38,7 @@
* .lang.Object)
*/
public Object performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListCompilersCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListCompilersCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListCompilersCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -39,7 +39,7 @@
* .lang.Object)
*/
public List<String> performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListCputranspCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListCputranspCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListCputranspCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -39,7 +39,7 @@
* .lang.Object)
*/
public List<String> performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListDevkitsCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListDevkitsCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListDevkitsCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -39,7 +39,7 @@
* .lang.Object)
*/
public List<String> performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListSessionsCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListSessionsCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListSessionsCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.ArrayList;
@@ -40,7 +40,7 @@
* .lang.Object)
*/
public List<String> performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListTargetsCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListTargetsCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ListTargetsCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -39,7 +39,7 @@
* .lang.Object)
*/
public List<String> performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/RemoveTargetCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/RemoveTargetCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/RemoveTargetCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.ISDK;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
@@ -44,7 +44,7 @@
* .lang.Object)
*/
public Object performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
@@ -81,7 +81,7 @@
* @throws ScratchboxException
* if some problem occurrs while requesting Scratchbox services.
*/
- private boolean targetExist(String targetToRemove) throws ESboxException {
+ private boolean targetExist(String targetToRemove) throws MicaException {
List<String> targetsAvailable = new ListTargetsCommand(
commandAbstractor).performCommand(new ArrayList<String>());
return targetsAvailable.contains(targetToRemove);
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ResetTargetCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ResetTargetCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ResetTargetCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -39,7 +39,7 @@
* .util.List)
*/
public Object performCommand(List<String> params)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(params))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/RootstrapCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/RootstrapCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/RootstrapCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -38,7 +38,7 @@
* .lang.Object)
*/
public Object performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/SelectTargetCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/SelectTargetCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/SelectTargetCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -16,7 +16,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -44,7 +44,7 @@
* .lang.Object)
*/
public Object performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ShowTargetCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ShowTargetCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/ShowTargetCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -16,7 +16,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxTarget;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.*;
@@ -40,7 +40,7 @@
* .List)
*/
public ScratchboxTarget performCommand(List<String> params)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(params))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -17,7 +17,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.command.*;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
import org.maemo.esbox.scratchbox.sb1.sdk.IScratchbox1SDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.machine.IMachine;
import org.maemo.mica.common.core.machine.MachineUtils;
import org.maemo.mica.common.core.sdk.*;
@@ -64,7 +64,7 @@
newTargets.add(sdkTarget);
}
this.targets = newTargets;
- } catch (ESboxException e) {
+ } catch (MicaException e) {
Activator.getErrorLogger().logError("Could not refresh targets", e);
}
}
@@ -76,7 +76,7 @@
* org.maemo.mica.maemosdk.core.sdk.AbstractScratchboxSDK#getCommandAbstractor
* ()
*/
- public ICommandAbstractor getCommandAbstractor() throws ESboxException {
+ public ICommandAbstractor getCommandAbstractor() throws MicaException {
return getSb1WrappedAbstractor(super.getCommandAbstractor(), this
.getMachine());
}
@@ -89,7 +89,7 @@
* .String, java.lang.String, java.lang.String, java.lang.String)
*/
public boolean createTarget(String targetName, String compiler,
- String devkits, String cputransp) throws ESboxException {
+ String devkits, String cputransp) throws MicaException {
List<String> params = new ArrayList<String>();
params.add(targetName);
params.add(compiler);
@@ -108,7 +108,7 @@
*
* @see org.maemo.mica.maemosdk.core.sdk.IScratchboxSDK#getCompilers()
*/
- public List<String> getCompilers() throws ESboxException {
+ public List<String> getCompilers() throws MicaException {
ListCompilersCommand listCompilersCommand = new ListCompilersCommand(
getCommandAbstractor());
return listCompilersCommand.performCommand(EMPTY_ARGS);
@@ -119,7 +119,7 @@
*
* @see org.maemo.mica.maemosdk.core.sdk.IScratchboxSDK#getCputransp()
*/
- public List<String> getCputransp() throws ESboxException {
+ public List<String> getCputransp() throws MicaException {
ListCputranspCommand listCputranspCommand = new ListCputranspCommand(
getCommandAbstractor());
return listCputranspCommand.performCommand(EMPTY_ARGS);
@@ -130,12 +130,12 @@
*
* @param machine
* @return the current version of Scratchbox 1.
- * @throws ESboxException
+ * @throws MicaException
* if any problem related to Scratchbox communication occurs,
* including no scratchbox 1 detected
*/
public static String getCurrentSboxVersion(IMachine machine)
- throws ESboxException {
+ throws MicaException {
// find cached value
CacheUtils.getInstance().ensureCurrentMachine(SB1_MACHINE, machine);
String version = (String) CacheUtils.getInstance().getCachedValue(
@@ -165,7 +165,7 @@
*
* @see org.maemo.mica.maemosdk.core.sdk.IScratchboxSDK#getCurrentTarget()
*/
- public String getCurrentTarget() throws ESboxException {
+ public String getCurrentTarget() throws MicaException {
GetCurrentTargetCommand getCurrentTargetCommand = new GetCurrentTargetCommand(
getCommandAbstractor(), this);
return (String) getCurrentTargetCommand
@@ -177,7 +177,7 @@
*
* @see org.maemo.mica.maemosdk.core.sdk.IScratchboxSDK#getTargets()
*/
- public List<String> getTargets() throws ESboxException {
+ public List<String> getTargets() throws MicaException {
CacheUtils.getInstance().ensureCurrentMachine(SB_MACHINE, this.getMachine());
String[] targetsArray = (String[]) CacheUtils.getInstance()
@@ -217,7 +217,7 @@
* org.maemo.mica.maemosdk.core.sdk.IScratchboxSDK#removeTarget(java.lang
* .String)
*/
- public boolean removeTarget(String targetName) throws ESboxException {
+ public boolean removeTarget(String targetName) throws MicaException {
List<String> params = new ArrayList<String>();
params.add(targetName);
@@ -235,7 +235,7 @@
*
* @see org.maemo.mica.maemosdk.sb1.core.IScratchbox1SDK#getDevkits()
*/
- public List<String> getDevkits() throws ESboxException {
+ public List<String> getDevkits() throws MicaException {
ListDevkitsCommand listDevkitsCommand = new ListDevkitsCommand(
getCommandAbstractor());
return listDevkitsCommand.performCommand(new ArrayList<String>());
@@ -246,7 +246,7 @@
*
* @see org.maemo.mica.maemosdk.sb1.core.IScratchbox1SDK#getSessions()
*/
- public List<String> getSessions() throws ESboxException {
+ public List<String> getSessions() throws MicaException {
ListSessionsCommand listSessionsCommand = new ListSessionsCommand(
getCommandAbstractor());
return listSessionsCommand.performCommand(new ArrayList<String>());
@@ -257,7 +257,7 @@
*
* @see org.maemo.mica.maemosdk.sb1.core.IScratchbox1SDK#killProcess()
*/
- public boolean killProcess() throws ESboxException {
+ public boolean killProcess() throws MicaException {
List<String> params = new ArrayList<String>();
KillallCommand killallCommand = new KillallCommand(
getCommandAbstractor());
@@ -271,7 +271,7 @@
* org.maemo.mica.maemosdk.sb1.core.IScratchbox1SDK#killProcess(java.lang
* .String)
*/
- public boolean killProcess(String signal) throws ESboxException {
+ public boolean killProcess(String signal) throws MicaException {
List<String> params = new ArrayList<String>();
params.add(signal);
KillallCommand killallCommand = new KillallCommand(
@@ -286,7 +286,7 @@
* org.maemo.mica.maemosdk.sb1.core.IScratchbox1SDK#selectTarget(java.lang
* .String)
*/
- public boolean selectTarget(String targetName) throws ESboxException {
+ public boolean selectTarget(String targetName) throws MicaException {
List<String> params = new ArrayList<String>();
params.add(targetName);
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDKTarget.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDKTarget.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDKTarget.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.command.GetGdbQemuCommandPatternCommand;
import org.maemo.esbox.internal.scratchbox.sb1.launcher.Scratchbox1ProcessLauncherFactory;
import org.maemo.mica.common.core.CorePreferenceConstants;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.process.IProcessLauncherFactory;
import org.maemo.mica.common.core.sdk.ISDKPlatform;
@@ -85,7 +85,7 @@
* getGdbQemuCommandPattern(java.lang.String)
*/
public synchronized String getGdbQemuCommandPattern(String architecture)
- throws ESboxException {
+ throws MicaException {
GetGdbQemuCommandPatternCommand command = new GetGdbQemuCommandPatternCommand(
this, this.getCommandAbstractor());
List<String> arguments = new ArrayList<String>(1);
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -12,7 +12,7 @@
package org.maemo.esbox.internal.scratchbox.sb1.launcher;
import org.maemo.esbox.internal.scratchbox.sb1.Activator;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.process.*;
import org.maemo.mica.common.core.process.ProcessLauncherUtils.Results;
import org.maemo.mica.common.core.sdk.ISDKTarget;
@@ -59,7 +59,7 @@
.launchAndReadStandardStreams(launcher, null);
standardEnv = EnvironmentProperties
.createFromShellEnvDump(results.stdout);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
Activator
.getErrorLogger()
.logError(
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -18,7 +18,7 @@
import org.maemo.esbox.internal.scratchbox.sb1.Activator;
import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.Policy;
import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
import org.maemo.mica.common.core.env.IEnvironmentOperation;
@@ -154,7 +154,7 @@
private static boolean copiedRunScript;
@Override
- protected void setupForLaunch() throws ESboxException {
+ protected void setupForLaunch() throws MicaException {
super.setupForLaunch();
// Ensure the run script is available.
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/provider/Scratchbox1SDKProvider.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/provider/Scratchbox1SDKProvider.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/provider/Scratchbox1SDKProvider.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -51,7 +51,7 @@
*
* @see org.maemo.mica.common.core.sdk.ISDKProvider#createSDKs()
*/
- public List<ISDK> createSDKs() throws ESboxException {
+ public List<ISDK> createSDKs() throws MicaException {
ErrorLogger logger = Activator.getErrorLogger();
List<ISDK> sdks = new ArrayList<ISDK>();
@@ -81,7 +81,7 @@
* @throws ScratchboxException
*/
private IScratchboxSDK getMachineSDKs(IPreferenceProvider prefProvider,
- IMachine machine) throws ESboxException {
+ IMachine machine) throws MicaException {
ErrorLogger logger = Activator.getErrorLogger();
// only support one Scratchbox 1.x installation
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -21,12 +21,12 @@
import org.maemo.esbox.internal.scratchbox.sb1.core.Scratchbox1SDK;
import org.maemo.esbox.internal.scratchbox.sb1.ui.wizard.NewScratchbox1TargetWizard;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.Policy;
import org.maemo.mica.common.core.adapters.ISDKManageTargetAdapter;
import org.maemo.mica.common.core.sdk.ISDK;
import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.internal.api.maemosdk.ui.adapters.ESboxTargetRemover;
+import org.maemo.mica.internal.api.maemosdk.ui.adapters.MaemoTargetRemover;
import java.util.List;
@@ -75,9 +75,9 @@
* #createTargetRemover(org.eclipse.swt.widgets.Shell,
* org.maemo.mica.common.core.sdk.ISDKTarget, boolean)
*/
- protected ESboxTargetRemover createTargetRemover(Shell shell,
+ protected MaemoTargetRemover createTargetRemover(Shell shell,
ISDKTarget target, boolean deleteRootstrap) {
- return new ESboxTargetRemover(shell, target, deleteRootstrap) {
+ return new MaemoTargetRemover(shell, target, deleteRootstrap) {
@Override
protected void doDeleteTargetRootstrap(IProgressMonitor monitor,
@@ -90,7 +90,7 @@
*/
@Override
protected void doRemoveTarget(ISDK sdk, String targetName,
- IProgressMonitor monitor) throws ESboxException {
+ IProgressMonitor monitor) throws MicaException {
((IScratchboxSDK) sdk).removeTarget(targetName);
monitor.worked(1);
}
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1TargetWizard.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1TargetWizard.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1TargetWizard.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -23,7 +23,7 @@
import org.maemo.esbox.internal.api.scratchbox.ui.wizards.*;
import org.maemo.esbox.internal.scratchbox.sb1.Activator;
import org.maemo.esbox.internal.scratchbox.sb1.core.Scratchbox1SDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.ErrorLogger;
import org.maemo.mica.common.core.sdk.ISDKTarget;
import org.maemo.mica.internal.api.maemosdk.ui.wizards.sbrsh.SbrshConfigurationNFSServer;
@@ -169,7 +169,7 @@
createdTarget = sdk.findSDKTarget(targetName);
return true;
- } catch (ESboxException e) {
+ } catch (MicaException e) {
ErrorLogger errorLogger = Activator.getErrorLogger();
errorLogger.logAndShowError("Cannot get create target "
+ targetName, e);
@@ -241,7 +241,7 @@
// ScratchboxFacade.getInstance().configureSbrsh(sdk, targetName,
// deviceTargetAddr, nfsHostname);
sdk.configureSbrsh(targetName, deviceTargetAddr, nfsHostname);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
ErrorLogger errorLogger = Activator.getErrorLogger();
errorLogger.logAndShowError("Cannot configure sbrsh", e);
}
@@ -261,7 +261,7 @@
// ScratchboxFacade.getInstance().addSbrshAccessList(sdk,
// deviceTargetIP, username, localAddr);
sdk.addSbrshAccessList(deviceTargetIP, username, localAddr);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
errorLogger
.logAndShowError(
"Cannot add user to the access list of sbrshd at the target device",
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/TargetWizardDevkitsPage.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/TargetWizardDevkitsPage.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/TargetWizardDevkitsPage.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -23,7 +23,7 @@
import org.eclipse.swt.widgets.*;
import org.maemo.esbox.internal.scratchbox.sb1.Activator;
import org.maemo.esbox.internal.scratchbox.sb1.core.Scratchbox1SDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.ErrorLogger;
import org.maemo.mica.internal.api.maemosdk.ui.wizards.IValidatePage;
@@ -88,7 +88,7 @@
try {
// devkits = ScratchboxFacade.getInstance().getDevkits(sdk);
devkits = sdk.getDevkits();
- } catch (ESboxException e) {
+ } catch (MicaException e) {
ErrorLogger errorLogger = Activator.getErrorLogger();
errorLogger.logAndShowError("Cannot get list of devkits", e);
return;
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/scratchbox/sb1/sdk/IScratchbox1SDK.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/scratchbox/sb1/sdk/IScratchbox1SDK.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/scratchbox/sb1/sdk/IScratchbox1SDK.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import java.util.List;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
/**
* @author baranov
@@ -26,19 +26,19 @@
* Return the list of available devkits at Scratchbox.
*
* @return a list with the available devkits at Scratchbox.
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
- public List<String> getDevkits() throws ESboxException;
+ public List<String> getDevkits() throws MicaException;
/**
* Return the current sessions of Scratchbox.
*
* @return a list with current sessions Scratchbox.
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
- public List<String> getSessions() throws ESboxException;
+ public List<String> getSessions() throws MicaException;
/**
* Select another available target as current Scratchbox target.
@@ -46,20 +46,20 @@
* @param targetName
* the name of the new target.
* @return true, if the operation is performed successfully.
- * @throws ESboxException
+ * @throws MicaException
* if the target to be selected does not exists or if some
* problem related to Scratchbox communication occurs.
*/
- public boolean selectTarget(String targetName) throws ESboxException;
+ public boolean selectTarget(String targetName) throws MicaException;
/**
* Kill an Scratchbox process.
*
* @return true, if the is performed successfully.
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
- public boolean killProcess() throws ESboxException;
+ public boolean killProcess() throws MicaException;
/**
* Kill an Scratchbox process.
@@ -67,8 +67,8 @@
* @param signal
* the signal emitted to scratchbox processes.
* @return true, if the is performed successfully.
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
- public boolean killProcess(String signal) throws ESboxException;
+ public boolean killProcess(String signal) throws MicaException;
}
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/plugin.xml
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/plugin.xml 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/plugin.xml 2008-10-24 00:22:53 UTC (rev 891)
@@ -36,6 +36,8 @@
version="17">
</preferenceSetProvider>
</extension>
+ <!-- this was incorrectly refactored and is broken: there should be a single
+ top-level wizard in mica.common.ui for this
<extension
point="org.eclipse.ui.newWizards">
<wizard
@@ -45,5 +47,6 @@
name="Scratchbox Targets">
</wizard>
</extension>
+ -->
</plugin>
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/CreateMaemoRootstrapSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/CreateMaemoRootstrapSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/CreateMaemoRootstrapSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.mica.common.core.CoreConsoleManager;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
import org.maemo.mica.common.core.process.ProcessLauncherUtils;
import org.maemo.mica.common.core.sdk.ISDK;
@@ -55,7 +55,7 @@
* .lang.Object)
*/
public Boolean performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/CreateTargetSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/CreateTargetSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/CreateTargetSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -14,7 +14,7 @@
import org.maemo.esbox.internal.api.scratchbox.sb2.core.SB2PreferenceConstants;
import org.maemo.esbox.internal.scratchbox.sb2.Activator;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.process.*;
import org.maemo.mica.common.core.sdk.ISDK;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
@@ -49,7 +49,7 @@
* embedded.core.scratchbox.command.IScratchboxCommand#performCommand(java
* .lang.Object)
*/
- public Object performCommand(List<String> param) throws ESboxException {
+ public Object performCommand(List<String> param) throws MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetCurrentTargetSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetCurrentTargetSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetCurrentTargetSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -44,7 +44,7 @@
* .lang.Object)
*/
public String performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetGdbQemuCommandPatternCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetGdbQemuCommandPatternCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetGdbQemuCommandPatternCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -16,7 +16,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -44,7 +44,7 @@
* .lang.Object)
*/
public String performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
@@ -71,7 +71,7 @@
*
* @return qemu name, or <code>null</code> if not using qemu
*/
- protected String getConfiguredQemu() throws ESboxException {
+ protected String getConfiguredQemu() throws MicaException {
return null;
}
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetMaemoRootstrapLocationCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetMaemoRootstrapLocationCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetMaemoRootstrapLocationCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -19,7 +19,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.ArrayList;
@@ -57,7 +57,7 @@
* .List)
*/
public Object performCommand(List<String> params)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(params))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetVersionScratchboxCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetVersionScratchboxCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/GetVersionScratchboxCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.api.scratchbox.sb2.core.SB2PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -50,7 +50,7 @@
* .util.List)
*/
public String performCommand(List<String> params)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(params))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListAvailableMaemoRootstrapsSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListAvailableMaemoRootstrapsSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListAvailableMaemoRootstrapsSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.sb2.sdk.MaemoRootstrap;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
import org.maemo.mica.common.core.process.ProcessLauncherUtils;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
@@ -48,7 +48,7 @@
* .lang.Object)
*/
public List<MaemoRootstrap> performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListCompilersSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListCompilersSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListCompilersSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -18,7 +18,7 @@
import org.maemo.esbox.internal.scratchbox.sb2.Activator;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.ArrayList;
@@ -43,7 +43,7 @@
* .lang.Object)
*/
public List<String> performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListCputranspSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListCputranspSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListCputranspSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.eclipse.core.runtime.Path;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.process.ProcessLauncherUtils;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
@@ -40,7 +40,7 @@
* .lang.Object)
*/
public List<String> performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListInstalledMaemoRootstrapsSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListInstalledMaemoRootstrapsSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListInstalledMaemoRootstrapsSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -14,7 +14,7 @@
import org.maemo.esbox.internal.api.scratchbox.sb2.core.SB2PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.Collections;
@@ -44,7 +44,7 @@
* .lang.Object)
*/
public List<String> performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListTargetsCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListTargetsCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ListTargetsCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.maemo.esbox.internal.api.scratchbox.sb2.core.SB2PreferenceConstants;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
import java.util.List;
@@ -39,7 +39,7 @@
* .lang.Object)
*/
public List<String> performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoRootstrapSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoRootstrapSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/MaemoRootstrapSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import org.maemo.esbox.internal.api.scratchbox.sb2.core.SB2PreferenceConstants;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
import org.maemo.mica.common.core.process.CommandLineArguments;
import org.maemo.mica.common.core.process.ShellTemplateSubstitutor;
@@ -63,7 +63,7 @@
@SuppressWarnings("unchecked")
protected List<String> doPerformCommand(List<String> params,
IEnvironmentModifierBlock envBlock, long timeout)
- throws ESboxException {
+ throws MicaException {
String rootstrapCommand = commandAbstractor
.getPreferenceValue(SB2PreferenceConstants.SB2_MAEMO_ROOTSTRAP_COMMAND);
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/RemoveMaemoRootstrapSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/RemoveMaemoRootstrapSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/RemoveMaemoRootstrapSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -16,7 +16,7 @@
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.mica.common.core.CoreConsoleManager;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
import org.maemo.mica.common.core.process.ProcessLauncherUtils;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
@@ -50,7 +50,7 @@
* .lang.Object)
*/
public Boolean performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/RemoveTargetSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/RemoveTargetSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/RemoveTargetSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -17,7 +17,7 @@
import org.maemo.esbox.internal.scratchbox.sb2.core.Scratchbox2SDK;
import org.maemo.esbox.scratchbox.core.command.ScratchboxInvalidParameterException;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.ISDK;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
@@ -46,7 +46,7 @@
* .lang.Object)
*/
public Object performCommand(List<String> param)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
if (!this.checkParameters(param))
throw new ScratchboxInvalidParameterException(
"Invalid number of parameters");
@@ -87,7 +87,7 @@
* @throws ScratchboxException
* if some problem occurrs while requesting Scratchbox services.
*/
- private boolean targetExist(String targetToRemove) throws ESboxException {
+ private boolean targetExist(String targetToRemove) throws MicaException {
List<String> targetsAvailable = new ListTargetsCommand(
commandAbstractor).performCommand(new ArrayList<String>());
return targetsAvailable.contains(targetToRemove);
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ShowPathMappingSb2Command.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ShowPathMappingSb2Command.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/ShowPathMappingSb2Command.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -16,7 +16,7 @@
import org.eclipse.core.runtime.Path;
import org.maemo.esbox.internal.api.scratchbox.sb2.core.SB2PreferenceConstants;
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.process.*;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
@@ -43,7 +43,7 @@
}
public Map<IPath, IPath> performCommand(List<String> params)
- throws ScratchboxException, ESboxException {
+ throws ScratchboxException, MicaException {
List<String> cmdLine = CommandLineArguments
.createFromVarArgs(
commandAbstractor
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2FileSystemMapping.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2FileSystemMapping.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2FileSystemMapping.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -9,7 +9,7 @@
import org.eclipse.core.runtime.Path;
import org.maemo.esbox.internal.scratchbox.sb2.Activator;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.internal.api.common.core.machine.FileSystemMapping;
import org.maemo.mica.internal.api.common.core.machine.IFileSystemMappingImpl;
@@ -64,7 +64,7 @@
topLevelPaths);
// pathMapping = ScratchboxFacade.getInstance().getSb2PathMapping(
// sdkTarget, topLevelPaths);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
Activator.getErrorLogger().logError(
"Unable to map Scratchbox 2 paths", e);
return;
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -18,7 +18,7 @@
import org.maemo.esbox.scratchbox.sb2.sdk.IScratchbox2SDK;
import org.maemo.esbox.scratchbox.sb2.sdk.MaemoRootstrap;
import org.maemo.mica.common.core.CorePreferenceConstants;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.machine.IMachine;
import org.maemo.mica.common.core.machine.MachineUtils;
import org.maemo.mica.common.core.sdk.*;
@@ -60,7 +60,7 @@
List<String> targetNames;
try {
targetNames = getTargets();
- } catch (ESboxException e) {
+ } catch (MicaException e) {
Activator.getErrorLogger().logError("Could not refresh targets", e);
return;
}
@@ -79,7 +79,7 @@
try {
IPath sb2RootstrapPath = getMaemoRootstrapPath(sdkTarget);
sdkTarget.setRootstrapPath(sb2RootstrapPath);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
Activator.getErrorLogger().logError(null, e);
}
@@ -92,7 +92,7 @@
*
* @see org.maemo.mica.maemosdk.core.sdk.IScratchboxSDK#getTargets()
*/
- public List<String> getTargets() throws ESboxException {
+ public List<String> getTargets() throws MicaException {
CacheUtils.getInstance().ensureCurrentMachine(SB_MACHINE, this.getMachine());
String[] targetsArray = (String[]) CacheUtils.getInstance()
@@ -118,7 +118,7 @@
* org.maemo.mica.maemosdk.core.sdk.AbstractScratchboxSDK#getCommandAbstractor
* ()
*/
- public ICommandAbstractor getCommandAbstractor() throws ESboxException {
+ public ICommandAbstractor getCommandAbstractor() throws MicaException {
return getSb2WrappedAbstractor(super.getCommandAbstractor(), this
.getMachine());
}
@@ -146,7 +146,7 @@
* .String, java.lang.String, java.lang.String, java.lang.String)
*/
public boolean createTarget(String targetName, String compiler,
- String devkits, String cputransp) throws ESboxException {
+ String devkits, String cputransp) throws MicaException {
List<String> params = new ArrayList<String>();
params.add(targetName);
params.add(compiler);
@@ -165,7 +165,7 @@
*
* @see org.maemo.mica.maemosdk.core.sdk.IScratchboxSDK#getCompilers()
*/
- public List<String> getCompilers() throws ESboxException {
+ public List<String> getCompilers() throws MicaException {
ListCompilersSb2Command listCompilersCommand = new ListCompilersSb2Command(
getCommandAbstractor());
return listCompilersCommand.performCommand(EMPTY_ARGS);
@@ -176,7 +176,7 @@
*
* @see org.maemo.mica.maemosdk.core.sdk.IScratchboxSDK#getCputransp()
*/
- public List<String> getCputransp() throws ESboxException {
+ public List<String> getCputransp() throws MicaException {
ListCputranspSb2Command listCputranspCommand = new ListCputranspSb2Command(
getCommandAbstractor());
return listCputranspCommand.performCommand(EMPTY_ARGS);
@@ -187,7 +187,7 @@
*
* @see org.maemo.mica.maemosdk.core.sdk.IScratchboxSDK#getCurrentTarget()
*/
- public String getCurrentTarget() throws ESboxException {
+ public String getCurrentTarget() throws MicaException {
GetCurrentTargetSb2Command getCurrentTargetCommand = new GetCurrentTargetSb2Command(
getCommandAbstractor());
return (String) getCurrentTargetCommand
@@ -201,7 +201,7 @@
* org.maemo.mica.maemosdk.core.sdk.IScratchboxSDK#removeTarget(java.lang
* .String)
*/
- public boolean removeTarget(String targetName) throws ESboxException {
+ public boolean removeTarget(String targetName) throws MicaException {
List<String> params = new ArrayList<String>();
params.add(targetName);
@@ -271,10 +271,10 @@
* @param sdk
* the SDK to check
* @return List, never null
- * @throws ESboxException
+ * @throws MicaException
*/
public synchronized List<String> getInstalledMaemoRootstraps()
- throws ESboxException {
+ throws MicaException {
ListInstalledMaemoRootstrapsSb2Command command = new ListInstalledMaemoRootstrapsSb2Command(
MachineUtils.getHostCommandAbstractor(this.getMachine()));
return command.performCommand(EMPTY_ARGS);
@@ -288,7 +288,7 @@
* (org.maemo.mica.common.core.machine.IMachine)
*/
public List<MaemoRootstrap> getAvailableMaemoRootstraps(IMachine machine)
- throws ESboxException {
+ throws MicaException {
ListAvailableMaemoRootstrapsSb2Command command = new ListAvailableMaemoRootstrapsSb2Command(
MachineUtils.getHostCommandAbstractor(machine));
return command.performCommand(EMPTY_ARGS);
@@ -304,7 +304,7 @@
*/
public boolean createRootstrapTarget(String targetName,
boolean useHostTools, boolean force, IProgressMonitor monitor)
- throws ESboxException {
+ throws MicaException {
List<String> params = new ArrayList<String>();
params.add(targetName);
params.add(Boolean.toString(useHostTools));
@@ -326,7 +326,7 @@
* .lang.String, boolean, org.eclipse.core.runtime.IProgressMonitor)
*/
public boolean removeRootstrap(String targetName, boolean force,
- IProgressMonitor monitor) throws ESboxException {
+ IProgressMonitor monitor) throws MicaException {
List<String> params = new ArrayList<String>();
params.add(targetName);
params.add(Boolean.toString(force));
@@ -349,11 +349,11 @@
* @param hostPaths
* array of paths to map
* @return map of resolved host paths to target paths
- * @throws ESboxException
+ * @throws MicaException
*/
public static synchronized Map<IPath, IPath> getSb2PathMapping(
IScratchboxSDKTarget sdkTarget, List<IPath> hostPaths)
- throws ESboxException {
+ throws MicaException {
// find cached value
CacheUtils.getInstance().ensureCurrentMachine(SB2_MACHINE, sdkTarget.getSDK()
.getMachine());
@@ -424,12 +424,12 @@
* Return the current version of Scratchbox 2
*
* @return the current version of Scratchbox 2.
- * @throws ESboxException
+ * @throws MicaException
* if any problem related to Scratchbox communication occurs,
* including no scratchbox 2 detected
*/
public static synchronized String getCurrentSboxVersion(IMachine machine)
- throws ESboxException {
+ throws MicaException {
// find cached value
CacheUtils.getInstance().ensureCurrentMachine(SB2_MACHINE, machine);
String version = (String) CacheUtils.getInstance().getCachedValue(
@@ -458,11 +458,11 @@
*
* @param scratchbox2SDKTarget
* @return path of rootstrap
- * @throws ESboxException
+ * @throws MicaException
* if not located
*/
private synchronized IPath getMaemoRootstrapPath(
- Scratchbox2SDKTarget sdkTarget) throws ESboxException {
+ Scratchbox2SDKTarget sdkTarget) throws MicaException {
// find cached value
CacheUtils.getInstance().ensureCurrentMachine(SB_MACHINE, sdkTarget.getSDK()
.getMachine());
@@ -483,10 +483,10 @@
// be sure to record something in the cache for broken targets so
// we don't keep asking all the time
- ESboxException caughtException = null;
+ MicaException caughtException = null;
try {
rootstrapPath = (IPath) command.performCommand(EMPTY_ARGS);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
rootstrapPath = Path.EMPTY;
caughtException = e;
}
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -17,7 +17,7 @@
import org.maemo.esbox.internal.scratchbox.sb2.launcher.Scratchbox2ProcessLauncherFactory;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
import org.maemo.mica.common.core.CorePreferenceConstants;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.process.IProcessLauncherFactory;
import org.maemo.mica.common.core.sdk.ISDKPlatform;
@@ -108,7 +108,7 @@
* @return String or null if no cputransp used or not using qemu
*/
public synchronized String getGdbQemuCommandPattern(String architecture)
- throws ESboxException {
+ throws MicaException {
// ScratchboxSDK2 sdk = (ScratchboxSDK2)this.getSDK();
GetGdbQemuCommandPatternCommand command = new GetGdbQemuCommandPatternCommand(
this, this.getCommandAbstractor());
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -14,7 +14,7 @@
import org.maemo.esbox.internal.api.scratchbox.sb2.core.SB2PreferenceConstants;
import org.maemo.esbox.internal.scratchbox.sb2.Activator;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.process.*;
import org.maemo.mica.common.core.process.ProcessLauncherUtils.Results;
import org.maemo.mica.common.core.sdk.ISDKTarget;
@@ -69,7 +69,7 @@
.launchAndReadStandardStreams(launcher, null);
standardEnv = EnvironmentProperties
.createFromShellEnvDump(results.stdout);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
Activator
.getErrorLogger()
.logError(
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -13,7 +13,7 @@
import org.eclipse.core.runtime.IPath;
import org.maemo.esbox.internal.api.scratchbox.sb2.core.SB2PreferenceConstants;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
import org.maemo.mica.common.core.process.*;
import org.maemo.mica.common.core.sdk.ISDKTarget;
@@ -95,7 +95,7 @@
}
@Override
- protected void setupForLaunch() throws ESboxException {
+ protected void setupForLaunch() throws MicaException {
// nothing
super.setupForLaunch();
}
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/provider/Scratchbox2SDKProvider.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/provider/Scratchbox2SDKProvider.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/provider/Scratchbox2SDKProvider.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -51,7 +51,7 @@
*
* @see org.maemo.mica.common.core.sdk.ISDKProvider#createSDKs()
*/
- public List<ISDK> createSDKs() throws ESboxException {
+ public List<ISDK> createSDKs() throws MicaException {
ErrorLogger logger = Activator.getErrorLogger();
List<ISDK> sdks = new ArrayList<ISDK>();
@@ -89,7 +89,7 @@
* @throws ScratchboxException
*/
private Scratchbox2SDK getMachineSDK(IPreferenceProvider prefProvider,
- IMachine machine) throws ESboxException {
+ IMachine machine) throws MicaException {
ErrorLogger logger = Activator.getErrorLogger();
// only support one Scratchbox 2 installation
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -21,12 +21,12 @@
import org.maemo.esbox.internal.scratchbox.sb2.ui.wizard.NewScratchbox2TargetWizard;
import org.maemo.esbox.scratchbox.sb2.sdk.IScratchbox2SDK;
import org.maemo.esbox.scratchbox.sb2.sdk.MaemoRootstrap;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.Policy;
import org.maemo.mica.common.core.adapters.ISDKManageTargetAdapter;
import org.maemo.mica.common.core.sdk.ISDK;
import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.internal.api.maemosdk.ui.adapters.ESboxTargetRemover;
+import org.maemo.mica.internal.api.maemosdk.ui.adapters.MaemoTargetRemover;
import java.util.List;
@@ -66,13 +66,13 @@
return Policy.getCancelStatus(Activator.getDefault());
}
- protected ESboxTargetRemover createTargetRemover(Shell shell,
+ protected MaemoTargetRemover createTargetRemover(Shell shell,
ISDKTarget target, boolean deleteRootstrap) {
- return new ESboxTargetRemover(shell, target, deleteRootstrap) {
+ return new MaemoTargetRemover(shell, target, deleteRootstrap) {
protected void doDeleteTargetRootstrap(IProgressMonitor monitor,
- ISDK sdk) throws ESboxException {
+ ISDK sdk) throws MicaException {
((IScratchbox2SDK) sdk).removeRootstrap(
sdkTarget.getName(), true, new SubProgressMonitor(
monitor, 1));
@@ -83,7 +83,7 @@
*/
@Override
protected void doRemoveTarget(ISDK sdk, String targetName,
- IProgressMonitor monitor) throws ESboxException {
+ IProgressMonitor monitor) throws MicaException {
((IScratchbox2SDK) sdk).removeTarget(targetName);
monitor.worked(1);
@@ -107,7 +107,7 @@
break;
}
}
- } catch (ESboxException e1) {
+ } catch (MicaException e1) {
Activator.getErrorLogger().logError(
"Failure scanning maemo rootstraps", e1);
}
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/MaemoRootstrapContentLabelProvider.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/MaemoRootstrapContentLabelProvider.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/MaemoRootstrapContentLabelProvider.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -20,7 +20,7 @@
import org.eclipse.swt.widgets.Display;
import org.maemo.esbox.scratchbox.sb2.sdk.IScratchbox2SDK;
import org.maemo.esbox.scratchbox.sb2.sdk.MaemoRootstrap;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import java.util.ArrayList;
import java.util.List;
@@ -70,7 +70,7 @@
rootstraps.remove(1);
rootstraps.addAll(realRootstraps);
}
- } catch (final ESboxException e) {
+ } catch (final MicaException e) {
Display.getDefault().syncExec(new Runnable() {
public void run() {
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/NewScratchbox2TargetWizard.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/NewScratchbox2TargetWizard.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/NewScratchbox2TargetWizard.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -28,7 +28,7 @@
import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.sb2.sdk.IScratchbox2SDK;
import org.maemo.esbox.scratchbox.sb2.sdk.MaemoRootstrap;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.ErrorLogger;
import org.maemo.mica.common.core.sdk.ISDKTarget;
import org.maemo.mica.internal.api.maemosdk.ui.wizards.sbrsh.SbrshConfigurationNFSServer;
@@ -189,7 +189,7 @@
sdk.createTarget(targetName, compilerName, null, cpuMethod);
createdTarget = sdk.findSDKTarget(targetName);
return true;
- } catch (ESboxException e) {
+ } catch (MicaException e) {
ErrorLogger errorLogger = Activator.getErrorLogger();
errorLogger.logAndShowError("Cannot get create target "
+ targetName, e);
@@ -222,7 +222,7 @@
+ "Do you want to overwrite the rootstrap?",
targetName));
}
- } catch (ESboxException e) {
+ } catch (MicaException e) {
ErrorLogger errorLogger = Activator.getErrorLogger();
errorLogger.logError("Cannot detect installed rootstraps", e);
}
@@ -231,7 +231,7 @@
if (create) {
try {
createRootstrap(targetName, useHostTools());
- } catch (ESboxException e) {
+ } catch (MicaException e) {
ErrorLogger errorLogger = Activator.getErrorLogger();
errorLogger.logAndShowError(
"Cannot get create rootstrap target " + targetName, e);
@@ -254,7 +254,7 @@
sdk.createRootstrapTarget(targetName, useHostTools,
true, new SubProgressMonitor(monitor, 1));
createdTarget = sdk.findSDKTarget(targetName);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
throw new InvocationTargetException(e);
}
monitor.done();
@@ -325,7 +325,7 @@
try {
sdk.configureSbrsh(targetName, deviceTargetAddr, nfsHostname);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
ErrorLogger errorLogger = Activator.getErrorLogger();
errorLogger.logAndShowError("Cannot configure sbrsh", e);
}
@@ -343,7 +343,7 @@
try {
String localAddr = getLocalIP();
sdk.addSbrshAccessList(deviceTargetIP, username, localAddr);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
errorLogger
.logAndShowError(
"Cannot add user to the access list of sbrshd at the target device",
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -15,7 +15,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.machine.IMachine;
public interface IScratchbox2SDK extends IScratchboxSDK {
@@ -47,12 +47,12 @@
* let the user choose (in the console :/) whether to overwrite
* or keep an existing one
* @return true if succeeded, false if failed
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
public boolean createRootstrapTarget(String targetName,
boolean useHostTools, boolean force, IProgressMonitor monitor)
- throws ESboxException;
+ throws MicaException;
/**
* Create a new rootstrap target for Scratchbox 2. The target is named after
@@ -65,11 +65,11 @@
* let the user choose (in the console :/) whether to overwrite
* or keep an existing one
* @return true if succeeded, false if failed
- * @throws ESboxException
+ * @throws MicaException
* if some problem related to Scratchbox communication occurs.
*/
public boolean removeRootstrap(String targetName, boolean force,
- IProgressMonitor monitor) throws ESboxException;
+ IProgressMonitor monitor) throws MicaException;
/**
* Get the names of rootstraps already installed. This may inclue those that
@@ -78,18 +78,18 @@
* @param sdk
* the SDK to check
* @return List, never null
- * @throws ESboxException
+ * @throws MicaException
*/
- public List<String> getInstalledMaemoRootstraps() throws ESboxException;
+ public List<String> getInstalledMaemoRootstraps() throws MicaException;
/**
* Get the MaemoRootstrap items available for installation. This includes
* any that might already be defined.
*
* @return List, never null
- * @throws ESboxException
+ * @throws MicaException
*/
public List<MaemoRootstrap> getAvailableMaemoRootstraps(IMachine machine)
- throws ESboxException;
+ throws MicaException;
}
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -21,11 +21,11 @@
import org.eclipse.swt.widgets.*;
import org.maemo.esbox.internal.api.scratchbox.core.sdk.CacheUtils;
import org.maemo.esbox.internal.scratchbox.ui.UIActivator;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.Policy;
import org.maemo.mica.common.core.adapters.ISDKManageTargetAdapter;
import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.internal.api.maemosdk.ui.adapters.ESboxTargetRemover;
+import org.maemo.mica.internal.api.maemosdk.ui.adapters.MaemoTargetRemover;
import java.lang.reflect.InvocationTargetException;
import java.text.MessageFormat;
@@ -126,21 +126,21 @@
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
- ESboxTargetRemover remover = createTargetRemover(shell, selectedTarget, deleteRootstrap);
+ MaemoTargetRemover remover = createTargetRemover(shell, selectedTarget, deleteRootstrap);
try {
remover.run(monitor);
- } catch (ESboxException e) {
+ } catch (MicaException e) {
throw new InvocationTargetException(e);
}
}
});
return Status.OK_STATUS;
} catch (Exception e) {
- if (e.getCause() instanceof ESboxException)
+ if (e.getCause() instanceof MicaException)
e = (Exception) e.getCause();
return UIActivator.createErrorStatus("Error removing target", e);
}
}
- protected abstract ESboxTargetRemover createTargetRemover(final Shell shell, final ISDKTarget target, final boolean deleteRootstrap);
+ protected abstract MaemoTargetRemover createTargetRemover(final Shell shell, final ISDKTarget target, final boolean deleteRootstrap);
}
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/TargetWizardCPUMethod.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/TargetWizardCPUMethod.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/TargetWizardCPUMethod.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -22,7 +22,7 @@
import org.eclipse.swt.widgets.*;
import org.maemo.esbox.internal.scratchbox.ui.UIActivator;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.ErrorLogger;
import org.maemo.mica.internal.api.maemosdk.ui.wizards.IValidatePage;
@@ -110,7 +110,7 @@
try {
// targetMethod = ScratchboxFacade.getInstance().getCputransp(sdk);
targetMethod = sdk.getCputransp();
- } catch (ESboxException e) {
+ } catch (MicaException e) {
ErrorLogger errorLogger = UIActivator.getErrorLogger();
errorLogger.logAndShowError("Cannot get list of CPU-Transparency Method", e);
return;
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/TargetWizardCompilerPage.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/TargetWizardCompilerPage.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/TargetWizardCompilerPage.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -22,7 +22,7 @@
import org.eclipse.swt.widgets.*;
import org.maemo.esbox.internal.scratchbox.ui.UIActivator;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
-import org.maemo.mica.common.core.ESboxException;
+import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.ErrorLogger;
import org.maemo.mica.internal.api.maemosdk.ui.wizards.IValidatePage;
@@ -88,7 +88,7 @@
try {
// compilers = ScratchboxFacade.getInstance().getCompilers(sdk);
compilers = sdk.getCompilers();
- } catch (ESboxException e) {
+ } catch (MicaException e) {
ErrorLogger errorLogger = UIActivator.getErrorLogger();
errorLogger.logAndShowError("Cannot get list of compilers", e);
return;
Modified: branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/scratchbox/ui/actions/ValidateVirtualMachineCommand.java
===================================================================
--- branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/scratchbox/ui/actions/ValidateVirtualMachineCommand.java 2008-10-23 21:43:22 UTC (rev 890)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/scratchbox/ui/actions/ValidateVirtualMachineCommand.java 2008-10-24 00:22:53 UTC (rev 891)
@@ -213,7 +213,7 @@
Process process;
try {
process = processLauncher.createProcess();
- } catch (ESboxException e) {
+ } catch (MicaException e) {
fail("Could not run ls on " + machine.getUserHome() + " directory.\nIf SSH connections to machine are failing, ensure the \nrun_linux_wait.bat script (in the plugin) has not been modified\nand that the virtual machine has booted properly:\n{0}",
e);
return false;
More information about the Esbox-commits
mailing list