[Pydev-cvs] org.python.pydev/src_navigator/org/python/pydev/navigator PythonBaseModelProvider.java, 1.12, 1.13 PythonModelProvider.java, 1.15, 1.16

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

Update of /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31519/src_navigator/org/python/pydev/navigator

Modified Files:
	PythonBaseModelProvider.java PythonModelProvider.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: PythonModelProvider.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/PythonModelProvider.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PythonModelProvider.java	19 Jun 2008 15:29:46 -0000	1.15
--- PythonModelProvider.java	31 Jul 2008 01:47:37 -0000	1.16
***************
*** 554,557 ****
--- 554,580 ----
                              convertedChildren.add(new PythonResource(parent, (IResource) child, parent.getSourceFolder()));
                          }
+                         
+                     }else if(res instanceof IFolder){
+                     	//ok, still not in the model... could it be a PythonSourceFolder
+                         IFolder folder = (IFolder) res;
+                         IProject project = folder.getProject();
+                         if(project == null){
+                         	continue;
+                         }
+ 						PythonNature nature = PythonNature.getPythonNature(project);
+                         if(nature== null){
+                             continue;
+                         }
+                         Set<String> sourcePathSet = new HashSet<String>();
+                         try {
+                             sourcePathSet = nature.getPythonPathNature().getProjectSourcePathSet();
+                         } catch (CoreException e) {
+                             PydevPlugin.log(e);
+                         }        
+                         PythonSourceFolder wrapped = tryWrapSourceFolder(p, folder, sourcePathSet);
+                         if(wrapped != null){
+                         	childrenItr.remove();
+                         	convertedChildren.add(wrapped);
+                         }
                      }
                  }

Index: PythonBaseModelProvider.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/PythonBaseModelProvider.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PythonBaseModelProvider.java	10 May 2008 16:29:24 -0000	1.12
--- PythonBaseModelProvider.java	31 Jul 2008 01:47:37 -0000	1.13
***************
*** 100,103 ****
--- 100,106 ----
       */
      public void notifyPythonPathRebuilt(IProject project, List<String> projectPythonpath) {
+     	if(project == null){
+     		return;
+     	}
      	internalDoNotifyPythonPathRebuilt(project, projectPythonpath);
      }