[Pydev-cvs] org.python.pydev.jython/src/org/python/pydev/jython/ui JyScriptingPreferencesPage.java, 1.3, 1.4

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

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

Modified Files:
	JyScriptingPreferencesPage.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: JyScriptingPreferencesPage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.jython/src/org/python/pydev/jython/ui/JyScriptingPreferencesPage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JyScriptingPreferencesPage.java	21 Apr 2006 19:31:01 -0000	1.3
--- JyScriptingPreferencesPage.java	27 Sep 2008 19:58:13 -0000	1.4
***************
*** 13,30 ****
  public class JyScriptingPreferencesPage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage{
  
! 	public static final String SHOW_SCRIPTING_OUTPUT = "SHOW_SCRIPTING_OUTPUT";
! 	public static final boolean DEFAULT_SHOW_SCRIPTING_OUTPUT = false;
! 	
! 	public static final String LOG_SCRIPTING_ERRORS = "LOG_SCRIPTING_ERRORS";
! 	public static final boolean DEFAULT_LOG_SCRIPTING_ERRORS = true;
  
! 	public static final String ADDITIONAL_SCRIPTING_LOCATION = "ADDITIONAL_SCRIPTING_LOCATION";
  
! 	public JyScriptingPreferencesPage() {
          super(GRID);
          //Set the preference store for the preference page.
          setPreferenceStore(JythonPlugin.getDefault().getPreferenceStore());      
! 	}
! 	
      public void init(IWorkbench workbench) {
      }
--- 13,30 ----
  public class JyScriptingPreferencesPage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage{
  
!     public static final String SHOW_SCRIPTING_OUTPUT = "SHOW_SCRIPTING_OUTPUT";
!     public static final boolean DEFAULT_SHOW_SCRIPTING_OUTPUT = false;
!     
!     public static final String LOG_SCRIPTING_ERRORS = "LOG_SCRIPTING_ERRORS";
!     public static final boolean DEFAULT_LOG_SCRIPTING_ERRORS = true;
  
!     public static final String ADDITIONAL_SCRIPTING_LOCATION = "ADDITIONAL_SCRIPTING_LOCATION";
  
!     public JyScriptingPreferencesPage() {
          super(GRID);
          //Set the preference store for the preference page.
          setPreferenceStore(JythonPlugin.getDefault().getPreferenceStore());      
!     }
!     
      public void init(IWorkbench workbench) {
      }
***************
*** 55,59 ****
       */
      public static boolean getLogScriptingErrors(){
!     	return JythonPlugin.getDefault().getPreferenceStore().getBoolean(LOG_SCRIPTING_ERRORS);
      }
  
--- 55,59 ----
       */
      public static boolean getLogScriptingErrors(){
!         return JythonPlugin.getDefault().getPreferenceStore().getBoolean(LOG_SCRIPTING_ERRORS);
      }
  
***************
*** 63,74 ****
       */
      public static File getAdditionalScriptingLocation(){
!     	String loc = JythonPlugin.getDefault().getPreferenceStore().getString(ADDITIONAL_SCRIPTING_LOCATION);
!     	if(loc != null && loc.trim().length() > 0){
!     		File file = new File(loc);
!     		if(file.exists() && file.isDirectory()){
!     			return file;
!     		}
!     	}
!     	return null;
      }
  }
--- 63,74 ----
       */
      public static File getAdditionalScriptingLocation(){
!         String loc = JythonPlugin.getDefault().getPreferenceStore().getString(ADDITIONAL_SCRIPTING_LOCATION);
!         if(loc != null && loc.trim().length() > 0){
!             File file = new File(loc);
!             if(file.exists() && file.isDirectory()){
!                 return file;
!             }
!         }
!         return null;
      }
  }