[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1991] trunk/org.rubypeople.rdt.refactoring

[<cal...@us...>]

Revision: 1991
          http://svn.sourceforge.net/rubyeclipse/?rev=1991&view=rev
Author:   callandor1983
Date:     2007-02-21 04:57:27 -0800 (Wed, 21 Feb 2007)

Log Message:
-----------
Rename on method (whole methodname selected) works now (instead of calling rename local)

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/rename/RenameConditionChecker.java

Added Paths:
-----------
    trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.activeFile.rb.result
    trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.activeFile.rb.source
    trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.test_properties

Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/rename/RenameConditionChecker.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/rename/RenameConditionChecker.java	2007-02-21 11:41:02 UTC (rev 1990)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/rename/RenameConditionChecker.java	2007-02-21 12:57:27 UTC (rev 1991)
@@ -47,8 +47,9 @@
 		selectedLocalNode = SelectionNodeProvider.getSelectedNodeOfType(rootNode, offset, LocalNodeWrapper.getLocalNodeClasses());
 		ConstNode selectedConstNode = (ConstNode) SelectionNodeProvider.getSelectedNodeOfType(rootNode, offset, ConstNode.class);
 		SymbolNode selectedSymbolNode = (SymbolNode) SelectionNodeProvider.getSelectedNodeOfType(rootNode, offset, SymbolNode.class);
-		if(selectedLocalNode == null && SelectionNodeProvider.getSelectedNodeOfType(rootNode, offset, ArgsNode.class) != null) {
-			selectedLocalNode = SelectionNodeProvider.getSelectedNodeOfType(rootNode, offset, ArgumentNode.class);
+		ArgsNode argsNode = (ArgsNode) SelectionNodeProvider.getSelectedNodeOfType(rootNode, offset, ArgsNode.class);
+		if(selectedLocalNode == null && argsNode != null) {
+			selectedLocalNode = SelectionNodeProvider.getSelectedNodeOfType(argsNode, offset, ArgumentNode.class);
 		}
 		initPreferedNode(selectedConstNode, selectedSymbolNode);
 	}

Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.activeFile.rb.result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.activeFile.rb.result	                        (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.activeFile.rb.result	2007-02-21 12:57:27 UTC (rev 1991)
@@ -0,0 +1,6 @@
+class Test
+	def bar
+		@foo = 5
+		p @foo
+	end
+end
\ No newline at end of file

Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.activeFile.rb.source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.activeFile.rb.source	                        (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.activeFile.rb.source	2007-02-21 12:57:27 UTC (rev 1991)
@@ -0,0 +1,6 @@
+class Test
+	def wunder
+		@foo = 5
+		p @foo
+	end
+end
\ No newline at end of file

Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.test_properties	                        (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_15.test_properties	2007-02-21 12:57:27 UTC (rev 1991)
@@ -0,0 +1,4 @@
+activeFile=activeFile.rb
+destinationFiles=
+caretPosition=22
+newName=bar
\ No newline at end of file


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