Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2087] trunk/org.rubypeople.rdt.refactoring
|
From: <cal...@us...> - 2007-03-05 14:44:13
|
Revision: 2087
http://svn.sourceforge.net/rubyeclipse/?rev=2087&view=rev
Author: callandor1983
Date: 2007-03-05 06:44:11 -0800 (Mon, 05 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractMethodConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/FieldProvider.java
Added Paths:
-----------
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.result.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.source.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.activeFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.activeFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.test_properties
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractMethodConditionChecker.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractMethodConditionChecker.java 2007-03-05 14:37:31 UTC (rev 2086)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractMethodConditionChecker.java 2007-03-05 14:44:11 UTC (rev 2087)
@@ -35,7 +35,6 @@
import org.jruby.ast.ArgsNode;
import org.jruby.ast.ArgumentNode;
import org.jruby.ast.ArrayNode;
-import org.jruby.ast.BlockNode;
import org.jruby.ast.BreakNode;
import org.jruby.ast.CaseNode;
import org.jruby.ast.ClassNode;
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/FieldProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/FieldProvider.java 2007-03-05 14:37:31 UTC (rev 2086)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/FieldProvider.java 2007-03-05 14:44:11 UTC (rev 2087)
@@ -137,7 +137,12 @@
for (FCallNode accessorPart : currentAccessor.getAccessorNodes()) {
ArrayNode arrayNode = (ArrayNode) accessorPart.getArgsNode();
- itemList.add(new AttrFieldItem((SymbolNode) arrayNode.get(0)));
+ for(Object actObj : arrayNode.childNodes()) {
+ SymbolNode aktSymbol = (SymbolNode) actObj;
+ if(name.equals(aktSymbol.getName())) {
+ itemList.add(new AttrFieldItem(aktSymbol));
+ }
+ }
}
}
}
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.result.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.result.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.result.rb 2007-03-05 14:44:11 UTC (rev 2087)
@@ -0,0 +1,8 @@
+def methode
+ replace_br
+ replace(doc, 'img') {|img| img.attributes['alt'] || ""}
+end
+
+def replace_br
+ replace(doc, 'br') {|br| "\n"}
+end
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.source.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.source.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.source.rb 2007-03-05 14:44:11 UTC (rev 2087)
@@ -0,0 +1,4 @@
+def methode
+ replace(doc, 'br') {|br| "\n"}
+ replace(doc, 'img') {|img| img.attributes['alt'] || ""}
+end
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_28.test_properties 2007-03-05 14:44:11 UTC (rev 2087)
@@ -0,0 +1,4 @@
+start=14
+end=45
+name=replace_br
+visibility=none
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.activeFile.rb.result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.activeFile.rb.result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.activeFile.rb.result 2007-03-05 14:44:11 UTC (rev 2087)
@@ -0,0 +1,7 @@
+class Message
+ attr_reader :title, :content, :time, :id, :from
+
+ def initialize(params)
+ @content = strip_html params[:body] || params[:url] || ""
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.activeFile.rb.source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.activeFile.rb.source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.activeFile.rb.source 2007-03-05 14:44:11 UTC (rev 2087)
@@ -0,0 +1,7 @@
+class Message
+ attr_reader :title, :body, :time, :id, :from
+
+ def initialize(params)
+ @body = strip_html(params[:body] || params[:url] || "")
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_26.test_properties 2007-03-05 14:44:11 UTC (rev 2087)
@@ -0,0 +1,4 @@
+activeFile=activeFile.rb
+destinationFiles=
+caretPosition=95
+newName=content
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
