[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules AbstractModule.java,1.34,1.35 SourceModule.java,1.42,1.43 SourceToken.java,1.11,1.12

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

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

Modified Files:
	AbstractModule.java SourceModule.java SourceToken.java 
Log Message:


Index: SourceModule.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/SourceModule.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** SourceModule.java	18 Mar 2006 21:34:29 -0000	1.42
--- SourceModule.java	20 Mar 2006 19:37:57 -0000	1.43
***************
*** 12,23 ****
  import java.util.List;
  
- import org.python.parser.SimpleNode;
- import org.python.parser.ast.Assign;
- import org.python.parser.ast.Attribute;
- import org.python.parser.ast.ClassDef;
- import org.python.parser.ast.FunctionDef;
- import org.python.parser.ast.ImportFrom;
- import org.python.parser.ast.Name;
- import org.python.parser.ast.Str;
  import org.python.pydev.core.FindInfo;
  import org.python.pydev.core.FullRepIterable;
--- 12,15 ----
***************
*** 38,41 ****
--- 30,41 ----
  import org.python.pydev.editor.codecompletion.revisited.visitors.FindScopeVisitor;
  import org.python.pydev.editor.codecompletion.revisited.visitors.GlobalModelVisitor;
+ import org.python.pydev.parser.jython.SimpleNode;
+ import org.python.pydev.parser.jython.ast.Assign;
+ import org.python.pydev.parser.jython.ast.Attribute;
+ import org.python.pydev.parser.jython.ast.ClassDef;
+ import org.python.pydev.parser.jython.ast.FunctionDef;
+ import org.python.pydev.parser.jython.ast.ImportFrom;
+ import org.python.pydev.parser.jython.ast.Name;
+ import org.python.pydev.parser.jython.ast.Str;
  import org.python.pydev.parser.visitors.NodeUtils;
  import org.python.pydev.plugin.PydevPlugin;

Index: SourceToken.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/SourceToken.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SourceToken.java	2 Mar 2006 12:17:46 -0000	1.11
--- SourceToken.java	20 Mar 2006 19:37:57 -0000	1.12
***************
*** 6,21 ****
  package org.python.pydev.editor.codecompletion.revisited.modules;
  
- import org.python.parser.SimpleNode;
- import org.python.parser.ast.Attribute;
- import org.python.parser.ast.ClassDef;
- import org.python.parser.ast.FunctionDef;
- import org.python.parser.ast.Import;
- import org.python.parser.ast.ImportFrom;
- import org.python.parser.ast.Name;
- import org.python.parser.ast.NameTok;
- import org.python.parser.ast.keywordType;
  import org.python.pydev.editor.codecompletion.PyCodeCompletion;
  import org.python.pydev.editor.codecompletion.revisited.AbstractToken;
  import org.python.pydev.editor.codecompletion.revisited.visitors.AbstractVisitor;
  import org.python.pydev.parser.visitors.NodeUtils;
  
--- 6,21 ----
  package org.python.pydev.editor.codecompletion.revisited.modules;
  
  import org.python.pydev.editor.codecompletion.PyCodeCompletion;
  import org.python.pydev.editor.codecompletion.revisited.AbstractToken;
  import org.python.pydev.editor.codecompletion.revisited.visitors.AbstractVisitor;
+ import org.python.pydev.parser.jython.SimpleNode;
+ import org.python.pydev.parser.jython.ast.Attribute;
+ import org.python.pydev.parser.jython.ast.ClassDef;
+ import org.python.pydev.parser.jython.ast.FunctionDef;
+ import org.python.pydev.parser.jython.ast.Import;
+ import org.python.pydev.parser.jython.ast.ImportFrom;
+ import org.python.pydev.parser.jython.ast.Name;
+ import org.python.pydev.parser.jython.ast.NameTok;
+ import org.python.pydev.parser.jython.ast.keywordType;
  import org.python.pydev.parser.visitors.NodeUtils;
  

Index: AbstractModule.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/AbstractModule.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** AbstractModule.java	18 Mar 2006 13:20:03 -0000	1.34
--- AbstractModule.java	20 Mar 2006 19:37:57 -0000	1.35
***************
*** 12,16 ****
  
  import org.eclipse.jface.text.IDocument;
- import org.python.parser.SimpleNode;
  import org.python.pydev.core.FindInfo;
  import org.python.pydev.core.FullRepIterable;
--- 12,15 ----
***************
*** 26,29 ****
--- 25,29 ----
  import org.python.pydev.editor.codecompletion.revisited.visitors.Definition;
  import org.python.pydev.parser.PyParser;
+ import org.python.pydev.parser.jython.SimpleNode;
  
  /**