Thread: [Pydev-cvs] org.python.pydev/src/org/python/pydev/plugin/nature SystemPythonNature.java,1.2,1.3 Pyth
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2006-01-25 16:19:14
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/nature In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23863/src/org/python/pydev/plugin/nature Modified Files: SystemPythonNature.java PythonNature.java Log Message: Index: SystemPythonNature.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/nature/SystemPythonNature.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SystemPythonNature.java 25 Jan 2006 12:16:46 -0000 1.2 --- SystemPythonNature.java 25 Jan 2006 16:19:05 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; + import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.python.pydev.core.ICodeCompletionASTManager; *************** *** 92,94 **** --- 93,99 ---- } + public void rebuildPath(String defaultSelectedInterpreter, IProgressMonitor monitor) { + throw new RuntimeException("Not Implemented"); + } + } Index: PythonNature.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/nature/PythonNature.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** PythonNature.java 25 Jan 2006 12:16:46 -0000 1.32 --- PythonNature.java 25 Jan 2006 16:19:05 -0000 1.33 *************** *** 300,315 **** */ public void rebuildPath() { ! try { ! String pythonPathStr = this.pythonPathNature.getOnlyProjectPythonPathStr(); ! this.rebuildPath(pythonPathStr); ! } catch (CoreException e) { ! throw new RuntimeException(e); ! } } /** * This method is called whenever the pythonpath for the project with this nature is changed. */ ! public void rebuildPath(final String paths) { final PythonNature nature = this; Job myJob = new Job("Pydev code completion: rebuilding modules") { --- 300,320 ---- */ public void rebuildPath() { ! this.rebuildPath(null, new NullProgressMonitor()); } + + public void rebuildPath(String defaultSelectedInterpreter, IProgressMonitor monitor) { + try { + String paths = this.pythonPathNature.getOnlyProjectPythonPathStr(); + this.rebuildPath(defaultSelectedInterpreter, paths); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + /** * This method is called whenever the pythonpath for the project with this nature is changed. */ ! private void rebuildPath(final String defaultSelectedInterpreter, final String paths) { final PythonNature nature = this; Job myJob = new Job("Pydev code completion: rebuilding modules") { *************** *** 329,333 **** //begins task automatically ! tempAstManager.changePythonPath(paths, project, jobProgressComunicator); saveAstManager(); --- 334,338 ---- //begins task automatically ! tempAstManager.changePythonPath(paths, project, jobProgressComunicator, defaultSelectedInterpreter); saveAstManager(); *************** *** 335,339 **** for (IInterpreterObserver observer : participants) { try { ! observer.notifyProjectPythonpathRestored(nature, jobProgressComunicator); } catch (Exception e) { //let's keep it safe --- 340,344 ---- for (IInterpreterObserver observer : participants) { try { ! observer.notifyProjectPythonpathRestored(nature, jobProgressComunicator, defaultSelectedInterpreter); } catch (Exception e) { //let's keep it safe *************** *** 519,522 **** --- 524,528 ---- return str.split("\\|"); } + } |