[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/autoedit PyAutoIndentStrategy.java,1.18,1.19 IIndentPrefs.java,1.4,1.5 DefaultIndentPrefs.java,1.4,1.5

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

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

Modified Files:
	PyAutoIndentStrategy.java IIndentPrefs.java 
	DefaultIndentPrefs.java 
Log Message:


Index: PyAutoIndentStrategy.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/autoedit/PyAutoIndentStrategy.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** PyAutoIndentStrategy.java	28 Oct 2005 15:33:28 -0000	1.18
--- PyAutoIndentStrategy.java	17 Nov 2005 14:53:33 -0000	1.19
***************
*** 171,175 ****
                              command.text = "():";
                              command.caretOffset = command.offset + 1;
!                         } else if (hasClassMethodDef) {
                              command.text = "(self):";
                              command.caretOffset = command.offset + 5;
--- 171,175 ----
                              command.text = "():";
                              command.caretOffset = command.offset + 1;
!                         } else if (hasClassMethodDef && prefs.getAutoAddSelf()) {
                              command.text = "(self):";
                              command.caretOffset = command.offset + 5;

Index: IIndentPrefs.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/autoedit/IIndentPrefs.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IIndentPrefs.java	28 Oct 2005 15:33:28 -0000	1.4
--- IIndentPrefs.java	17 Nov 2005 14:53:33 -0000	1.5
***************
*** 74,76 ****
--- 74,81 ----
  	 */
  	public boolean getSmartIndentPar();
+ 	
+ 	/**
+ 	 * Get whether we should add 'self' automatically when declaring method
+ 	 */
+ 	public boolean getAutoAddSelf();
  }

Index: DefaultIndentPrefs.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/autoedit/DefaultIndentPrefs.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefaultIndentPrefs.java	28 Oct 2005 15:33:28 -0000	1.4
--- DefaultIndentPrefs.java	17 Nov 2005 14:53:33 -0000	1.5
***************
*** 74,76 ****
--- 74,80 ----
      }
  
+ 	public boolean getAutoAddSelf() {
+ 		return PydevPrefs.getPreferences().getBoolean(PydevPrefs.AUTO_ADD_SELF);
+ 	}
+ 
  }
\ No newline at end of file