pydev-cvs

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/shell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4510/src_completions/org/python/pydev/editor/codecompletion/shell

Modified Files:
	JythonShell.java PythonShell.java 
Log Message:
- No longer using Runtime.exec(String), only Runtime.exec(String[])
- Updating the markers in a better (faster) way

Index: JythonShell.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/shell/JythonShell.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JythonShell.java	18 Mar 2008 17:03:07 -0000	1.3
--- JythonShell.java	21 May 2008 01:38:08 -0000	1.4
***************
*** 11,15 ****
  import org.python.pydev.plugin.PydevPlugin;
  import org.python.pydev.runners.SimpleJythonRunner;
! import org.python.pydev.runners.SimplePythonRunner;
  
  public class JythonShell extends AbstractShell{
--- 11,15 ----
  import org.python.pydev.plugin.PydevPlugin;
  import org.python.pydev.runners.SimpleJythonRunner;
! import org.python.pydev.runners.SimpleRunner;
  
  public class JythonShell extends AbstractShell{
***************
*** 20,32 ****
      
  
      @Override
      protected synchronized String createServerProcess(int pWrite, int pRead) throws IOException, JDTNotAvailableException {
          String args = pWrite+" "+pRead;
          String script = REF.getFileAbsolutePath(serverFile);
!         String executableStr = SimpleJythonRunner.makeExecutableCommandStr(script, "");
!         executableStr += " "+args;
!         process = new SimplePythonRunner().createProcess(executableStr, serverFile.getParentFile());
          
!         return executableStr;
      }
  
--- 20,34 ----
      
  
+     /**
+      * Will create the jython shell and return a string to be shown to the user with the jython shell command line.
+      */
      @Override
      protected synchronized String createServerProcess(int pWrite, int pRead) throws IOException, JDTNotAvailableException {
          String args = pWrite+" "+pRead;
          String script = REF.getFileAbsolutePath(serverFile);
!         String[] executableStr = SimpleJythonRunner.makeExecutableCommandStr(script, "", args);
!         process = SimpleRunner.createProcess(executableStr, serverFile.getParentFile());
          
!         return SimpleRunner.getArgumentsAsStr(executableStr);
      }
  

Index: PythonShell.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/shell/PythonShell.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PythonShell.java	12 May 2008 11:39:06 -0000	1.3
--- PythonShell.java	21 May 2008 01:38:08 -0000	1.4
***************
*** 12,16 ****
  import org.python.pydev.core.REF;
  import org.python.pydev.plugin.PydevPlugin;
! import org.python.pydev.runners.SimplePythonRunner;
  
  /**
--- 12,16 ----
  import org.python.pydev.core.REF;
  import org.python.pydev.plugin.PydevPlugin;
! import org.python.pydev.runners.SimpleRunner;
  
  /**
***************
*** 50,54 ****
          }
          String[] parameters = {interpreter, REF.getFileAbsolutePath(serverFile), ""+pWrite, ""+pRead};
!         process = new SimplePythonRunner().createProcess(parameters, serverFile.getParentFile());
  
          return execMsg;
--- 50,54 ----
          }
          String[] parameters = {interpreter, REF.getFileAbsolutePath(serverFile), ""+pWrite, ""+pRead};
!         process = SimpleRunner.createProcess(parameters, serverFile.getParentFile());
  
          return execMsg;