[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2128] trunk/org.rubypeople.rdt.refactoring/src/ org/rubypeople/rdt/refactoring/core/renamemethod/MethodRenamer.java

[<mir...@us...>]

Revision: 2128
          http://svn.sourceforge.net/rubyeclipse/?rev=2128&view=rev
Author:   mirkostocker
Date:     2007-03-12 00:57:06 -0700 (Mon, 12 Mar 2007)

Log Message:
-----------
Fix the rename method back button (edit providers shouldn't use fields to store intermediate data..)

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamemethod/MethodRenamer.java

Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamemethod/MethodRenamer.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamemethod/MethodRenamer.java	2007-03-09 20:39:58 UTC (rev 2127)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamemethod/MethodRenamer.java	2007-03-12 07:57:06 UTC (rev 2128)
@@ -59,7 +59,6 @@
 public class MethodRenamer implements IMultiFileEditProvider {
 	
 	private RenameMethodConfig config;
-	private MultiFileEditProvider fileEdits;
 	
 	public Collection<String> getAllMethodsFromClass() {
 		Collection<String> names = new ArrayList<String>();
@@ -75,7 +74,6 @@
 	
 	public MethodRenamer(RenameMethodConfig config){
 		this.config = config;
-		fileEdits = new MultiFileEditProvider();		
 		
 		Collection<MethodCallNodeWrapper> probableClass = getCallCandidatesInClass();
 		probableClass.addAll(getSubsequentCalls());
@@ -84,18 +82,20 @@
 
 	public Collection<FileMultiEditProvider> getFileEditProviders(){
 			
-		addDefinitionRenamer();
+		MultiFileEditProvider fileEdits = new MultiFileEditProvider();		
 		
-		addCallRenamers();
+		addDefinitionRenamer(fileEdits);
 		
+		addCallRenamers(fileEdits);
+		
 		if(!config.getTargetMethod().isClassMethod()){
-			addSymbolRenamers();
+			addSymbolRenamers(fileEdits);
 		}
 		
 		return fileEdits.getFileEditProviders();
 	}
 
-	private void addSymbolRenamers() {
+	private void addSymbolRenamers(MultiFileEditProvider fileEdits) {
 		if(config.getTargetMethod().isClassMethod()){
 			return;
 		}
@@ -106,7 +106,7 @@
 		}
 	}
 
-	private void addCallRenamers() {
+	private void addCallRenamers(MultiFileEditProvider fileEdits) {
 		
 		for(INodeWrapper currentCandidate : config.getSelectedCalls()){
 			String file = currentCandidate.getWrappedNode().getPosition().getFile();
@@ -116,8 +116,8 @@
 		}
 	}
 
-	private void addDefinitionRenamer() {
-		if(config.getSelectedClass()==null || config.getTargetMethod().isClassMethod()){
+	private void addDefinitionRenamer(MultiFileEditProvider fileEdits) {
+		if(config.getSelectedClass() == null || config.getTargetMethod().isClassMethod()){
 			String file = config.getDocumentProvider().getActiveFileName();
 			MethodNameArgumentItem argumentItem = new MethodNameArgumentItem(config.getTargetMethod().getWrappedNode().getNameNode());
 			fileEdits.addEditProvider(new FileEditProvider(file, new MethodRenameEditProvider(argumentItem, config.getNewName())));	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.