[Esbox-commits] r887 - in branches/micaSplit: org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/scratchbox/ui/actions

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2008-10-23 18:04:25 +0300 (Thu, 23 Oct 2008)
New Revision: 887

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/MaemoScriptLauncher.java
   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/RemoveMaemoRootstrapSb2Command.java
   branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/scratchbox/ui/actions/ValidateVirtualMachineCommand.java
Log:
Move the console manager out into its own class.


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 12:55:05 UTC (rev 886)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoLauncher.java	2008-10-23 15:04:25 UTC (rev 887)
@@ -70,7 +70,7 @@
 			Process process = processLauncher.createProcess();
 
 			// spit the consumed output to the console
-			MessageConsole console = CorePlugin.getDefault().getConsole(true,
+			MessageConsole console = CoreConsoleManager.getInstance().getConsole(true,
 					sdkTarget, "Running Maemo command (" + params.get(0) + ")");
 
 			console.addPatternMatchListener(new IPatternMatchListener() {

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 12:55:05 UTC (rev 886)
+++ branches/micaSplit/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java	2008-10-23 15:04:25 UTC (rev 887)
@@ -418,7 +418,7 @@
 
 		final Process process = processLauncher.createProcess();
 
-		final MessageConsole console = CorePlugin.getDefault().getConsole(true,
+		final MessageConsole console = CoreConsoleManager.getInstance().getConsole(true,
 				sdkTarget, comment);
 
 		if (monitor == null) {

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 12:55:05 UTC (rev 886)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/CreateMaemoRootstrapSb2Command.java	2008-10-23 15:04:25 UTC (rev 887)
@@ -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.CorePlugin;
+import org.maemo.mica.common.core.CoreConsoleManager;
 import org.maemo.mica.common.core.ESboxException;
 import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
 import org.maemo.mica.common.core.process.ProcessLauncherUtils;
@@ -84,7 +84,7 @@
 				.getProcessLauncherFactory().defaultEnvironmentModifierBlock();
 		ProcessLauncherUtils.defineProxyVariables(envBlock);
 
-		setMonitorAndConsole(monitor, CorePlugin.getDefault().getConsole(true,
+		setMonitorAndConsole(monitor, CoreConsoleManager.getInstance().getConsole(true,
 				null, "Installing rootstrap " + targetName));
 		doPerformCommand(params, envBlock, 0);
 

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 12:55:05 UTC (rev 886)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/command/RemoveMaemoRootstrapSb2Command.java	2008-10-23 15:04:25 UTC (rev 887)
@@ -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.CorePlugin;
+import org.maemo.mica.common.core.CoreConsoleManager;
 import org.maemo.mica.common.core.ESboxException;
 import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
 import org.maemo.mica.common.core.process.ProcessLauncherUtils;
@@ -75,7 +75,7 @@
 				.getProcessLauncherFactory().defaultEnvironmentModifierBlock();
 		ProcessLauncherUtils.defineProxyVariables(envBlock);
 
-		setMonitorAndConsole(monitor, CorePlugin.getDefault().getConsole(true,
+		setMonitorAndConsole(monitor, CoreConsoleManager.getInstance().getConsole(true,
 				null, "Removing rootstrap " + targetName));
 
 		doPerformCommand(commands, envBlock, 0);

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 12:55:05 UTC (rev 886)
+++ branches/micaSplit/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/scratchbox/ui/actions/ValidateVirtualMachineCommand.java	2008-10-23 15:04:25 UTC (rev 887)
@@ -208,7 +208,7 @@
 		IProcessLauncherFactory processLauncherFactory = machine.getProcessLauncherFactory();
 		IProcessLauncher processLauncher = ProcessLauncherCreator.createProcessLauncher(processLauncherFactory, 
 				"ls " + machine.getUserHome());
-		MessageConsole console = CorePlugin.getDefault().getConsole(true, null, "Virtual machine ~devel home directory listing");
+		MessageConsole console = CoreConsoleManager.getInstance().getConsole(true, null, "Virtual machine ~devel home directory listing");
 		
 		Process process;
 		try {