[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/templates PyTemplatePreferencesPage.java, 1.1, 1.2 PyContextType.java, 1.1, 1.2

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

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

Modified Files:
	PyTemplatePreferencesPage.java PyContextType.java 
Log Message:
Synching to latest changes:

Pydev
<ul>
<li><strong>Editor</strong>: Cursor settings no longer overridden</li>
<li><strong>Code-completion</strong>: If __all__ is defined with runtime elements (and not only in a single assign statement), it's ignored for code-completion purposes</li>
<li><strong>Debugger</strong>: Pythonpath the same in debug and regular modes (sys.path[0] is the same directory as the file run)</li>
<li><strong>Debugger</strong>: Persist choices done in the debugger when files from the debugger are not found</li>
<li><strong>Interpreter config</strong>: "email" automatically added to the "forced builtins"</li>
<li><strong>Parser</strong>: Correctly recognizing absolute import with 3 or more levels</li>
<li><strong>Syntax check</strong>: Option to do only on active editor</li>
</ul>

Also: tabs changed for spaces

Index: PyTemplatePreferencesPage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/templates/PyTemplatePreferencesPage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyTemplatePreferencesPage.java	6 Aug 2004 17:20:03 -0000	1.1
--- PyTemplatePreferencesPage.java	28 Sep 2008 12:45:41 -0000	1.2
***************
*** 14,35 ****
   */
  public class PyTemplatePreferencesPage extends TemplatePreferencePage implements IWorkbenchPreferencePage {
! 	public PyTemplatePreferencesPage() {
! 		setPreferenceStore(PydevPlugin.getDefault().getPreferenceStore());
! 		setTemplateStore(PydevPlugin.getDefault().getTemplateStore());
! 		setContextTypeRegistry(PydevPlugin.getDefault().getContextTypeRegistry());
! 	}
  
! 	protected boolean isShowFormatterSetting() {
! 		return true;
! 	}
! 	
! 	
! 	public boolean performOk() {
! 		boolean ok= super.performOk();
! 		
! 		PydevPlugin.getDefault().savePluginPreferences();
! 		
! 		return ok;
! 	}
  
  
--- 14,35 ----
   */
  public class PyTemplatePreferencesPage extends TemplatePreferencePage implements IWorkbenchPreferencePage {
!     public PyTemplatePreferencesPage() {
!         setPreferenceStore(PydevPlugin.getDefault().getPreferenceStore());
!         setTemplateStore(PydevPlugin.getDefault().getTemplateStore());
!         setContextTypeRegistry(PydevPlugin.getDefault().getContextTypeRegistry());
!     }
  
!     protected boolean isShowFormatterSetting() {
!         return true;
!     }
!     
!     
!     public boolean performOk() {
!         boolean ok= super.performOk();
!         
!         PydevPlugin.getDefault().savePluginPreferences();
!         
!         return ok;
!     }
  
  

Index: PyContextType.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/templates/PyContextType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyContextType.java	6 Aug 2004 17:20:03 -0000	1.1
--- PyContextType.java	28 Sep 2008 12:45:41 -0000	1.2
***************
*** 16,36 ****
      public static final String PY_CONTEXT_TYPE = "org.python.pydev.editor.templates.python";
  
! 	/**
! 	 * Creates a new XML context type. 
! 	 */
! 	public PyContextType() {
! 		addGlobalResolvers();
! 	}
  
! 	private void addGlobalResolvers() {
! 		addResolver(new GlobalTemplateVariables.Cursor());
! 		addResolver(new GlobalTemplateVariables.WordSelection());
! 		addResolver(new GlobalTemplateVariables.LineSelection());
! 		addResolver(new GlobalTemplateVariables.Dollar());
! 		addResolver(new GlobalTemplateVariables.Date());
! 		addResolver(new GlobalTemplateVariables.Year());
! 		addResolver(new GlobalTemplateVariables.Time());
! 		addResolver(new GlobalTemplateVariables.User());
! 	}
  
  }
--- 16,36 ----
      public static final String PY_CONTEXT_TYPE = "org.python.pydev.editor.templates.python";
  
!     /**
!      * Creates a new XML context type. 
!      */
!     public PyContextType() {
!         addGlobalResolvers();
!     }
  
!     private void addGlobalResolvers() {
!         addResolver(new GlobalTemplateVariables.Cursor());
!         addResolver(new GlobalTemplateVariables.WordSelection());
!         addResolver(new GlobalTemplateVariables.LineSelection());
!         addResolver(new GlobalTemplateVariables.Dollar());
!         addResolver(new GlobalTemplateVariables.Date());
!         addResolver(new GlobalTemplateVariables.Year());
!         addResolver(new GlobalTemplateVariables.Time());
!         addResolver(new GlobalTemplateVariables.User());
!     }
  
  }