Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2536] trunk/org.rubypeople.rdt.refactoring
|
From: <tc...@us...> - 2007-05-24 08:28:16
|
Revision: 2536
http://svn.sourceforge.net/rubyeclipse/?rev=2536&view=rev
Author: tcorbat
Date: 2007-05-24 01:28:12 -0700 (Thu, 24 May 2007)
Log Message:
-----------
Comment handling tested in refactorings.
Modified Paths:
--------------
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeFactory.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/FieldEncapsulator.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlineclass/ConstructorInliner.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/ParameterReplacer.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocal/SingleLocalVariableEdit.java
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/convertlocaltofield/temp_to_field_test_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/convertlocaltofield/temp_to_field_test_1.test_source
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/RefactoringTestCase.java
Added Paths:
-----------
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.result.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.source.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.result.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.source.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.activeFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.activeFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.result.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.source.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.activeFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.activeFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.includedFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.includedFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.activeFile.rb.result.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.activeFile.rb.source.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.includedFile.rb.result.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.includedFile.rb.source.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.activeFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.activeFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.includedFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.includedFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.activeFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.activeFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.dependantFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.dependantFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_comment_1.activeFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_comment_1.activeFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamefield/rename_field_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamelocal/rename_local_test_comment_1.result.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamelocal/rename_local_test_comment_1.source.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamelocal/rename_local_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_comment_1.activeFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_comment_1.activeFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_comment_1.includeFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_comment_1.includeFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemethod/rename_method_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_comment_1.activeFile.rb.result
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_comment_1.activeFile.rb.source
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renamemodule/rename_module_test_comment_1.test_properties
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/splitlocal/split_temp_test_comment_1.result.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/splitlocal/split_temp_test_comment_1.source.rb
trunk/org.rubypeople.rdt.refactoring.tests/resources/core/splitlocal/split_temp_test_comment_1.test_properties
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeFactory.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeFactory.java 2007-05-23 20:52:16 UTC (rev 2535)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeFactory.java 2007-05-24 08:28:12 UTC (rev 2536)
@@ -66,7 +66,6 @@
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.lexer.yacc.SourcePosition;
import org.jruby.parser.LocalStaticScope;
-import org.jruby.parser.ParserSupport;
import org.jruby.parser.StaticScope;
import org.jruby.runtime.Visibility;
import org.rubypeople.rdt.refactoring.nodewrapper.ArgsNodeWrapper;
@@ -76,8 +75,6 @@
public class NodeFactory {
- private static final ParserSupport parserSupport = new ParserSupport();
-
public static final SourcePosition pos = new SourcePosition();
public static final Node NULL_POSITION_NODE = new NewlineNode(pos, null);
@@ -319,10 +316,15 @@
return commentIncludingPos;
}
- public static Node createGetterSetter(String attrName, boolean isWriterMethod, VisibilityNodeWrapper.METHOD_VISIBILITY visibility) {
+ public static BlockNode createGetterSetter(String attrName, boolean isWriterMethod, VisibilityNodeWrapper.METHOD_VISIBILITY visibility){
+ return createGetterSetter(attrName, isWriterMethod, visibility, new ArrayList<CommentNode>());
+ }
+
+ public static BlockNode createGetterSetter(String attrName, boolean isWriterMethod, VisibilityNodeWrapper.METHOD_VISIBILITY visibility, Collection<CommentNode> comments) {
String methodName = attrName + ((isWriterMethod) ? "=" : ""); //$NON-NLS-1$ //$NON-NLS-2$
String[] args = (isWriterMethod) ? new String[] { attrName } : new String[] {};
DefnNode methodNode = createGetterSetterNode(isWriterMethod, methodName, attrName, args);
+ methodNode.addComments(comments);
BlockNode block = createBlockNode();
block.add(createNewLineNode(methodNode));
if (!visibility.equals(VisibilityNodeWrapper.METHOD_VISIBILITY.NONE))
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/FieldEncapsulator.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/FieldEncapsulator.java 2007-05-23 20:52:16 UTC (rev 2535)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/FieldEncapsulator.java 2007-05-24 08:28:12 UTC (rev 2536)
@@ -33,13 +33,17 @@
import java.util.ArrayList;
import java.util.Collection;
+import org.jruby.ast.BlockNode;
+import org.jruby.ast.CommentNode;
import org.jruby.ast.FCallNode;
import org.jruby.ast.Node;
+import org.jruby.lexer.yacc.SourcePosition;
import org.rubypeople.rdt.refactoring.core.NodeFactory;
import org.rubypeople.rdt.refactoring.editprovider.DeleteEditProvider;
import org.rubypeople.rdt.refactoring.editprovider.EditProvider;
import org.rubypeople.rdt.refactoring.editprovider.InsertEditProvider;
import org.rubypeople.rdt.refactoring.editprovider.MultiEditProvider;
+import org.rubypeople.rdt.refactoring.nodewrapper.AttrAccessorNodeWrapper;
import org.rubypeople.rdt.refactoring.nodewrapper.VisibilityNodeWrapper;
import org.rubypeople.rdt.refactoring.offsetprovider.AfterLastMethodInClassOffsetProvider;
import org.rubypeople.rdt.refactoring.offsetprovider.IOffsetProvider;
@@ -150,6 +154,41 @@
}
protected Node createGetterOrSetter(final boolean writer, final VisibilityNodeWrapper.METHOD_VISIBILITY visibility) {
- return NodeFactory.createGetterSetter(config.getFieldName(), writer, visibility);
+
+ Collection<CommentNode> comments = getAccessorComments(writer);
+
+ BlockNode getterAndSetter = NodeFactory.createGetterSetter(config.getFieldName(), writer, visibility, comments);
+
+ return getterAndSetter;
+ }
+
+ private Collection<CommentNode> getAccessorComments(boolean isSetter) {
+
+ ArrayList<CommentNode> matchingComments = new ArrayList<CommentNode>();
+ AttrAccessorNodeWrapper accessor = config.getSelectedAccessor();
+ if(accessor != null){
+ Collection<FCallNode> accessors = accessor.getAccessorNodes();
+
+ for(FCallNode currentAccessor : accessors){
+ if(isSetter && currentAccessor.getName().equals("attr_writer")){
+ matchingComments.addAll(currentAccessor.getComments());
+ }
+ else if(!isSetter && currentAccessor.getName().equals("attr_reader")){
+ matchingComments.addAll(currentAccessor.getComments());
+ }
+ else if(currentAccessor.getName().equals("attr_accessor")){
+ matchingComments.addAll(currentAccessor.getComments()); }
+ }
+
+ }
+ return resetCommentPositions(matchingComments);
+ }
+
+ private Collection<CommentNode> resetCommentPositions(ArrayList<CommentNode> comments) {
+ ArrayList<CommentNode> resettedComments = new ArrayList<CommentNode>();
+ for(CommentNode currentComment : comments){
+ resettedComments.add(new CommentNode(new SourcePosition("",-1,-1,-1,-1), currentComment.getContent()));
+ }
+ return resettedComments;
}
}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlineclass/ConstructorInliner.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlineclass/ConstructorInliner.java 2007-05-23 20:52:16 UTC (rev 2535)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlineclass/ConstructorInliner.java 2007-05-24 08:28:12 UTC (rev 2536)
@@ -32,6 +32,7 @@
import org.jruby.ast.MethodDefNode;
import org.jruby.ast.Node;
+import org.jruby.lexer.yacc.ISourcePosition;
import org.rubypeople.rdt.refactoring.core.NodeFactory;
import org.rubypeople.rdt.refactoring.editprovider.InsertEditProvider;
import org.rubypeople.rdt.refactoring.nodewrapper.MethodNodeWrapper;
@@ -56,9 +57,17 @@
protected Node getInsertNode(int offset, String document) {
MethodDefNode constructor = inlinedConstructor.getWrappedNode();
MethodDefNode inlinedConstructor = NodeFactory.createMethodNode(newName, constructor.getArgsNode(), constructor.getBodyNode());
+
+ ISourcePosition constructorPosition = constructor.getPosition();
+
+ inlinedConstructor.setPosition(constructorPosition);
+
+ inlinedConstructor.addComments(constructor.getComments());
+
return NodeFactory.createBlockNode(false, true, inlinedConstructor);
}
+
@Override
protected int getOffset(String document) {
BeforeFirstMethodInClassOffsetProvider offsetProvider = new BeforeFirstMethodInClassOffsetProvider(targetClass, document);
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/ParameterReplacer.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/ParameterReplacer.java 2007-05-23 20:52:16 UTC (rev 2535)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/ParameterReplacer.java 2007-05-24 08:28:12 UTC (rev 2536)
@@ -41,6 +41,7 @@
import org.jruby.ast.Node;
import org.jruby.ast.types.INameNode;
import org.jruby.ast.visitor.rewriter.ReWriteVisitor;
+import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.lexer.yacc.SourcePosition;
import org.rubypeople.rdt.refactoring.core.renamelocal.LocalVariableRenamer;
import org.rubypeople.rdt.refactoring.documentprovider.DocumentProvider;
@@ -48,6 +49,7 @@
import org.rubypeople.rdt.refactoring.documentprovider.StringDocumentProvider;
import org.rubypeople.rdt.refactoring.nodewrapper.MethodCallNodeWrapper;
import org.rubypeople.rdt.refactoring.util.FileHelper;
+import org.rubypeople.rdt.refactoring.util.NodeUtil;
public class ParameterReplacer implements IParameterReplacer {
@@ -84,9 +86,10 @@
}
MethodDefNode newDefinition = (MethodDefNode) ((NewlineNode) strDoc.getActiveFileRootNode().getBodyNode()).getNextNode();
+ ISourcePosition bodyPosition = NodeUtil.subPositionUnion(newDefinition.getBodyNode());
insert.append(strDoc.getActiveFileContent().substring(
- newDefinition.getBodyNode().getPosition().getStartOffset(),
- newDefinition.getBodyNode().getPosition().getEndOffset() + 1).trim());
+ bodyPosition.getStartOffset(),
+ bodyPosition.getEndOffset() + 1).trim());
return new StringDocumentProvider("subpart_of_" + doc.getActiveFileName(), insert.toString()); //$NON-NLS-1$
}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocal/SingleLocalVariableEdit.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocal/SingleLocalVariableEdit.java 2007-05-23 20:52:16 UTC (rev 2535)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocal/SingleLocalVariableEdit.java 2007-05-24 08:28:12 UTC (rev 2536)
@@ -49,7 +49,7 @@
@Override
public int getOffsetLength() {
- return node.getPosition().getEndOffset() - node.getPosition().getStartOffset();
+ return node.getPositionIncludingComments().getEndOffset() - node.getPositionIncludingComments().getStartOffset();
}
@Override
@@ -66,7 +66,7 @@
@Override
public int getOffset(String document) {
- return node.getPosition().getStartOffset();
+ return node.getPositionIncludingComments().getStartOffset();
}
public Node getNode() {
Modified: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/convertlocaltofield/temp_to_field_test_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/convertlocaltofield/temp_to_field_test_1.test_properties 2007-05-23 20:52:16 UTC (rev 2535)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/convertlocaltofield/temp_to_field_test_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -1,4 +1,4 @@
newName=i
isClassField=false
initPlace=TempToFieldConverter.INIT_IN_METHOD
-cursorPosition=51
\ No newline at end of file
+cursorPosition=43
\ No newline at end of file
Modified: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/convertlocaltofield/temp_to_field_test_1.test_source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/convertlocaltofield/temp_to_field_test_1.test_source 2007-05-23 20:52:16 UTC (rev 2535)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/convertlocaltofield/temp_to_field_test_1.test_source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -1,6 +1,6 @@
class A
- def m (arg1, arg2)
- i = 5
- i = arg1 + arg2
- end
+ def m (arg1, arg2)
+ i = 5
+ i = arg1 + arg2
+ end
end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1 @@
+cursorPosition=44
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,17 @@
+class X
+
+ #before accessor
+ #after accessor
+ def a
+ @a
+ end
+ public :a
+
+ #before accessor
+ #after accessor
+ def a= a
+ @a = a
+ end
+ public :a=
+
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_1.test_source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,4 @@
+class X
+ #before accessor
+ attr_accessor :a #after accessor
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1 @@
+cursorPosition=98
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,21 @@
+class X
+
+ def blub
+ @a
+ end
+
+ #comment before accessor
+ #comment after accessor
+ def a
+ @a
+ end
+ public :a
+
+ #comment before accessor
+ #comment after accessor
+ def a= a
+ @a = a
+ end
+ public :a=
+
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_2.test_source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,8 @@
+class X
+ #comment before accessor
+ attr_accessor :a #comment after accessor
+
+ def blub
+ @a
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1 @@
+cursorPosition=42
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,10 @@
+class X
+
+ #before accessor
+ #after accessor
+ def a
+ @a
+ end
+ public :a
+
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_3.test_source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,4 @@
+class X
+ #before accessor
+ attr_reader :a #after accessor
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1 @@
+cursorPosition=88
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,17 @@
+class X
+
+ #before reader
+ #after reader
+ def a
+ @a
+ end
+ public :a
+
+ #before writer
+ #after writer
+ def a= a
+ @a = a
+ end
+ public :a=
+
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_4.test_source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,6 @@
+class X
+ #before reader
+ attr_reader :a #after reader
+ #before writer
+ attr_writer :a #after writer
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,4 @@
+cursorPosition=40
+readerVisibility=public
+enableReaderGeneration=true
+
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,15 @@
+class X
+
+ def a
+ @a
+ end
+ public :a
+
+ #before writer
+ #after writer
+ def a= a
+ @a = a
+ end
+ public :a=
+
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/encapsulatefield/encapsulate_field_test_comment_5.test_source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,4 @@
+class X
+ #before writer
+ attr_writer :a #after writer
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.result.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.result.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.result.rb 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,3 @@
+Name = "Mirko"
+#before statement
+puts "Hello " + Name #behind statement
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.source.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.source.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.source.rb 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,2 @@
+#before statement
+puts "Hello " + "Mirko" #behind statement
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractconstant/extract_constant_test_comment_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,3 @@
+start=36
+end=38
+name=Name
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.result.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.result.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.result.rb 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,19 @@
+class Test
+ def methode
+ one, two, three, four, five = 1..5
+
+ extr(one, two)
+ puts three
+ puts four
+ puts five
+ end
+
+ def extr one, two
+ #before one
+ puts one #after one
+ #before two
+ puts two #after two
+ end
+ private :extr
+
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.source.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.source.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.source.rb 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,13 @@
+class Test
+ def methode
+ one, two, three, four, five = 1..5
+
+ #before one
+ puts one #after one
+ #before two
+ puts two #after two
+ puts three
+ puts four
+ puts five
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/extractmethod/extract_method_test_comment_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,8 @@
+start=89
+end=137
+name=extr
+visibility=private
+# the next two properties are optional
+#order=
+# the names are changed after the items are re-arranged
+names=one, two
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.activeFile.rb.result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.activeFile.rb.result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.activeFile.rb.result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,43 @@
+
+
+class Target
+ #before constructor
+ def source_initialize #after signature
+ @seven = 7
+ #before end
+ end #after end
+
+ def initialize
+ source_initialize
+ @source = self
+ end
+
+ def foo
+ @six = 6
+ p @six
+ end
+
+ def bar
+ @source.foo1
+ end
+ #before bar
+ def bar1 #behind bar name
+ @six1 = @seven
+ p @six1
+ end
+ def foo1
+ @six1 = 6
+ end
+
+end
+
+class InvalidTarget
+
+ def initialize
+ @var = 5
+ end
+
+ def foo
+ p @var
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.activeFile.rb.source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.activeFile.rb.source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.activeFile.rb.source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,47 @@
+#before source
+class Source #behind name
+
+ #before constructor
+ def initialize #after signature
+ @seven = 7
+ #before end
+ end #after end
+
+ #before bar
+ def bar #behind bar name
+ @six = @seven
+ p @six
+ end
+
+ def foo
+ @six = 6
+ end
+ #before end
+end #at end
+
+class Target
+ def initialize
+ @source = Source.new
+ end
+
+ def foo
+ @six = 6
+ p @six
+ end
+
+ def bar
+ @source.foo
+ end
+
+end
+
+class InvalidTarget
+
+ def initialize
+ @var = 5
+ end
+
+ def foo
+ p @var
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlineclass/inline_class_test_comment_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,5 @@
+activeFile=activeFile.rb
+requiredFiles=
+caretPosition=72
+targetClassFile=activeFile.rb
+targetClassPos=357
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,3 @@
+caretPosition=51
+replaceWithQuery=false
+newMethodName=
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,5 @@
+class Test
+ def foo param
+ p param
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinelocal/inline_temp_test_comment_1.test_source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,7 @@
+class Test
+ def foo param
+ #comment before temp
+ temp = param #comment after temp
+ p temp
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.result.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.result.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.result.rb 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,13 @@
+class X
+ def say_hello to
+ #before hello
+ puts "hello #{to}!" #after hello
+ end
+
+ def mirko
+ @x = X.new
+ name = "mirko"
+ #before hello
+ puts "hello #{name}!" #after hello
+ end
+end
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.source.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.source.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.source.rb 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,12 @@
+class X
+ def say_hello to
+ #before hello
+ puts "hello #{to}!" #after hello
+ end
+
+ def mirko
+ @x = X.new
+ name = "mirko"
+ @x.say_hello name
+ end
+end
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/inlinemethod/inline_method_test_comment_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1 @@
+pos=147
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,3 @@
+selectedClass=Count
+selectedPart=1
+checkedParts=1,2,3
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,15 @@
+class Count
+ def initialize
+ @i = 0;
+ end
+
+ def increment
+ @i = @i + 1
+ end
+
+ #comment method
+ def decrement
+ @i = @i - 1
+ end
+
+end
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergeclasspartsinfile/merge_class_parts_in_file_test_comment_1.test_source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,19 @@
+class Count
+ def initialize
+ @i = 0;
+ end
+end
+
+class Count
+ def increment
+ @i = @i + 1
+ end
+end
+
+#comment class
+class Count
+ #comment method
+ def decrement
+ @i = @i - 1
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.activeFile.rb.result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.activeFile.rb.result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.activeFile.rb.result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,16 @@
+require "includedFile.rb"
+
+
+class Tree
+ def initialize
+ @leafs = 100
+
+ end
+ def fade
+ @leafs = @leafs -1
+ end
+
+ def blossom
+ @leafs = @leafs + 1
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.activeFile.rb.source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.activeFile.rb.source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.activeFile.rb.source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,23 @@
+require "includedFile.rb"
+
+#comment class
+class Foo
+ #comment method
+ def bar z
+ @i = z
+ end
+end
+
+class Tree
+ def initialize
+ @leafs = 100
+
+ end
+ def fade
+ @leafs = @leafs -1
+ end
+
+ def blossom
+ @leafs = @leafs + 1
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.includedFile.rb.result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.includedFile.rb.result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.includedFile.rb.result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,15 @@
+class Foo
+ def initialize
+ @i = 1
+ end
+
+ def i
+ @i
+ end
+
+ #comment method
+ def bar z
+ @i = z
+ end
+
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.includedFile.rb.source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.includedFile.rb.source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.includedFile.rb.source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,9 @@
+class Foo
+ def initialize
+ @i = 1
+ end
+
+ def i
+ @i
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/mergewithexternalclassparts/merge_with_external_class_parts_comment_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,5 @@
+activeFile=activeFile.rb
+targetClass=Foo
+sourceClassPartNumber=1
+destinationFiles=includedFile.rb
+destinationPartNumbers=1
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.activeFile.rb.result.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.activeFile.rb.result.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.activeFile.rb.result.rb 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,43 @@
+require 'includedFile'
+
+class TestKlasse
+
+ def initialize
+ @field = ATargetClass.new
+ end
+
+
+ def five_plus arg
+ 5 + arg
+ end
+
+ def calculate
+ #comment before assignment
+ @field.var = five_plus 1 #comment after assignment
+ end
+
+ def use_var
+ #before use var
+ @field.var = @field.var + "." #after use var
+ end
+
+ #comment before reader
+ #comment after reader
+ def var
+ @field.var
+ end
+ public :var
+
+ #comment before writer
+ #comment after writer
+ def var= var
+ @field.var = var
+ end
+ public :var=
+
+end
+
+t = TestKlasse.new
+t.calculate
+#comment before usage
+puts t.var #comment after usage
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.activeFile.rb.source.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.activeFile.rb.source.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.activeFile.rb.source.rb 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,33 @@
+require 'includedFile'
+
+class TestKlasse
+
+ def initialize
+ @field = ATargetClass.new
+ end
+
+ #comment before writer
+ attr_writer :var #comment after writer
+ #comment before reader
+ attr_reader :var #comment after reader
+
+ def five_plus arg
+ 5 + arg
+ end
+
+ def calculate
+ #comment before assignment
+ @var = five_plus 1 #comment after assignment
+ end
+
+ def use_var
+ #before use var
+ @var += "." #after use var
+ end
+
+end
+
+t = TestKlasse.new
+t.calculate
+#comment before usage
+puts t.var #comment after usage
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.includedFile.rb.result.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.includedFile.rb.result.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.includedFile.rb.result.rb 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,8 @@
+class ATargetClass
+
+ attr_accessor :var
+
+ def test
+ "test"
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.includedFile.rb.source.rb
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.includedFile.rb.source.rb (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.includedFile.rb.source.rb 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,5 @@
+class ATargetClass
+ def test
+ "test"
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movefield/move_field_test_comment_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,5 @@
+activeFile=activeFile.rb
+destinationFiles=includedFile.rb
+caretPosition=139
+selectedClass=ATargetClass
+selectedReference=@field
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.activeFile.rb.result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.activeFile.rb.result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.activeFile.rb.result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,14 @@
+require 'includedFile.rb'
+
+class A
+ #before method definition
+ def moveMethod a #after signature
+ @x.moveMethod(a, self)
+ #before end of method
+ end #after method definition
+ private :moveMethod
+ def method
+ @x
+ moveMethod a
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.activeFile.rb.source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.activeFile.rb.source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.activeFile.rb.source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,17 @@
+require 'includedFile.rb'
+
+class A
+ #before method definition
+ def moveMethod a #after signature
+ #before call in method
+ method #after call in method
+ #before statement in method
+ puts 5 #after statement in method
+ #before end of method
+ end #after method definition
+ private :moveMethod
+ def method
+ @x
+ moveMethod a
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.includedFile.rb.result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.includedFile.rb.result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.includedFile.rb.result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,13 @@
+class B
+
+ #before method definition
+ def moveMethod a, a1 #after signature
+ #before call in method
+ a1.method #after call in method
+ #before statement in method
+ puts 5 #after statement in method
+ #before end of method
+ end #after method definition
+
+ #before end in target class
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.includedFile.rb.source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.includedFile.rb.source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.includedFile.rb.source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,3 @@
+class B
+#before end in target class
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/movemethod/move_method_test_comment_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,9 @@
+activeFile=activeFile.rb
+destinationFiles=includedFile.rb
+caretPosition=62
+selectedClass=B
+# true false value
+leaveDelegateMethod=true
+# Optional value
+selectedField=@x
+
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_properties 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,3 @@
+#Format: ClassName[, MethodName]
+selection0=X, method
+selection1=Y, method
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,31 @@
+class A < X
+
+ #before method a
+ def method a #after sig a
+ a #after a
+ #before end
+ end #at end
+
+end
+class B < X
+
+ #before method a
+ def method a #after sig a
+ a #after a
+ #before end
+ end #at end
+
+end
+class C < Y
+
+ #before method a,b
+ def method a, b #after sig b
+ a #after a
+ #before end
+ end #at end
+
+end
+class X
+end
+class Y
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/pushdown/push_down_test_comment_1.test_source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,20 @@
+class A < X
+end
+class B < X
+end
+class C < Y
+end
+class X
+ #before method a
+ def method a #after sig a
+ a #after a
+ #before end
+ end #at end
+end
+class Y
+ #before method a,b
+ def method a, b #after sig b
+ a #after a
+ #before end
+ end #at end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.activeFile.rb.result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.activeFile.rb.result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.activeFile.rb.result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,12 @@
+#before class Test
+class NewName #after Test name
+ def methode
+ end
+end
+
+#before subclass
+class Subclass < NewName #after subclassing Test
+end
+
+#before usage
+t = NewName.new #after usage
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.activeFile.rb.source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.activeFile.rb.source (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.activeFile.rb.source 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,12 @@
+#before class Test
+class Test #after Test name
+ def methode
+ end
+end
+
+#before subclass
+class Subclass < Test #after subclassing Test
+end
+
+#before usage
+t = Test.new #after usage
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.dependantFile.rb.result
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.dependantFile.rb.result (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.dependantFile.rb.result 2007-05-24 08:28:12 UTC (rev 2536)
@@ -0,0 +1,7 @@
+require 'activeFile.rb'
+
+#before Test extension
+class NewName #after Test
+ def methode
+ end
+end
\ No newline at end of file
Added: trunk/org.rubypeople.rdt.refactoring.tests/resources/core/renameclass/rename_class_test_comment_1.dependantFile.rb.source
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.t...
[truncated message content] |
