[Pydev-cvs] org.python.pydev/src/org/python/pydev/plugin PyCodeStylePreferencesPage.java, NONE, 1.1 PyCodeFormatterPage.java, 1.4, 1.5 PydevPrefsInitializer.java, 1.14, 1.15

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

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

Modified Files:
	PyCodeFormatterPage.java PydevPrefsInitializer.java 
Added Files:
	PyCodeStylePreferencesPage.java 
Log Message:
The assist assign now can know about a coding std.

--- NEW FILE: PyCodeStylePreferencesPage.java ---
package org.python.pydev.plugin;

import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;

public class PyCodeStylePreferencesPage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {

    public static final String USE_LOCALS_AND_ATTRS_CAMELCASE = "USE_LOCALS_AND_ATTRS_CAMELCASE";

    public static final boolean DEFAULT_USE_LOCALS_AND_ATTRS_CAMELCASE = true;

    public PyCodeStylePreferencesPage() {
        super(GRID);
        setPreferenceStore(PydevPlugin.getDefault().getPreferenceStore());
    }

    /**
     * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
     */
    public void createFieldEditors() {
        Composite p = getFieldEditorParent();

        addField(new BooleanFieldEditor(USE_LOCALS_AND_ATTRS_CAMELCASE, "Use locals and attrs in camel case (used for assign quick-assist)?", p));
    }

    /**
     * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
     */
    public void init(IWorkbench workbench) {
    }

    public static boolean useLocalsAndAttrsCamelCase() {
        return PydevPrefs.getPreferences().getBoolean(USE_LOCALS_AND_ATTRS_CAMELCASE);
    }

}


Index: PydevPrefsInitializer.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/PydevPrefsInitializer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PydevPrefsInitializer.java	24 Jan 2007 00:36:32 -0000	1.14
--- PydevPrefsInitializer.java	24 Feb 2007 19:28:10 -0000	1.15
***************
*** 88,91 ****
--- 88,94 ----
          node.putInt(PyDevBuilderPrefPage.PYDEV_ELAPSE_BEFORE_ANALYSIS, PyDevBuilderPrefPage.DEFAULT_PYDEV_ELAPSE_BEFORE_ANALYSIS);
          
+         //coding style
+         node.putBoolean(PyCodeStylePreferencesPage.USE_LOCALS_AND_ATTRS_CAMELCASE, PyCodeStylePreferencesPage.DEFAULT_USE_LOCALS_AND_ATTRS_CAMELCASE);
+         
          //code formatting
          node.putBoolean(PyCodeFormatterPage.USE_SPACE_AFTER_COMMA,    PyCodeFormatterPage.DEFAULT_USE_SPACE_AFTER_COMMA);

Index: PyCodeFormatterPage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/PyCodeFormatterPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PyCodeFormatterPage.java	7 Aug 2006 13:45:24 -0000	1.4
--- PyCodeFormatterPage.java	24 Feb 2007 19:28:10 -0000	1.5
***************
*** 15,30 ****
   * @author Fabio Zadrozny
   */
! public class PyCodeFormatterPage extends FieldEditorPreferencePage 
! implements IWorkbenchPreferencePage{
  
      public static final String USE_SPACE_AFTER_COMMA = "USE_SPACE_AFTER_COMMA";
      public static final boolean DEFAULT_USE_SPACE_AFTER_COMMA = true;
!     
      public static final String USE_SPACE_FOR_PARENTESIS = "USE_SPACE_FOR_PARENTESIS";
      public static final boolean DEFAULT_USE_SPACE_FOR_PARENTESIS = false;
!     
!     /**
!      * @param style
!      */
      public PyCodeFormatterPage() {
          super(GRID);
--- 15,28 ----
   * @author Fabio Zadrozny
   */
! public class PyCodeFormatterPage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
  
      public static final String USE_SPACE_AFTER_COMMA = "USE_SPACE_AFTER_COMMA";
+ 
      public static final boolean DEFAULT_USE_SPACE_AFTER_COMMA = true;
! 
      public static final String USE_SPACE_FOR_PARENTESIS = "USE_SPACE_FOR_PARENTESIS";
+ 
      public static final boolean DEFAULT_USE_SPACE_FOR_PARENTESIS = false;
! 
      public PyCodeFormatterPage() {
          super(GRID);
***************
*** 38,46 ****
          Composite p = getFieldEditorParent();
  
!         addField(new BooleanFieldEditor(
! 		        USE_SPACE_AFTER_COMMA, "Use space after commas?", p));
  
!         addField(new BooleanFieldEditor(
! 		        USE_SPACE_FOR_PARENTESIS, "Use space before and after parenthesis?", p));
      }
  
--- 36,42 ----
          Composite p = getFieldEditorParent();
  
!         addField(new BooleanFieldEditor(USE_SPACE_AFTER_COMMA, "Use space after commas?", p));
  
!         addField(new BooleanFieldEditor(USE_SPACE_FOR_PARENTESIS, "Use space before and after parenthesis?", p));
      }
  
***************
*** 59,62 ****
      }
  
- 
  }
--- 55,57 ----