[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited ModulesManager.java,1.37,1.38 AbstractASTManager.java,1.6,1.7

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

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

Modified Files:
	ModulesManager.java AbstractASTManager.java 
Log Message:


Index: AbstractASTManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/AbstractASTManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AbstractASTManager.java	18 Mar 2006 17:11:51 -0000	1.6
--- AbstractASTManager.java	18 Mar 2006 18:12:18 -0000	1.7
***************
*** 653,661 ****
  	            if(modRep.equals(tok)){
                      String act = activationToken;
- //                    String act = act.substring(tok.length());
- //                    if(act.startsWith(".")){
- //                        act = act.substring(1);
- //                    }
-                         
  	            	return findOnImportedMods(importedModule, tok, nature, act, currentModuleName);
  	            }
--- 653,656 ----

Index: ModulesManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/ModulesManager.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** ModulesManager.java	14 Feb 2006 17:15:26 -0000	1.37
--- ModulesManager.java	18 Mar 2006 18:12:18 -0000	1.38
***************
*** 429,437 ****
          
          for (int i = 0; i < builtins.length; i++) {
!             if (name.equals(builtins[i])) {
!                 n = cache.getObj(new ModulesKey(name, null));
!                 if(n == null || n instanceof EmptyModule || n instanceof SourceModule){ //still not created or not defined as compiled module (as it should be)
!                     n = new CompiledModule(name, PyCodeCompletion.TYPE_BUILTIN, nature.getAstManager());
!                     doAddSingleModule(new ModulesKey(n.getName(), null), n);
                  }
              }
--- 429,443 ----
          
          for (int i = 0; i < builtins.length; i++) {
!             String forcedBuiltin = builtins[i];
!             if (name.startsWith(forcedBuiltin)) {
!                 if(name.length() > forcedBuiltin.length() && name.charAt(forcedBuiltin.length()) == '.'){
!                     return null; //it should be regarded as a compiled module (and therefore should be accessed only as its root).
!                 }
!                 if(name.equals(forcedBuiltin)){
!                     n = cache.getObj(new ModulesKey(name, null));
!                     if(n == null || n instanceof EmptyModule || n instanceof SourceModule){ //still not created or not defined as compiled module (as it should be)
!                         n = new CompiledModule(name, PyCodeCompletion.TYPE_BUILTIN, nature.getAstManager());
!                         doAddSingleModule(new ModulesKey(n.getName(), null), n);
!                     }
                  }
              }