[Pydev-cvs] org.python.pydev/src/org/python/pydev/plugin/nature PythonPathNature.java,1.6,1.7 PythonNature.java,1.21,1.22 IPythonPathNature.java,1.2,NONE

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

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/nature
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15559/src/org/python/pydev/plugin/nature

Modified Files:
	PythonPathNature.java PythonNature.java 
Removed Files:
	IPythonPathNature.java 
Log Message:


--- IPythonPathNature.java DELETED ---

Index: PythonNature.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/nature/PythonNature.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** PythonNature.java	1 Nov 2005 16:05:33 -0000	1.21
--- PythonNature.java	15 Dec 2005 16:29:25 -0000	1.22
***************
*** 30,36 ****
--- 30,38 ----
  import org.python.pydev.core.ExtensionHelper;
  import org.python.pydev.core.IPythonNature;
+ import org.python.pydev.core.IPythonPathNature;
  import org.python.pydev.core.REF;
  import org.python.pydev.editor.codecompletion.revisited.ASTManager;
  import org.python.pydev.editor.codecompletion.revisited.ICodeCompletionASTManager;
+ import org.python.pydev.editor.codecompletion.revisited.ProjectModulesManager;
  import org.python.pydev.plugin.PydevPlugin;
  import org.python.pydev.ui.interpreters.IInterpreterObserver;
***************
*** 420,424 ****
          return moduleName;
      }
! 
      /**
       * @param resource the resource we want info on
--- 422,426 ----
          return moduleName;
      }
!     
      /**
       * @param resource the resource we want info on
***************
*** 428,431 ****
--- 430,442 ----
      	return getModuleNameForResource(resource) != null; 
      }
+     
+     public String resolveModule(File file) {
+     	String moduleName = null;
+     	
+     	if(astManager != null){
+     		moduleName = astManager.getProjectModulesManager().resolveModule(REF.getFileAbsolutePath(file));
+     	}
+     	return moduleName;
+     }
  }
  

Index: PythonPathNature.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/nature/PythonPathNature.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PythonPathNature.java	30 Aug 2005 17:59:17 -0000	1.6
--- PythonPathNature.java	15 Dec 2005 16:29:25 -0000	1.7
***************
*** 14,17 ****
--- 14,18 ----
  import org.eclipse.core.runtime.Path;
  import org.eclipse.core.runtime.QualifiedName;
+ import org.python.pydev.core.IPythonPathNature;
  import org.python.pydev.core.REF;
  import org.python.pydev.editor.codecompletion.revisited.ProjectModulesManager;