[Esbox-commits] r125 - in trunk/org.indt.esbox.launch: . src/org/indt/esbox/launch/local src/org/indt/esbox/launch/remote

[raul at garage.maemo.org]

Author: raul
Date: 2007-10-15 02:17:58 +0300 (Mon, 15 Oct 2007)
New Revision: 125

Modified:
   trunk/org.indt.esbox.launch/plugin.xml
   trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/local/ESboxLocalRunLaunchDelegate.java
   trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/remote/ESboxRemoteRunLaunchDelegate.java
Log:


Modified: trunk/org.indt.esbox.launch/plugin.xml
===================================================================
--- trunk/org.indt.esbox.launch/plugin.xml	2007-10-14 23:16:35 UTC (rev 124)
+++ trunk/org.indt.esbox.launch/plugin.xml	2007-10-14 23:17:58 UTC (rev 125)
@@ -80,7 +80,7 @@
          <perspective id="org.eclipse.debug.ui.DebugPerspective"/>
       </shortcut>
       <shortcut
-            class="org.indt.esbox.launch.local.ESboxRemoteLaunchShortcut"
+            class="org.indt.esbox.launch.remote.ESboxRemoteLaunchShortcut"
             icon="icons/maemo_project.png"
             id="maemoRemoteShortcut"
             label="Maemo Remote Application"

Modified: trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/local/ESboxLocalRunLaunchDelegate.java
===================================================================
--- trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/local/ESboxLocalRunLaunchDelegate.java	2007-10-14 23:16:35 UTC (rev 124)
+++ trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/local/ESboxLocalRunLaunchDelegate.java	2007-10-14 23:17:58 UTC (rev 125)
@@ -34,8 +34,10 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
@@ -43,6 +45,7 @@
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.debug.core.model.IProcess;
 import org.indt.esbox.core.ESboxProjectProperties;
+import org.indt.esbox.core.ESboxScriptLauncher;
 import org.indt.esbox.core.ErrorLogger;
 import org.indt.esbox.core.scratchbox.ScratchboxCommandLauncher;
 import org.indt.esbox.core.scratchbox.ScratchboxException;
@@ -63,6 +66,13 @@
 	 */
 	public void launch(ILaunchConfiguration config, String mode,
 			ILaunch launch, IProgressMonitor monitor) throws CoreException {
+		if (!ESboxScriptLauncher.getInstance().isMaemoStarted())
+			throw new CoreException(new Status(IStatus.ERROR,
+											   LaunchActivator.PLUGIN_ID,
+											   IStatus.OK,
+											   "Maemo was not started. Start Maemo first",
+											   new ScratchboxException("Maemo was not started")));
+		
 		if (monitor == null) {
 			monitor = new NullProgressMonitor();
 		}
@@ -163,8 +173,9 @@
 				monitor.worked(5);
 				
 				String[] env = null;
-				ArrayList envList = new ArrayList();			
+				ArrayList envList = new ArrayList();						
 				Properties props = launcher.getEnvironment();
+				props.putAll(getEnvironmentAsProperty(config));
 				Enumeration names = props.propertyNames();
 				if (names != null) {
 					while (names.hasMoreElements()) {

Modified: trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/remote/ESboxRemoteRunLaunchDelegate.java
===================================================================
--- trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/remote/ESboxRemoteRunLaunchDelegate.java	2007-10-14 23:16:35 UTC (rev 124)
+++ trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/remote/ESboxRemoteRunLaunchDelegate.java	2007-10-14 23:17:58 UTC (rev 125)
@@ -159,8 +159,9 @@
 				monitor.worked(5);
 				
 				String[] env = null;
-				ArrayList envList = new ArrayList();			
+				ArrayList envList = new ArrayList();					
 				Properties props = launcher.getEnvironment();
+				props.putAll(getEnvironmentAsProperty(config));
 				Enumeration names = props.propertyNames();
 				if (names != null) {
 					while (names.hasMoreElements()) {