[Pydev-cvs] org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited AbstractASTManager.java, 1.1, 1.2 CompletionStateWrapper.java, 1.1, 1.2 CompletionState.java, 1.1, 1.2

[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-serv669/src_completions/org/python/pydev/editor/codecompletion/revisited

Modified Files:
	AbstractASTManager.java CompletionStateWrapper.java 
	CompletionState.java 
Log Message:
Auto-import fixes

Index: AbstractASTManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/AbstractASTManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractASTManager.java	25 Mar 2007 16:09:03 -0000	1.1
--- AbstractASTManager.java	26 Mar 2007 00:08:46 -0000	1.2
***************
*** 423,427 ****
              //get the tokens (global, imported and wild imported)
              IToken[] globalTokens = module.getGlobalTokens();
!             importedModules.addAll(Arrays.asList(module.getTokenImportedModules()));
              IToken[] wildImportedModules = module.getWildImportedModules();
              
--- 423,429 ----
              //get the tokens (global, imported and wild imported)
              IToken[] globalTokens = module.getGlobalTokens();
!             List<IToken> tokenImportedModules = Arrays.asList(module.getTokenImportedModules());
!             importedModules.addAll(tokenImportedModules);
!             state.setTokenImportedModules(importedModules);
              IToken[] wildImportedModules = module.getWildImportedModules();
              

Index: CompletionState.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/CompletionState.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompletionState.java	25 Mar 2007 16:09:02 -0000	1.1
--- CompletionState.java	26 Mar 2007 00:08:46 -0000	1.2
***************
*** 6,11 ****
--- 6,13 ----
  package org.python.pydev.editor.codecompletion.revisited;
  
+ import java.util.ArrayList;
  import java.util.HashMap;
  import java.util.Iterator;
+ import java.util.List;
  import java.util.Map;
  import java.util.Stack;
***************
*** 44,47 ****
--- 46,50 ----
      
      public int lookingForInstance=LOOKING_FOR_INSTANCE_UNDEFINED;
+     private List<IToken> tokenImportedModules;
  
      public ICompletionState getCopy(){
***************
*** 316,319 ****
--- 319,333 ----
      }
  
+     public void setTokenImportedModules(List<IToken> tokenImportedModules) {
+         if(tokenImportedModules != null){
+             if(this.tokenImportedModules == null){
+                 this.tokenImportedModules = new ArrayList<IToken>(tokenImportedModules); //keep a copy of it
+             }
+         }
+     }
+     public List<IToken> getTokenImportedModules() {
+         return this.tokenImportedModules;
+     }
+ 
  
      

Index: CompletionStateWrapper.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/CompletionStateWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompletionStateWrapper.java	25 Mar 2007 16:09:03 -0000	1.1
--- CompletionStateWrapper.java	26 Mar 2007 00:08:46 -0000	1.2
***************
*** 1,4 ****
--- 1,6 ----
  package org.python.pydev.editor.codecompletion.revisited;
  
+ import java.util.List;
+ 
  import org.python.pydev.core.ICompletionState;
  import org.python.pydev.core.IDefinition;
***************
*** 143,146 ****
--- 145,154 ----
          wrapped.pushFindResolveImportMemoryCtx();
      }
+     public List<IToken> getTokenImportedModules() {
+         return wrapped.getTokenImportedModules();
+     }
+     public void setTokenImportedModules(List<IToken> tokenImportedModules) {
+         wrapped.setTokenImportedModules(tokenImportedModules);
+     }
  
  }