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

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

Revision: 2340
          http://svn.sourceforge.net/rubyeclipse/?rev=2340&view=rev
Author:   mirkostocker
Date:     2007-04-19 02:32:56 -0700 (Thu, 19 Apr 2007)

Log Message:
-----------
fix a bug when using self.method_name to define methods in modules

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/ModuleNodeWrapper.java

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

Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/ModuleNodeWrapper.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/ModuleNodeWrapper.java	2007-04-19 08:56:37 UTC (rev 2339)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/ModuleNodeWrapper.java	2007-04-19 09:32:56 UTC (rev 2340)
@@ -47,9 +47,12 @@
 
 	private void initModuleMethodConstNodes() {
 		for (Node node : NodeProvider.getSubNodes(getWrappedNode(), DefsNode.class)) {
-			ConstNode constNode = (ConstNode) ((DefsNode) node).getReceiverNode();
-			if(constNode.getName().equals(getName())) {
-				moduleMethodNodes.add(constNode);
+			DefsNode defsNode = (DefsNode) node;
+			if(defsNode.getReceiverNode() instanceof ConstNode) {
+				ConstNode constNode = (ConstNode) defsNode.getReceiverNode();
+				if(constNode.getName().equals(getName())) {
+					moduleMethodNodes.add(constNode);
+				}
 			}
 		}
 	}

Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_8.activeFile.rb.result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_8.activeFile.rb.result	                        (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_8.activeFile.rb.result	2007-04-19 09:32:56 UTC (rev 2340)
@@ -0,0 +1,6 @@
+module OtherModule
+  def self.test
+  end
+  def OtherModule.another_test
+  end
+end

Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_8.activeFile.rb.source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_8.activeFile.rb.source	                        (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_8.activeFile.rb.source	2007-04-19 09:32:56 UTC (rev 2340)
@@ -0,0 +1,6 @@
+module Module
+  def self.test
+  end
+  def Module.another_test
+  end
+end

Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_8.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_8.test_properties	                        (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_8.test_properties	2007-04-19 09:32:56 UTC (rev 2340)
@@ -0,0 +1,3 @@
+name=OtherModule
+pos=10
+activeFile=activeFile.rb
\ No newline at end of file


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