[Pydev-cvs] org.python.pydev.debug/src/org/python/pydev/debug/core PydevDebugPrefs.java, 1.2, 1.3 C
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2008-09-27 20:00:32
|
Update of /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20604/src/org/python/pydev/debug/core Modified Files: PydevDebugPrefs.java Constants.java IConsoleInputListener.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: IConsoleInputListener.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/core/IConsoleInputListener.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IConsoleInputListener.java 9 Feb 2006 18:52:29 -0000 1.1 --- IConsoleInputListener.java 27 Sep 2008 19:59:09 -0000 1.2 *************** *** 9,28 **** public interface IConsoleInputListener { ! /** ! * This method is called whenever a new line is written in the console while debugging. ! * ! * @param lineReceived this is the line that was written. ! * @param target this is the target of the debug ! */ ! void newLineReceived(String lineReceived, AbstractDebugTarget target); ! /** ! * This method is called when there is a paste action in the console. ! * ! * @param text this is the text that was pasted ! * @param target this is the target of the debug ! */ ! void pasteReceived(String text, AbstractDebugTarget target); ! } --- 9,28 ---- public interface IConsoleInputListener { ! /** ! * This method is called whenever a new line is written in the console while debugging. ! * ! * @param lineReceived this is the line that was written. ! * @param target this is the target of the debug ! */ ! void newLineReceived(String lineReceived, AbstractDebugTarget target); ! /** ! * This method is called when there is a paste action in the console. ! * ! * @param text this is the text that was pasted ! * @param target this is the target of the debug ! */ ! void pasteReceived(String text, AbstractDebugTarget target); ! } Index: PydevDebugPrefs.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/core/PydevDebugPrefs.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PydevDebugPrefs.java 7 May 2004 21:51:00 -0000 1.2 --- PydevDebugPrefs.java 27 Sep 2008 19:59:09 -0000 1.3 *************** *** 23,67 **** */ public class PydevDebugPrefs extends FieldEditorPreferencePage ! implements IWorkbenchPreferencePage{ ! // Preferences ! public static final String GET_VARIABLE_TIMEOUT = "GET_VARIABLE_TIMEOUT";// GetVariable command timeout ! public static final int DEFAULT_GET_VARIABLE_TIMEOUT = 30; ! public static final String HIDE_PYDEVD_THREADS = "HIDE_PYDEVD_THREADS"; ! public static final boolean DEFAULT_HIDE_PYDEVD_THREADS = true; ! ! /** ! * Initializer sets the preference store ! */ ! public PydevDebugPrefs() { ! super(GRID); ! setPreferenceStore(PydevDebugPlugin.getDefault().getPreferenceStore()); ! } ! static public Preferences getPreferences() { ! return PydevDebugPlugin.getDefault().getPluginPreferences(); ! } ! ! public void init(IWorkbench workbench) { ! } ! ! /** ! * Creates the editors ! */ ! protected void createFieldEditors() { ! Composite p = getFieldEditorParent(); ! IntegerFieldEditor ife = new IntegerFieldEditor( ! GET_VARIABLE_TIMEOUT, "Debugger get variable timeout (seconds)", p); ! ife.setValidRange(1, 180); ! // you can't restrict widget width on IntegerFieldEditor for now ! addField(ife); ! } ! ! /** ! * Sets default preference values ! */ ! protected static void initializeDefaultPreferences(Preferences prefs) { ! prefs.setDefault(GET_VARIABLE_TIMEOUT, DEFAULT_GET_VARIABLE_TIMEOUT); ! prefs.setDefault(HIDE_PYDEVD_THREADS, DEFAULT_HIDE_PYDEVD_THREADS); ! } } --- 23,67 ---- */ public class PydevDebugPrefs extends FieldEditorPreferencePage ! implements IWorkbenchPreferencePage{ ! // Preferences ! public static final String GET_VARIABLE_TIMEOUT = "GET_VARIABLE_TIMEOUT";// GetVariable command timeout ! public static final int DEFAULT_GET_VARIABLE_TIMEOUT = 30; ! public static final String HIDE_PYDEVD_THREADS = "HIDE_PYDEVD_THREADS"; ! public static final boolean DEFAULT_HIDE_PYDEVD_THREADS = true; ! ! /** ! * Initializer sets the preference store ! */ ! public PydevDebugPrefs() { ! super(GRID); ! setPreferenceStore(PydevDebugPlugin.getDefault().getPreferenceStore()); ! } ! static public Preferences getPreferences() { ! return PydevDebugPlugin.getDefault().getPluginPreferences(); ! } ! ! public void init(IWorkbench workbench) { ! } ! ! /** ! * Creates the editors ! */ ! protected void createFieldEditors() { ! Composite p = getFieldEditorParent(); ! IntegerFieldEditor ife = new IntegerFieldEditor( ! GET_VARIABLE_TIMEOUT, "Debugger get variable timeout (seconds)", p); ! ife.setValidRange(1, 180); ! // you can't restrict widget width on IntegerFieldEditor for now ! addField(ife); ! } ! ! /** ! * Sets default preference values ! */ ! protected static void initializeDefaultPreferences(Preferences prefs) { ! prefs.setDefault(GET_VARIABLE_TIMEOUT, DEFAULT_GET_VARIABLE_TIMEOUT); ! prefs.setDefault(HIDE_PYDEVD_THREADS, DEFAULT_HIDE_PYDEVD_THREADS); ! } } Index: Constants.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/core/Constants.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Constants.java 9 Mar 2008 14:27:59 -0000 1.11 --- Constants.java 27 Sep 2008 19:59:09 -0000 1.12 *************** *** 11,47 **** public interface Constants { ! // Icons ! static final String MAIN_ICON = "icons/python.gif"; ! static final String ARGUMENTS_ICON = "icons/arguments.gif"; ! static final String PYTHON_ORG_ICON = "icons/python_16x16.png"; ! ! // Plugin constants ! static final String PLUGIN_ID = "org.python.pydev.debug"; ! static final String PYTHON_DEBUG_LAUNCH_GROUP = "org.python.pydev.debug.debug"; ! static final String PYTHON_RUN_LAUNCH_GROUP = "org.python.pydev.debug.run"; ! static final String PYTHON_COVERAGE_LAUNCH_GROUP = "org.python.pydev.debug.coverage"; ! static final String PYTHON_UNITTEST_LAUNCH_GROUP = "org.python.pydev.debug.unittest"; ! static final String ID_PYTHON_REGULAR_LAUNCH_CONFIGURATION_TYPE = "org.python.pydev.debug.regularLaunchConfigurationType"; ! static final String ID_PYTHON_COVERAGE_LAUNCH_CONFIGURATION_TYPE = "org.python.pydev.debug.coverageLaunchConfigurationType"; ! static final String ID_PYTHON_UNITTEST_LAUNCH_CONFIGURATION_TYPE = "org.python.pydev.debug.unittestLaunchConfigurationType"; ! static final String ID_JYTHON_UNITTEST_LAUNCH_CONFIGURATION_TYPE = "org.python.pydev.debug.jythonUnittestLaunchConfigurationType"; ! static final String ID_JYTHON_LAUNCH_CONFIGURATION_TYPE = "org.python.pydev.debug.jythonLaunchConfigurationType"; ! static final String PROCESS_TYPE = "PYDEV.PYTHON"; ! ! static final String ATTR_VM_ARGUMENTS = "org.python.pydev.debug.vm.arguments"; ! static final String JAVA_NATURE = "org.eclipse.jdt.core.javanature"; ! // LaunchConfiguration properties // ATTR_* are copied from IExternalToolConstants, replicated since I have no access to originals ! static final String ATTR_LOCATION = "org.eclipse.ui.externaltools" + ".ATTR_LOCATION"; ! static final String ATTR_WORKING_DIRECTORY = "org.eclipse.ui.externaltools" + ".ATTR_WORKING_DIRECTORY"; ! static final String ATTR_OTHER_WORKING_DIRECTORY = "org.eclipse.ui.externaltools" + ".ATTR_OTHER_WORKING_DIRECTORY"; ! static final String ATTR_PROGRAM_ARGUMENTS = "org.eclipse.ui.externaltools" + ".ATTR_TOOL_ARGUMENTS"; ! static final String ATTR_INTERPRETER = PLUGIN_ID + ".ATTR_INTERPRETER"; ! static final String ATTR_INTERPRETER_DEFAULT = "__default"; //$NO-NLS-1$; ! static final String ATTR_PROJECT = PLUGIN_ID + ".ATTR_PROJECT"; ! static final String ATTR_RESOURCE_TYPE = PLUGIN_ID + ".ATTR_RESOURCE_TYPE"; ! ! } --- 11,51 ---- public interface Constants { ! // Icons ! static final String MAIN_ICON = "icons/python.gif"; ! static final String ARGUMENTS_ICON = "icons/arguments.gif"; ! static final String PYTHON_ORG_ICON = "icons/python_16x16.png"; ! ! // Plugin constants ! static final String PLUGIN_ID = "org.python.pydev.debug"; ! static final String PYTHON_DEBUG_LAUNCH_GROUP = "org.python.pydev.debug.debug"; ! static final String PYTHON_RUN_LAUNCH_GROUP = "org.python.pydev.debug.run"; ! static final String PYTHON_COVERAGE_LAUNCH_GROUP = "org.python.pydev.debug.coverage"; ! static final String PYTHON_UNITTEST_LAUNCH_GROUP = "org.python.pydev.debug.unittest"; ! static final String ID_PYTHON_REGULAR_LAUNCH_CONFIGURATION_TYPE = "org.python.pydev.debug.regularLaunchConfigurationType"; ! static final String ID_PYTHON_COVERAGE_LAUNCH_CONFIGURATION_TYPE = "org.python.pydev.debug.coverageLaunchConfigurationType"; ! static final String ID_PYTHON_UNITTEST_LAUNCH_CONFIGURATION_TYPE = "org.python.pydev.debug.unittestLaunchConfigurationType"; ! static final String ID_JYTHON_UNITTEST_LAUNCH_CONFIGURATION_TYPE = "org.python.pydev.debug.jythonUnittestLaunchConfigurationType"; ! static final String ID_JYTHON_LAUNCH_CONFIGURATION_TYPE = "org.python.pydev.debug.jythonLaunchConfigurationType"; ! static final String PROCESS_TYPE = "PYDEV.PYTHON"; ! ! static final String ATTR_VM_ARGUMENTS = "org.python.pydev.debug.vm.arguments"; ! static final String JAVA_NATURE = "org.eclipse.jdt.core.javanature"; ! // LaunchConfiguration properties // ATTR_* are copied from IExternalToolConstants, replicated since I have no access to originals ! static final String ATTR_LOCATION = "org.eclipse.ui.externaltools" + ".ATTR_LOCATION"; ! /** Attribute holding alternate location that is used to actually run the resource. */ ! static final String ATTR_ALTERNATE_LOCATION = "org.python.pydev.debug.core" + ".ATTR_ALTERNATE_LOCATION"; ! /** Attribute to control if a wrapper for test runner should be used. */ ! static final String ATTR_NO_UNITTEST_WRAPPER = "org.python.pydev.debug.core" + ".ATTR_NO_UNITTEST_WRAPPER"; ! static final String ATTR_WORKING_DIRECTORY = "org.eclipse.ui.externaltools" + ".ATTR_WORKING_DIRECTORY"; ! static final String ATTR_OTHER_WORKING_DIRECTORY = "org.eclipse.ui.externaltools" + ".ATTR_OTHER_WORKING_DIRECTORY"; ! static final String ATTR_PROGRAM_ARGUMENTS = "org.eclipse.ui.externaltools" + ".ATTR_TOOL_ARGUMENTS"; ! static final String ATTR_INTERPRETER = PLUGIN_ID + ".ATTR_INTERPRETER"; ! static final String ATTR_INTERPRETER_DEFAULT = "__default"; //$NO-NLS-1$; ! static final String ATTR_PROJECT = PLUGIN_ID + ".ATTR_PROJECT"; ! static final String ATTR_RESOURCE_TYPE = PLUGIN_ID + ".ATTR_RESOURCE_TYPE"; ! ! } |