[Pydev-cvs] org.python.pydev/src_navigator/org/python/pydev/navigator/actions PyCopyResourceAction
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2008-09-28 12:46:32
|
Update of /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4313/src_navigator/org/python/pydev/navigator/actions Modified Files: PyCopyResourceAction.java PythonLinkHelper.java PyRenameResourceAction.java PyMoveResourceAction.java PyPasteAction.java PyDeleteResourceAction.java PythonRefactorActionProvider.java PythonActionProvider.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: PyDeleteResourceAction.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/actions/PyDeleteResourceAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PyDeleteResourceAction.java 31 Jul 2008 01:47:36 -0000 1.4 --- PyDeleteResourceAction.java 28 Sep 2008 12:45:41 -0000 1.5 *************** *** 72,76 **** ! @Override protected List getSelectedResources() { --- 72,76 ---- ! @Override protected List getSelectedResources() { *************** *** 80,84 **** @Override public IStructuredSelection getStructuredSelection() { ! return new StructuredSelection(selected); } --- 80,84 ---- @Override public IStructuredSelection getStructuredSelection() { ! return new StructuredSelection(selected); } Index: PythonLinkHelper.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/actions/PythonLinkHelper.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PythonLinkHelper.java 6 Aug 2008 16:23:19 -0000 1.4 --- PythonLinkHelper.java 28 Sep 2008 12:45:41 -0000 1.5 *************** *** 62,74 **** //ok, let's check if the active editor is already the selection, because although the findEditor(editorInput) method //may return an editor for the correct file, we may have multiple editors for the same file, and if the current ! //editor is already correct, we don't want to change it ! //@see bug: https://sourceforge.net/tracker/?func=detail&atid=577329&aid=2037682&group_id=85796 IEditorPart activeEditor = aPage.getActiveEditor(); if(activeEditor != null){ ! IEditorInput editorInput = activeEditor.getEditorInput(); ! IFile currFile = (IFile) editorInput.getAdapter(IFile.class); ! if(currFile != null && currFile.equals(firstElement)){ ! return; //the current editor is already the active editor. ! } } --- 62,74 ---- //ok, let's check if the active editor is already the selection, because although the findEditor(editorInput) method //may return an editor for the correct file, we may have multiple editors for the same file, and if the current ! //editor is already correct, we don't want to change it ! //@see bug: https://sourceforge.net/tracker/?func=detail&atid=577329&aid=2037682&group_id=85796 IEditorPart activeEditor = aPage.getActiveEditor(); if(activeEditor != null){ ! IEditorInput editorInput = activeEditor.getEditorInput(); ! IFile currFile = (IFile) editorInput.getAdapter(IFile.class); ! if(currFile != null && currFile.equals(firstElement)){ ! return; //the current editor is already the active editor. ! } } Index: PyMoveResourceAction.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/actions/PyMoveResourceAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PyMoveResourceAction.java 31 Jul 2008 01:47:36 -0000 1.3 --- PyMoveResourceAction.java 28 Sep 2008 12:45:41 -0000 1.4 *************** *** 68,72 **** @Override public IStructuredSelection getStructuredSelection() { ! return new StructuredSelection(selected); } --- 68,72 ---- @Override public IStructuredSelection getStructuredSelection() { ! return new StructuredSelection(selected); } Index: PyPasteAction.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/actions/PyPasteAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PyPasteAction.java 31 Jul 2008 01:47:36 -0000 1.3 --- PyPasteAction.java 28 Sep 2008 12:45:41 -0000 1.4 *************** *** 70,74 **** @Override public IStructuredSelection getStructuredSelection() { ! return new StructuredSelection(selected); } --- 70,74 ---- @Override public IStructuredSelection getStructuredSelection() { ! return new StructuredSelection(selected); } Index: PyRenameResourceAction.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/actions/PyRenameResourceAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PyRenameResourceAction.java 31 Jul 2008 01:47:36 -0000 1.2 --- PyRenameResourceAction.java 28 Sep 2008 12:45:41 -0000 1.3 *************** *** 115,119 **** @Override public IStructuredSelection getStructuredSelection() { ! return new StructuredSelection(selected); } --- 115,119 ---- @Override public IStructuredSelection getStructuredSelection() { ! return new StructuredSelection(selected); } Index: PythonRefactorActionProvider.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/actions/PythonRefactorActionProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PythonRefactorActionProvider.java 10 Mar 2007 14:32:43 -0000 1.1 --- PythonRefactorActionProvider.java 28 Sep 2008 12:45:41 -0000 1.2 *************** *** 12,16 **** public class PythonRefactorActionProvider extends CommonActionProvider{ ! private PyRenameResourceAction renameResourceAction; --- 12,16 ---- public class PythonRefactorActionProvider extends CommonActionProvider{ ! private PyRenameResourceAction renameResourceAction; Index: PythonActionProvider.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/actions/PythonActionProvider.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PythonActionProvider.java 7 Jul 2007 11:53:08 -0000 1.4 --- PythonActionProvider.java 28 Sep 2008 12:45:41 -0000 1.5 *************** *** 29,33 **** private PyPasteAction pasteAction; private PyMoveResourceAction moveResourceAction; ! private ISelectionProvider selectionProvider; @Override --- 29,33 ---- private PyPasteAction pasteAction; private PyMoveResourceAction moveResourceAction; ! private ISelectionProvider selectionProvider; @Override Index: PyCopyResourceAction.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/actions/PyCopyResourceAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PyCopyResourceAction.java 31 Jul 2008 01:47:36 -0000 1.3 --- PyCopyResourceAction.java 28 Sep 2008 12:45:41 -0000 1.4 *************** *** 69,73 **** @Override public IStructuredSelection getStructuredSelection() { ! return new StructuredSelection(selected); } --- 69,73 ---- @Override public IStructuredSelection getStructuredSelection() { ! return new StructuredSelection(selected); } |