[Pydev-cvs] org.python.pydev.debug/src/org/python/pydev/debug/ui/launching PythonRunner.java,1.5,1.6

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/ui/launching
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13484/src/org/python/pydev/debug/ui/launching

Modified Files:
	PythonRunner.java PythonLaunchConfigurationDelegate.java 
	PythonRunnerConfig.java 
Log Message:
Breakpoints, first cut

Index: PythonRunner.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/PythonRunner.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PythonRunner.java	5 May 2004 02:01:58 -0000	1.5
--- PythonRunner.java	7 May 2004 02:03:06 -0000	1.6
***************
*** 14,18 ****
  import org.eclipse.core.runtime.IStatus;
  import org.eclipse.core.runtime.NullProgressMonitor;
- import org.eclipse.core.runtime.Status;
  import org.eclipse.core.runtime.SubProgressMonitor;
  import org.eclipse.debug.core.DebugPlugin;
--- 14,17 ----
***************
*** 53,57 ****
  		Process p = DebugPlugin.exec(cmdLine, config.workingDirectory);	
  		if (p == null)
! 			throw new CoreException(new Status(IStatus.ERROR, PydevDebugPlugin.getPluginID(), 0, "Could not execute python process. Was it cancelled?", null));
  		
  		IProcess process = registerWithDebugPlugin(config, launch, p);
--- 52,56 ----
  		Process p = DebugPlugin.exec(cmdLine, config.workingDirectory);	
  		if (p == null)
! 			throw new CoreException(PydevDebugPlugin.makeStatus(IStatus.ERROR,"Could not execute python process. Was it cancelled?", null));
  		
  		IProcess process = registerWithDebugPlugin(config, launch, p);
***************
*** 71,75 ****
  			if (ex instanceof SocketTimeoutException)
  				message = "Timed out after " + Float.toString(config.acceptTimeout/1000) + " seconds while waiting for python script to connect.";
! 			throw new CoreException(new Status(IStatus.ERROR, PydevDebugPlugin.getPluginID(), 0, message, ex));			
  		}
  		subMonitor.subTask("Done");
--- 70,74 ----
  			if (ex instanceof SocketTimeoutException)
  				message = "Timed out after " + Float.toString(config.acceptTimeout/1000) + " seconds while waiting for python script to connect.";
! 			throw new CoreException(PydevDebugPlugin.makeStatus(IStatus.ERROR, message, ex));			
  		}
  		subMonitor.subTask("Done");
***************
*** 103,107 ****
  		Process p = DebugPlugin.exec(cmdLine, config.workingDirectory);	
  		if (p == null)
! 			throw new CoreException(new Status(IStatus.ERROR, PydevDebugPlugin.getPluginID(), 0, "Could not execute python process. Was it cancelled?", null));
  
  		// Register the process with the debug plugin
--- 102,106 ----
  		Process p = DebugPlugin.exec(cmdLine, config.workingDirectory);	
  		if (p == null)
! 			throw new CoreException(PydevDebugPlugin.makeStatus(IStatus.ERROR, "Could not execute python process. Was it cancelled?", null));
  
  		// Register the process with the debug plugin

Index: PythonRunnerConfig.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/PythonRunnerConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PythonRunnerConfig.java	22 Apr 2004 10:56:17 -0000	1.3
--- PythonRunnerConfig.java	7 May 2004 02:03:06 -0000	1.4
***************
*** 14,18 ****
  import org.eclipse.core.runtime.IStatus;
  import org.eclipse.core.runtime.Path;
- import org.eclipse.core.runtime.Status;
  import org.eclipse.debug.core.ILaunchConfiguration;
  import org.eclipse.debug.core.ILaunchManager;
--- 14,17 ----
***************
*** 63,67 ****
  			debugPort= SocketUtil.findUnusedLocalPort("", 5000, 15000); //$NON-NLS-1$
  			if (debugPort == -1)
! 				throw new CoreException(new Status(IStatus.ERROR, PydevDebugPlugin.getPluginID(), 0, "Could not find a free socket for debugger", null));
  		}
  		return debugPort;		
--- 62,66 ----
  			debugPort= SocketUtil.findUnusedLocalPort("", 5000, 15000); //$NON-NLS-1$
  			if (debugPort == -1)
! 				throw new CoreException(PydevDebugPlugin.makeStatus(IStatus.ERROR, "Could not find a free socket for debugger", null));
  		}
  		return debugPort;		
***************
*** 79,88 ****
  		if (file == null
  			|| interpreter == null)
! 		throw new CoreException(new Status(IStatus.ERROR, PydevDebugPlugin.getPluginID(), 0, "Invalid PythonRunnerConfig",null));
  		if (isDebug &&
  			( acceptTimeout < 0
  			|| debugPort < 0
  			|| debugScript == null))
! 		throw new CoreException(new Status(IStatus.ERROR, PydevDebugPlugin.getPluginID(), 0, "Invalid PythonRunnerConfig",null));
  	}
  
--- 78,87 ----
  		if (file == null
  			|| interpreter == null)
! 		throw new CoreException(PydevDebugPlugin.makeStatus(IStatus.ERROR, "Invalid PythonRunnerConfig",null));
  		if (isDebug &&
  			( acceptTimeout < 0
  			|| debugPort < 0
  			|| debugScript == null))
! 		throw new CoreException(PydevDebugPlugin.makeStatus(IStatus.ERROR, "Invalid PythonRunnerConfig",null));
  	}
  
***************
*** 96,100 ****
  		URL location = org.python.pydev.debug.core.PydevDebugPlugin.getDefault().find(relative);
  		if (location == null)
! 			throw new CoreException(new Status(IStatus.ERROR, PydevDebugPlugin.getPluginID(), 0, "Internal pydev error: Cannot find jpydaemon.py", null));
  		return location.getPath();
  	}
--- 95,99 ----
  		URL location = org.python.pydev.debug.core.PydevDebugPlugin.getDefault().find(relative);
  		if (location == null)
! 			throw new CoreException(PydevDebugPlugin.makeStatus(IStatus.ERROR, "Internal pydev error: Cannot find pydevd.py", null));
  		return location.getPath();
  	}

Index: PythonLaunchConfigurationDelegate.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/ui/launching/PythonLaunchConfigurationDelegate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PythonLaunchConfigurationDelegate.java	15 Apr 2004 23:24:49 -0000	1.5
--- PythonLaunchConfigurationDelegate.java	7 May 2004 02:03:06 -0000	1.6
***************
*** 12,16 ****
  import org.eclipse.core.runtime.IStatus;
  import org.eclipse.core.runtime.NullProgressMonitor;
- import org.eclipse.core.runtime.Status;
  import org.eclipse.debug.core.ILaunch;
  import org.eclipse.debug.core.ILaunchConfiguration;
--- 12,15 ----
***************
*** 57,61 ****
  		} catch (IOException e) {
  			e.printStackTrace();
! 			throw new CoreException(new Status(IStatus.ERROR, PydevDebugPlugin.getPluginID(), 0, "Unexpected IO Exception in Pydev debugger", null));
  		}
  //		ClassLoader save = cur.getContextClassLoader();
--- 56,60 ----
  		} catch (IOException e) {
  			e.printStackTrace();
! 			throw new CoreException(PydevDebugPlugin.makeStatus(IStatus.ERROR, "Unexpected IO Exception in Pydev debugger", null));
  		}
  //		ClassLoader save = cur.getContextClassLoader();

[Pydev-cvs] org.python.pydev.debug/src/org/python/pydev/debug/ui/launching PythonRunner.java,1.5,1.6

[Pydev-cvs] org.python.pydev.debug/src/org/python/pydev/debug/ui/launching PythonRunner.java,1.5,1.6 PythonLaunchConfigurationDelegate.java,1.5,1.6 PythonRunnerConfig.java,1.3,1.4