pydev-cvs

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

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

Modified Files:
	PythonCorrectionProcessor.java 
Log Message:
adding self on class methods

Index: PythonCorrectionProcessor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/correctionassist/PythonCorrectionProcessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PythonCorrectionProcessor.java	24 Sep 2004 16:41:12 -0000	1.3
--- PythonCorrectionProcessor.java	24 Sep 2004 19:24:39 -0000	1.4
***************
*** 105,109 ****
          }
  
!         String params = "("+getInsideParentesisTok(ps)+")";
          int firstCharPosition = PyAction.getFirstCharRelativePosition(ps.doc, ps.absoluteCursorOffset);
          
--- 105,109 ----
          }
  
!         String params = getInsideParentesisTok(ps);
          int firstCharPosition = PyAction.getFirstCharRelativePosition(ps.doc, ps.absoluteCursorOffset);
          
***************
*** 113,120 ****
          String delim = PyAction.getDelimiter(ps.doc, 0);
          String cls = "class "+callName+":"+delim+delim;
!         cls += indentation+"def __init__"+params+":"+delim;
          cls += indentation+indentation+"pass"+delim;
          
!         String method = "def "+callName+params+":"+delim+indentation+"pass"+delim;
  
          if (firstCharPosition == 0){ //we are in the global context
--- 113,126 ----
          String delim = PyAction.getDelimiter(ps.doc, 0);
          String cls = "class "+callName+":"+delim+delim;
!         
!         String self = "self";
!         if(params.trim().length() != 0){
!             self += ", ";
!         }
!         
!         cls += indentation+"def __init__("+self+params+"):"+delim;
          cls += indentation+indentation+"pass"+delim;
          
!         String method = "def "+callName+"(%s"+params+"):"+delim+indentation+"pass"+delim;
  
          if (firstCharPosition == 0){ //we are in the global context
***************
*** 130,133 ****
--- 136,140 ----
                      "Create new class (global context)", null, null));
  
+             method = method.replaceFirst("%s", "");
              l.add(new CompletionProposal(method, newPos, 0, method.length()+1, null,
                      "Create new method (global context)", null, null));
***************
*** 173,176 ****
--- 180,185 ----
  	                method = atStart+method+delim;
  	                
+ 	                method = method.replaceFirst("%s", self);
+ 	                
  		            l.add(new CompletionProposal(method, newPos, 0, method.length()-4, null,
  		                    "Create new method (in class)", null, null));