[Esbox-commits] r335 - trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/local/core

[pauloromulo at garage.maemo.org]

Author: pauloromulo
Date: 2007-12-04 19:32:30 +0200 (Tue, 04 Dec 2007)
New Revision: 335

Modified:
   trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/local/core/ESboxPythonLaunchConfigurationDelegate.java
Log:
and finally, the python debugger works. special thanks to the very useful Pydev documentation :P

Modified: trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/local/core/ESboxPythonLaunchConfigurationDelegate.java
===================================================================
--- trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/local/core/ESboxPythonLaunchConfigurationDelegate.java	2007-12-04 17:27:41 UTC (rev 334)
+++ trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/local/core/ESboxPythonLaunchConfigurationDelegate.java	2007-12-04 17:32:30 UTC (rev 335)
@@ -30,6 +30,8 @@
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.indt.esbox.core.ESboxPreferenceConstants;
 import org.indt.esbox.core.ESboxProjectProperties;
 import org.indt.esbox.core.ESboxScriptLauncher;
 import org.indt.esbox.core.ErrorLogger;
@@ -69,9 +71,10 @@
 		
 		try {
 			monitor.worked(1);
+			IPath path = new Path(".");
 			
-			boolean isRunStandalone = configuration.getAttribute(ESboxPythonLaunchConstants.ATTR_RUN_STANDALONE, ESboxPythonLaunchConstants.RUN_STANDALONE_DEFAULT);
-			
+			boolean isRunStandalone = configuration.getAttribute(ESboxPythonLaunchConstants.ATTR_RUN_STANDALONE, ESboxPythonLaunchConstants.RUN_STANDALONE_DEFAULT);		
+	
 			IPath exePath = super.verifyProgramPath(configuration);
 			IProject project = super.verifyProject(configuration);
 			String arguments[] = getArgumentsAsArray(configuration); 
@@ -88,7 +91,11 @@
 			
 			if (mode.equals(ILaunchManager.DEBUG_MODE)) {
 				ESboxPythonDebugger debugger = ESboxPythonDebugger.getInstance();
-				debugger.debugPython(configuration, mode, launch, monitor);				 
+				String[] vmArgumentsArray = super.getVMArgumentsAsArray(configuration);
+				String vmArguments = super.getVMArguments(configuration);
+				String programArguments = super.getArguments(configuration);
+				debugger.debugPython(project, mode, launch, monitor, exePath, programArguments, 
+						vmArgumentsArray, vmArguments, isRunStandalone);				 
 			} else {
 				
 				monitor.worked(5);
@@ -115,8 +122,8 @@
 				DebugPlugin.newProcess(launch, process,
 						renderProcessLabel(exePath.toOSString()));
 			}
-		} catch (IOException e) {					
-			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();		
 		} finally {
 			monitor.done();
 		}		
@@ -168,8 +175,7 @@
 				command += commandPath.toOSString();
 				fCommandArgs = constructCommandArray(command,args, env, changeToDirectory);
 				fProcess = super.execute(command, fCommandArgs, new String[] {}, changeToDirectory);				
-				fErrorMessage = ""; 				
-				
+				fErrorMessage = "";
 			} catch (IOException e) {
 				e.printStackTrace();
 				setErrorMessage(e.getMessage());