[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/actions/refactoring PyRefactorAction.java
Brought to you by:
fabioz
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/refactoring In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4313/src/org/python/pydev/editor/actions/refactoring Modified Files: PyRefactorAction.java PyExtractLocalVariable.java PyInlineLocalVariable.java PyExtractMethod.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: PyExtractLocalVariable.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/refactoring/PyExtractLocalVariable.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PyExtractLocalVariable.java 19 Jan 2007 23:15:14 -0000 1.6 --- PyExtractLocalVariable.java 28 Sep 2008 12:45:51 -0000 1.7 *************** *** 20,27 **** * we need: * ! * def extract(self, filename_path, ! * begin_line, begin_col, ! * end_line, end_col, ! * name): * @throws BadLocationException * @throws CoreException --- 20,27 ---- * we need: * ! * def extract(self, filename_path, ! * begin_line, begin_col, ! * end_line, end_col, ! * name): * @throws BadLocationException * @throws CoreException Index: PyExtractMethod.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/refactoring/PyExtractMethod.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PyExtractMethod.java 19 Jan 2007 23:15:14 -0000 1.8 --- PyExtractMethod.java 28 Sep 2008 12:45:51 -0000 1.9 *************** *** 21,28 **** * we need: * ! * def extract(self, filename_path, ! * begin_line, begin_col, ! * end_line, end_col, ! * name): * @throws BadLocationException * @throws CoreException --- 21,28 ---- * we need: * ! * def extract(self, filename_path, ! * begin_line, begin_col, ! * end_line, end_col, ! * name): * @throws BadLocationException * @throws CoreException *************** *** 33,37 **** String res = ""; if(name.equals("") == false){ ! res = getPyRefactoring().extract(getRefactoringRequest(name, monitor)); } return res; --- 33,37 ---- String res = ""; if(name.equals("") == false){ ! res = getPyRefactoring().extract(getRefactoringRequest(name, monitor)); } return res; Index: PyRefactorAction.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/refactoring/PyRefactorAction.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** PyRefactorAction.java 12 Mar 2007 15:34:05 -0000 1.24 --- PyRefactorAction.java 28 Sep 2008 12:45:51 -0000 1.25 *************** *** 133,140 **** public RefactoringRequest getRefactoringRequest(){ ! return getRefactoringRequest(null, null); } public RefactoringRequest getRefactoringRequest(IProgressMonitor monitor){ ! return getRefactoringRequest(null, monitor); } --- 133,140 ---- public RefactoringRequest getRefactoringRequest(){ ! return getRefactoringRequest(null, null); } public RefactoringRequest getRefactoringRequest(IProgressMonitor monitor){ ! return getRefactoringRequest(null, monitor); } *************** *** 151,159 **** //testing first with whole lines. PyEdit pyEdit = getPyEdit(); //may not be available in tests, that's why it is important to be able to operate without it ! request = createRefactoringRequest(monitor, pyEdit, ps); } request.pushMonitor(monitor); request.inputName = name; ! return request; } --- 151,159 ---- //testing first with whole lines. PyEdit pyEdit = getPyEdit(); //may not be available in tests, that's why it is important to be able to operate without it ! request = createRefactoringRequest(monitor, pyEdit, ps); } request.pushMonitor(monitor); request.inputName = name; ! return request; } Index: PyInlineLocalVariable.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/refactoring/PyInlineLocalVariable.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PyInlineLocalVariable.java 19 Jan 2007 23:15:14 -0000 1.7 --- PyInlineLocalVariable.java 28 Sep 2008 12:45:51 -0000 1.8 *************** *** 21,26 **** * we need: * ! * def inlineLocalVariable(self,filename_path, line, col) ! * * @throws BadLocationException * @throws CoreException --- 21,26 ---- * we need: * ! * def inlineLocalVariable(self,filename_path, line, col) ! * * @throws BadLocationException * @throws CoreException |