[Pydev-cvs] org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited ASTManager.java, 1.2, 1.3 SystemASTManager.java, 1.2, 1.3 AbstractASTManager.java, 1.16, 1.17 ProjectModulesManager.java, 1.16, 1.17

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

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

Modified Files:
	ASTManager.java SystemASTManager.java AbstractASTManager.java 
	ProjectModulesManager.java 
Log Message:
<li>Fixed NPE when creating editor with no interpreter configured</li>
<li>Hyperlink works in the same way that F3 (saves file before search)</li>
<li>Fixed problem while navigating pydev package explorer ( https://sourceforge.net/tracker/index.php?func=detail&aid=2008015&group_id=85796&atid=577329 )</li>
<li>Applied patch that fixes race condition in PythonNature (thanks to Radim Kubacki)</li>
<li><strong>Eclipse 3.4</strong>: Move / rename working</li>


Index: AbstractASTManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/AbstractASTManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AbstractASTManager.java	18 May 2008 20:02:16 -0000	1.16
--- AbstractASTManager.java	31 Jul 2008 01:47:36 -0000	1.17
***************
*** 87,91 ****
      
      
! 	public abstract void setProject(IProject project, boolean restoreDeltas) ;
  
  	public abstract void rebuildModule(File file, IDocument doc, IProject project, IProgressMonitor monitor, IPythonNature nature) ;
--- 87,91 ----
      
      
! 	public abstract void setProject(IProject project, IPythonNature nature, boolean restoreDeltas) ;
  
  	public abstract void rebuildModule(File file, IDocument doc, IProject project, IProgressMonitor monitor, IPythonNature nature) ;

Index: ASTManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/ASTManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ASTManager.java	2 Nov 2007 13:26:29 -0000	1.2
--- ASTManager.java	31 Jul 2008 01:47:36 -0000	1.3
***************
*** 42,47 ****
       * Set the project this ast manager works with.
       */
!     public void setProject(IProject project, boolean restoreDeltas){
!         getProjectModulesManager().setProject(project, restoreDeltas);
      }
  
--- 42,47 ----
       * Set the project this ast manager works with.
       */
!     public void setProject(IProject project, IPythonNature nature, boolean restoreDeltas){
!         getProjectModulesManager().setProject(project, nature, restoreDeltas);
      }
  

Index: SystemASTManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/SystemASTManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SystemASTManager.java	5 Jul 2007 00:32:12 -0000	1.2
--- SystemASTManager.java	31 Jul 2008 01:47:36 -0000	1.3
***************
*** 23,27 ****
  	}
  
! 	public void setProject(IProject project, boolean restoreDeltas) {
  		throw new RuntimeException("Not implemented");
  	}
--- 23,27 ----
  	}
  
! 	public void setProject(IProject project, IPythonNature nature, boolean restoreDeltas) {
  		throw new RuntimeException("Not implemented");
  	}

Index: ProjectModulesManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/ProjectModulesManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ProjectModulesManager.java	10 May 2008 17:36:22 -0000	1.16
--- ProjectModulesManager.java	31 Jul 2008 01:47:36 -0000	1.17
***************
*** 21,24 ****
--- 21,25 ----
  import org.eclipse.core.runtime.CoreException;
  import org.eclipse.core.runtime.IProgressMonitor;
+ import org.eclipse.core.runtime.IStatus;
  import org.eclipse.core.runtime.NullProgressMonitor;
  import org.python.pydev.core.DeltaSaver;
***************
*** 36,39 ****
--- 37,41 ----
  import org.python.pydev.core.REF;
  import org.python.pydev.core.Tuple;
+ import org.python.pydev.core.log.Log;
  import org.python.pydev.editor.codecompletion.revisited.javaintegration.JavaProjectModulesManagerCreator;
  import org.python.pydev.editor.codecompletion.revisited.javaintegration.ModulesKeyForJava;
***************
*** 41,44 ****
--- 43,47 ----
  import org.python.pydev.plugin.PydevPlugin;
  import org.python.pydev.plugin.nature.PythonNature;
+ import org.python.pydev.ui.NotConfiguredInterpreterException;
  import org.python.pydev.ui.pythonpathconf.InterpreterInfo;
  
***************
*** 69,75 ****
       * @see org.python.pydev.core.IProjectModulesManager#setProject(org.eclipse.core.resources.IProject, boolean)
       */
!     public void setProject(IProject project, boolean restoreDeltas){
          this.project = project;
!         this.nature = PythonNature.getPythonNature(project);
          this.deltaSaver = new DeltaSaver<ModulesKey>(this.nature.getCompletionsCacheDir(), "astdelta", new ICallback<Object, ObjectInputStream>(){
  
--- 72,78 ----
       * @see org.python.pydev.core.IProjectModulesManager#setProject(org.eclipse.core.resources.IProject, boolean)
       */
!     public void setProject(IProject project, IPythonNature nature, boolean restoreDeltas){
          this.project = project;
!         this.nature = nature;
          this.deltaSaver = new DeltaSaver<ModulesKey>(this.nature.getCompletionsCacheDir(), "astdelta", new ICallback<Object, ObjectInputStream>(){
  
***************
*** 189,193 ****
          IInterpreterManager iMan = PydevPlugin.getInterpreterManager(nature);
          if(defaultSelectedInterpreter == null){
!         	defaultSelectedInterpreter = iMan.getDefaultInterpreter();
          }
          InterpreterInfo info = (InterpreterInfo) iMan.getInterpreterInfo(defaultSelectedInterpreter, new NullProgressMonitor());
--- 192,200 ----
          IInterpreterManager iMan = PydevPlugin.getInterpreterManager(nature);
          if(defaultSelectedInterpreter == null){
!         	try {
! 				defaultSelectedInterpreter = iMan.getDefaultInterpreter();
! 			} catch (NotConfiguredInterpreterException e) {
! 				return null; //not configured
! 			}
          }
          InterpreterInfo info = (InterpreterInfo) iMan.getInterpreterInfo(defaultSelectedInterpreter, new NullProgressMonitor());
***************
*** 414,418 ****
          if(systemModulesManager == null){
          	//may happen in initialization
!         	PydevPlugin.log("System modules manager still not available (still initializing).");
          	return new IModulesManager[]{};
          }
--- 421,425 ----
          if(systemModulesManager == null){
          	//may happen in initialization
! //        	PydevPlugin.log("System modules manager still not available (still initializing or not set).");
          	return new IModulesManager[]{};
          }
***************
*** 490,493 ****
--- 497,502 ----
  	                    list.add((IModulesManager) projectModulesManager);
  	                }
+ 	            }else{
+ 	            	Log.log(IStatus.WARNING, "No ast manager configured for :"+project.getName(), null);
  	            }
              }