[Esbox-commits] r1899 - in branches/work_Andre: org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/execEnv org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters 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
andregomes at garage.maemo.org
andregomes at garage.maemo.org
Tue Jul 28 22:31:47 EEST 2009
Author: andregomes
Date: 2009-07-28 22:31:46 +0300 (Tue, 28 Jul 2009)
New Revision: 1899
Modified:
branches/work_Andre/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/OldStyleProjectProperties.java
branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/execEnv/MaemoExecutionEnvironmentHandler.java
branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESBoxSBRSHLaunchAdapter.java
branches/work_Andre/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java
branches/work_Andre/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java
Log:
Reverting changes done at rev 1896.
Modified: branches/work_Andre/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
===================================================================
--- branches/work_Andre/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java 2009-07-28 19:13:33 UTC (rev 1898)
+++ branches/work_Andre/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java 2009-07-28 19:31:46 UTC (rev 1899)
@@ -93,7 +93,7 @@
}
} else {
Activator.getErrorLogger().logError(
- "There is no way to test Maemo AF status for " + sdkTarget.getDisplayName(), null);
+ "I do not know how to test Maemo AF for " + sdkTarget.getDisplayName(), null);
return false;
}
}
@@ -191,7 +191,7 @@
try {
MaemoScriptLauncher.getInstance().startMaemo(target, monitor);
} catch (MicaException e) {
- Activator.getErrorLogger().showError("Maemo AF was not sucessfull started", e);
+ Activator.getErrorLogger().showError(null, e);
}
return Status.OK_STATUS;
}
@@ -216,7 +216,7 @@
try {
MaemoScriptLauncher.getInstance().restartMaemo(target, monitor);
} catch (MicaException e) {
- Activator.getErrorLogger().showError("Maemo AF was not sucessfull restarted", e);
+ Activator.getErrorLogger().showError(null, e);
}
return Status.OK_STATUS;
}
@@ -241,7 +241,7 @@
MaemoScriptLauncher.getInstance().stopMaemo(target, monitor);
MaemoScriptLauncher.getInstance().killMaemo(target);
} catch (MicaException e) {
- Activator.getErrorLogger().showError("Maemo AF was not sucessfull stopped", e);
+ Activator.getErrorLogger().showError(null, e);
}
return Status.OK_STATUS;
}
@@ -260,7 +260,7 @@
try {
MaemoScriptLauncher.getInstance().startX(target, monitor);
} catch (MicaException e) {
- Activator.getErrorLogger().showError("X Server was not sucessfull started", e);
+ Activator.getErrorLogger().showError(null, e);
}
return Status.OK_STATUS;
}
@@ -280,7 +280,7 @@
try {
MaemoScriptLauncher.getInstance().stopX(target, monitor);
} catch (MicaException e) {
- Activator.getErrorLogger().showError("X Server was not sucessfull stopped", e);
+ Activator.getErrorLogger().showError(null, e);
}
return Status.OK_STATUS;
}
Modified: branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/OldStyleProjectProperties.java
===================================================================
--- branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/OldStyleProjectProperties.java 2009-07-28 19:13:33 UTC (rev 1898)
+++ branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/OldStyleProjectProperties.java 2009-07-28 19:31:46 UTC (rev 1899)
@@ -70,7 +70,7 @@
return project.getPersistentProperty(property);
} catch (CoreException e) {
Activator.getErrorLogger().logError(
- "Could not read project property: " + property, e);
+ "Could not read project property", e);
return null;
}
}
Modified: branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/execEnv/MaemoExecutionEnvironmentHandler.java
===================================================================
--- branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/execEnv/MaemoExecutionEnvironmentHandler.java 2009-07-28 19:13:33 UTC (rev 1898)
+++ branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/execEnv/MaemoExecutionEnvironmentHandler.java 2009-07-28 19:31:46 UTC (rev 1899)
@@ -67,7 +67,7 @@
oneTimeWarn = (Boolean) workspaceRoot
.getSessionProperty(WARN_ARMEL_TARGET_EXECUTION);
} catch (CoreException e1) {
- Activator.getErrorLogger().logError("Unexpected exception when valdating Maemo execution environment", e1);
+ Activator.getErrorLogger().logError(null, e1);
}
if(oneTimeWarn != null && !oneTimeWarn.booleanValue())
@@ -76,7 +76,7 @@
try {
workspaceRoot.setSessionProperty(WARN_ARMEL_TARGET_EXECUTION, Boolean.FALSE);
} catch (CoreException e1) {
- Activator.getErrorLogger().logError("Unexpected exception error when valdating Maemo execution environment", e1);
+ Activator.getErrorLogger().logError(null, e1);
}
Display.getDefault().asyncExec(new Runnable() {
Modified: branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESBoxSBRSHLaunchAdapter.java
===================================================================
--- branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESBoxSBRSHLaunchAdapter.java 2009-07-28 19:13:33 UTC (rev 1898)
+++ branches/work_Andre/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESBoxSBRSHLaunchAdapter.java 2009-07-28 19:31:46 UTC (rev 1899)
@@ -250,7 +250,7 @@
} catch (MicaException e) {
// path isn't visible: continue with incoming path
Activator.getErrorLogger().logError(
- "Cannot exactly map project mount point to device", e);
+ "Can't exactly map project mount point to device", e);
return path;
}
}
Modified: branches/work_Andre/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java
===================================================================
--- branches/work_Andre/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java 2009-07-28 19:13:33 UTC (rev 1898)
+++ branches/work_Andre/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java 2009-07-28 19:31:46 UTC (rev 1899)
@@ -488,7 +488,7 @@
// process with a space in its
// name... or if no targets exist yet; just log it and keep going
Activator.getErrorLogger().logError(
- "Problems when killing scratchbox sessions", e2);
+ "Problem killing scratchbox sessions", e2);
}
// double-check, since it doesn't really work!
Modified: branches/work_Andre/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java
===================================================================
--- branches/work_Andre/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java 2009-07-28 19:13:33 UTC (rev 1898)
+++ branches/work_Andre/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java 2009-07-28 19:31:46 UTC (rev 1899)
@@ -65,7 +65,7 @@
.createFromShellEnvDump(results.stdout);
} catch (MicaException e) {
Activator.getErrorLogger().logError(
- "Failed to read scratchbox environment, using system environment",
+ "Failed to read scratchbox environment; using system environment",
e);
standardEnv = ((IMachineImpl)sdkTarget.getMachine()).
getStandardEnvironmentProvider().getRawEnvironment();
More information about the Esbox-commits
mailing list