[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited ConcreteToken.java,1.1,1.2 AbstractToken.java,1.4,1.5 ASTManager.java,1.24,1.25 IToken.java,1.4,1.5

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

Modified Files:
	ConcreteToken.java AbstractToken.java ASTManager.java 
	IToken.java 
Log Message:
making new things in code completion...

Index: ASTManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/ASTManager.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ASTManager.java	11 Mar 2005 18:56:50 -0000	1.24
--- ASTManager.java	17 Mar 2005 12:07:04 -0000	1.25
***************
*** 283,287 ****
                      if (splitted.length > 0) {
                          //this is the completion
!                         set.add(new ConcreteToken(splitted[0], "", initial, PyCodeCompletion.TYPE_IMPORT));
                      }
                  }
--- 283,287 ----
                      if (splitted.length > 0) {
                          //this is the completion
!                         set.add(new ConcreteToken(splitted[0], "", "", initial, PyCodeCompletion.TYPE_IMPORT));
                      }
                  }

Index: ConcreteToken.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/ConcreteToken.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConcreteToken.java	22 Nov 2004 12:16:25 -0000	1.1
--- ConcreteToken.java	17 Mar 2005 12:07:04 -0000	1.2
***************
*** 22,27 ****
       * @param type
       */
!     public ConcreteToken(String rep, String doc, String parentPackage, int type) {
!         super(rep, doc, parentPackage, type);
      }
  
--- 22,27 ----
       * @param type
       */
!     public ConcreteToken(String rep, String doc, String args, String parentPackage, int type) {
!         super(rep, doc, args, parentPackage, type);
      }
  

Index: IToken.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/IToken.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IToken.java	14 Feb 2005 11:51:24 -0000	1.4
--- IToken.java	17 Mar 2005 12:07:04 -0000	1.5
***************
*** 25,28 ****
--- 25,29 ----
      public String getDocStr();
      public int getType();
+     public String getArgs();
      public String getParentPackage();
      

Index: AbstractToken.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/AbstractToken.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AbstractToken.java	14 Feb 2005 11:51:24 -0000	1.4
--- AbstractToken.java	17 Mar 2005 12:07:04 -0000	1.5
***************
*** 16,28 ****
      private String originalRep;
      private String doc;
      private String parentPackage;
      private int type;
  
!     public AbstractToken(String rep, String doc, String parentPackage, int type, String originalRep){
!         this(rep, doc, parentPackage, type);
          this.originalRep = originalRep;
      }
      
!     public AbstractToken(String rep, String doc, String parentPackage, int type){
          if (rep != null)
              this.rep = rep;
--- 16,29 ----
      private String originalRep;
      private String doc;
+     private String args;
      private String parentPackage;
      private int type;
  
!     public AbstractToken(String rep, String doc, String args, String parentPackage, int type, String originalRep){
!         this(rep, doc, args, parentPackage, type);
          this.originalRep = originalRep;
      }
      
!     public AbstractToken(String rep, String doc, String args, String parentPackage, int type){
          if (rep != null)
              this.rep = rep;
***************
*** 30,33 ****
--- 31,39 ----
              this.rep = "";
          
+         if (args != null)
+             this.args = args;
+         else
+             this.args = "";
+         
          this.originalRep = this.rep;
          
***************
*** 46,49 ****
--- 52,63 ----
      }
      
+     
+     /**
+      * @see org.python.pydev.editor.codecompletion.revisited.IToken#getArgs()
+      */
+     public String getArgs() {
+         return args;
+     }
+     
      /**
       * @see org.python.pydev.editor.javacodecompletion.IToken#getRepresentation()