[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules CompiledToken.java,1.1,1.2 CompiledModule.java,1.5,1.6 SourceToken.java,1.3,1.4

[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-serv2160/src/org/python/pydev/editor/codecompletion/revisited/modules

Modified Files:
	CompiledToken.java CompiledModule.java SourceToken.java 
Log Message:
making new things in code completion...

Index: CompiledToken.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/CompiledToken.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompiledToken.java	20 Jan 2005 10:24:59 -0000	1.1
--- CompiledToken.java	17 Mar 2005 12:07:07 -0000	1.2
***************
*** 13,26 ****
  public class CompiledToken extends AbstractToken{
  
!     /**
!      * @param rep
!      * @param doc
!      */
!     public CompiledToken(String rep, String doc, String parentPackage) {
!         super(rep, doc, parentPackage, -1);
!     }
! 
!     public CompiledToken(String rep, String doc, String parentPackage, int type){
!         super(rep, doc, parentPackage, type);
      }
  
--- 13,18 ----
  public class CompiledToken extends AbstractToken{
  
!     public CompiledToken(String rep, String doc, String args, String parentPackage, int type){
!         super(rep, doc, args, parentPackage, type);
      }
  

Index: CompiledModule.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/CompiledModule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CompiledModule.java	2 Feb 2005 15:56:21 -0000	1.5
--- CompiledModule.java	17 Mar 2005 12:07:07 -0000	1.6
***************
*** 56,60 ****
  	            for (Iterator iter = completions.iterator(); iter.hasNext();) {
  	                String[] element = (String[]) iter.next();
! 	                IToken t = new CompiledToken(element[0], element[1], name, tokenTypes);
  	                array.add(t);
  	                
--- 56,60 ----
  	            for (Iterator iter = completions.iterator(); iter.hasNext();) {
  	                String[] element = (String[]) iter.next();
! 	                IToken t = new CompiledToken(element[0], element[1], element[2], name, tokenTypes);
  	                array.add(t);
  	                
***************
*** 121,125 ****
  	            for (Iterator iter = completions.iterator(); iter.hasNext();) {
  	                String[] element = (String[]) iter.next();
! 	                IToken t = new CompiledToken(element[0], element[1], name, PyCodeCompletion.TYPE_BUILTIN);
  	                array.add(t);
  	                
--- 121,125 ----
  	            for (Iterator iter = completions.iterator(); iter.hasNext();) {
  	                String[] element = (String[]) iter.next();
! 	                IToken t = new CompiledToken(element[0], element[1], element[2], name, PyCodeCompletion.TYPE_BUILTIN);
  	                array.add(t);
  	                

Index: SourceToken.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/SourceToken.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SourceToken.java	16 Feb 2005 16:48:50 -0000	1.3
--- SourceToken.java	17 Mar 2005 12:07:07 -0000	1.4
***************
*** 27,32 ****
       * @param node
       */
!     public SourceToken(SimpleNode node, String rep, String doc, String parentPackage) {
!         super(rep, doc, parentPackage, getType(node));
          this.ast = node;
      }
--- 27,32 ----
       * @param node
       */
!     public SourceToken(SimpleNode node, String rep, String args, String doc, String parentPackage) {
!         super(rep, doc, args, parentPackage, getType(node));
          this.ast = node;
      }
***************
*** 35,40 ****
       * @param node
       */
!     public SourceToken(SimpleNode node, String rep, String doc, String parentPackage, int type) {
!         super(rep, doc, parentPackage, type);
          this.ast = node;
      }
--- 35,40 ----
       * @param node
       */
!     public SourceToken(SimpleNode node, String rep, String args, String doc, String parentPackage, int type) {
!         super(rep, doc, args, parentPackage, type);
          this.ast = node;
      }
***************
*** 43,48 ****
       * @param node
       */
!     public SourceToken(SimpleNode node, String rep, String doc, String parentPackage, String originalRep) {
!         super(rep, doc, parentPackage, getType(node), originalRep);
          this.ast = node;
      }
--- 43,48 ----
       * @param node
       */
!     public SourceToken(SimpleNode node, String rep, String doc, String args, String parentPackage, String originalRep) {
!         super(rep, doc, args, parentPackage, getType(node), originalRep);
          this.ast = node;
      }