[Pydev-cvs] org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited InterpreterManagerStub.java,NONE,1.1 CodeCompletionTestsBase.java,1.13,1.14

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

Update of /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10770/tests/org/python/pydev/editor/codecompletion/revisited

Modified Files:
	CodeCompletionTestsBase.java 
Added Files:
	InterpreterManagerStub.java 
Log Message:


--- NEW FILE: InterpreterManagerStub.java ---
/*
 * License: Common Public License v1.0
 * Created on 28/07/2005
 * 
 * @author Fabio Zadrozny
 */
package org.python.pydev.editor.codecompletion.revisited;

import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Preferences;
import org.python.pydev.ui.IInterpreterManager;
import org.python.pydev.ui.InterpreterManager;
import org.python.pydev.ui.pythonpathconf.InterpreterInfo;

public class InterpreterManagerStub extends InterpreterManager implements IInterpreterManager {

    public InterpreterManagerStub(Preferences prefs) {
        super(prefs);
    }

    public String getDefaultInterpreter() {
        return CodeCompletionTestsBase.PYTHON_EXE;
    }

    public String[] getInterpreters() {
        return new String[]{CodeCompletionTestsBase.PYTHON_EXE};
    }

    public String addInterpreter(String executable, IProgressMonitor monitor) {
        throw new RuntimeException("not impl");
    }

    public String[] getInterpretersFromPersistedString(String persisted) {
        throw new RuntimeException("not impl");
    }

    public String getStringToPersist(String[] executables) {
        throw new RuntimeException("not impl");
    }
    
    /**
     * @see org.python.pydev.ui.IInterpreterManager#getInterpreterInfo(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
     */
    public InterpreterInfo getInterpreterInfo(String executable, IProgressMonitor monitor) {
        
        InterpreterInfo info = super.getInterpreterInfo(executable, monitor);
        CodeCompletionTestsBase.PYTHON_EXE = info.executable;
        return info;
    }
}
Index: CodeCompletionTestsBase.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/CodeCompletionTestsBase.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CodeCompletionTestsBase.java	28 Jul 2005 00:41:03 -0000	1.13
--- CodeCompletionTestsBase.java	28 Jul 2005 17:05:01 -0000	1.14
***************
*** 8,12 ****
  import junit.framework.TestCase;
  
- import org.eclipse.core.runtime.IProgressMonitor;
  import org.eclipse.core.runtime.NullProgressMonitor;
  import org.eclipse.core.runtime.Preferences;
--- 8,11 ----
***************
*** 16,20 ****
  import org.python.pydev.ui.BundleInfoStub;
  import org.python.pydev.ui.IInterpreterManager;
- import org.python.pydev.ui.InterpreterManager;
  import org.python.pydev.ui.pythonpathconf.InterpreterInfo;
  
--- 15,18 ----
***************
*** 24,65 ****
  public class CodeCompletionTestsBase extends TestCase {
  
-     private static class InterpreterManagerStub extends InterpreterManager implements IInterpreterManager {
- 
-         public InterpreterManagerStub(Preferences prefs) {
-             super(prefs);
-         }
- 
-         public String getDefaultInterpreter() {
-             return PYTHON_EXE;
-         }
- 
-         public String[] getInterpreters() {
-             return new String[]{PYTHON_EXE};
-         }
- 
-         public String addInterpreter(String executable, IProgressMonitor monitor) {
-             throw new RuntimeException("not impl");
-         }
- 
-         public String[] getInterpretersFromPersistedString(String persisted) {
-             throw new RuntimeException("not impl");
-         }
- 
-         public String getStringToPersist(String[] executables) {
-             throw new RuntimeException("not impl");
-         }
-         
-         /**
-          * @see org.python.pydev.ui.IInterpreterManager#getInterpreterInfo(java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-          */
-         public InterpreterInfo getInterpreterInfo(String executable, IProgressMonitor monitor) {
-             
-             InterpreterInfo info = super.getInterpreterInfo(executable, monitor);
-             PYTHON_EXE = info.executable;
-             return info;
-         }
-     }
- 
- 
      //NOTE: this should be gotten from some variable to point to the python lib (less system dependence, but still, some).
      public static String PYTHON_EXE="C:/bin/Python24/python.exe";
--- 22,25 ----
***************
*** 69,74 ****
      
      //NOTE: this should set to the tests pysrc location, so that it can be added to the pythonpath.
! //    public static final String TEST_PYSRC_LOC="D:/dev_programs/eclipse_3/eclipse/workspace/org.python.pydev/tests/pysrc/";
!     public static final String TEST_PYSRC_LOC="D:/eclipse_workspace/org.python.pydev/tests/pysrc/";
  
      public static void main(String[] args) {
--- 29,34 ----
      
      //NOTE: this should set to the tests pysrc location, so that it can be added to the pythonpath.
!     public static final String TEST_PYSRC_LOC="D:/dev_programs/eclipse_3/eclipse/workspace/org.python.pydev/tests/pysrc/";
! //    public static final String TEST_PYSRC_LOC="D:/eclipse_workspace/org.python.pydev/tests/pysrc/";
  
      public static void main(String[] args) {
***************
*** 136,139 ****
--- 96,100 ----
      }
      
+     
      /**
       * @param info