[Pydev-cvs] org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractme
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2007-02-27 16:44:06
|
Update of /cvsroot/pydev/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractmethod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23628/src/org/python/pydev/refactoring/coderefactoring/extractmethod Modified Files: ExtractMethodRequestProcessor.java ExtractMethodRefactoring.java Log Message: Fixed tests. Index: ExtractMethodRefactoring.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodRefactoring.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExtractMethodRefactoring.java 27 Feb 2007 12:24:54 -0000 1.2 --- ExtractMethodRefactoring.java 27 Feb 2007 16:44:03 -0000 1.3 *************** *** 30,33 **** --- 30,35 ---- private ModuleAdapter parsedUserSelection; + private ModuleAdapter module; + public ExtractMethodRefactoring(String name, RefactoringInfo req) { super(name, req); *************** *** 35,38 **** --- 37,41 ---- this.parsedUserSelection = req.getParsedUserSelection(); this.parsedExtendedSelection = req.getParsedExtendedSelection(); + this.module = req.getModule(); validateSelections(); *************** *** 53,57 **** } ! this.requestProcessor = new ExtractMethodRequestProcessor(req.getScopeAdapter(), standardModule, standardSelection); if (req.isSelectionExtensionRequired() && this.parsedExtendedSelection != null && this.parsedUserSelection != null) { --- 56,60 ---- } ! this.requestProcessor = new ExtractMethodRequestProcessor(req.getScopeAdapter(), standardModule, this.getModule(), standardSelection); if (req.isSelectionExtensionRequired() && this.parsedExtendedSelection != null && this.parsedUserSelection != null) { *************** *** 110,112 **** --- 113,123 ---- } } + + public void setModule(ModuleAdapter module) { + this.module = module; + } + + public ModuleAdapter getModule() { + return module; + } } Index: ExtractMethodRequestProcessor.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodRequestProcessor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExtractMethodRequestProcessor.java 27 Feb 2007 12:24:54 -0000 1.2 --- ExtractMethodRequestProcessor.java 27 Feb 2007 16:44:03 -0000 1.3 *************** *** 32,45 **** private ITextSelection selection; ! public ExtractMethodRequestProcessor(AbstractScopeNode<?> scopeAdapter, ModuleAdapter parsedSelection, ITextSelection selection) { ! initProcessor(scopeAdapter, parsedSelection, selection); } ! public void initProcessor(AbstractScopeNode<?> scopeAdapter, ModuleAdapter parsedSelection, ITextSelection selection) { this.methodName = "pepticMethod"; this.scopeAdapter = scopeAdapter; this.selection = selection; this.parsedSelection = parsedSelection; ! this.deducer = new ParameterReturnDeduce(this.scopeAdapter, selection); this.parameterOrder = new ArrayList<String>(); parameterOrder.addAll(deducer.getParameters()); --- 32,45 ---- private ITextSelection selection; ! public ExtractMethodRequestProcessor(AbstractScopeNode<?> scopeAdapter, ModuleAdapter parsedSelection, ModuleAdapter module, ITextSelection selection) { ! initProcessor(scopeAdapter, parsedSelection, module, selection); } ! public void initProcessor(AbstractScopeNode<?> scopeAdapter, ModuleAdapter parsedSelection, ModuleAdapter module, ITextSelection selection) { this.methodName = "pepticMethod"; this.scopeAdapter = scopeAdapter; this.selection = selection; this.parsedSelection = parsedSelection; ! this.deducer = new ParameterReturnDeduce(this.scopeAdapter, selection, module); this.parameterOrder = new ArrayList<String>(); parameterOrder.addAll(deducer.getParameters()); |