Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2094] trunk/org.rubypeople.rdt.refactoring/src/ org/rubypeople/rdt/refactoring
|
From: <cal...@us...> - 2007-03-06 13:48:11
|
Revision: 2094
http://svn.sourceforge.net/rubyeclipse/?rev=2094&view=rev
Author: callandor1983
Date: 2007-03-06 05:48:05 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
DocumentProvider problem solved
Modified Paths:
--------------
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/TempToFieldConverter.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/SelectedCallFinder.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/RenameFieldConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/DocumentProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/DocumentWithIncluding.java
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/TempToFieldConverter.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/TempToFieldConverter.java 2007-03-06 12:56:24 UTC (rev 2093)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/TempToFieldConverter.java 2007-03-06 13:48:05 UTC (rev 2094)
@@ -149,7 +149,7 @@
}
private Node findSelectedNode(Class<?>... filterNodes) {
- return SelectionNodeProvider.getSelectedNodeOfType(config.getDocProvider().getAllNodes(), config.getCaretPosition(), filterNodes);
+ return SelectionNodeProvider.getSelectedNodeOfType(config.getDocProvider().getActiveFileRootNode(), config.getCaretPosition(), filterNodes);
}
boolean isInitializationExternalizable() {
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/SelectedCallFinder.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/SelectedCallFinder.java 2007-03-06 12:56:24 UTC (rev 2093)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/SelectedCallFinder.java 2007-03-06 13:48:05 UTC (rev 2094)
@@ -40,7 +40,7 @@
public MethodCallNodeWrapper findSelectedCall(final int pos, final DocumentProvider doc) {
- final Node selectedNode = SelectionNodeProvider.getSelectedNodeOfType(doc.getAllNodes(), pos, CallNode.class, FCallNode.class, VCallNode.class);
+ final Node selectedNode = SelectionNodeProvider.getSelectedNodeOfType(doc.getActiveFileRootNode(), pos, CallNode.class, FCallNode.class, VCallNode.class);
return selectedNode != null ? new MethodCallNodeWrapper(selectedNode) : null;
}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/RenameFieldConditionChecker.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/RenameFieldConditionChecker.java 2007-03-06 12:56:24 UTC (rev 2093)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/RenameFieldConditionChecker.java 2007-03-06 13:48:05 UTC (rev 2094)
@@ -35,8 +35,10 @@
import org.jruby.ast.CallNode;
import org.jruby.ast.Node;
+import org.jruby.ast.RootNode;
import org.rubypeople.rdt.refactoring.classnodeprovider.ClassNodeProvider;
import org.rubypeople.rdt.refactoring.classnodeprovider.IncludedClassesProvider;
+import org.rubypeople.rdt.refactoring.core.NodeProvider;
import org.rubypeople.rdt.refactoring.core.RefactoringConditionChecker;
import org.rubypeople.rdt.refactoring.core.SelectionNodeProvider;
import org.rubypeople.rdt.refactoring.core.renamefield.fielditems.FieldCallItem;
@@ -53,6 +55,8 @@
private RenameFieldConfig config;
+ private RootNode rootNode;
+
public RenameFieldConditionChecker(RenameFieldConfig config) {
super(config.getDocProvider(), config);
}
@@ -61,7 +65,7 @@
this.config = (RenameFieldConfig) configObj;
config.setDocProvider(new DocumentWithIncluding(config.getDocProvider()));
- Node rootNode = config.getDocProvider().getActiveFileRootNode();
+ rootNode = config.getDocProvider().getActiveFileRootNode();
try {
ClassNodeWrapper enclosingClassNode = SelectionNodeProvider.getSelectedClassNode(rootNode, config.getCaretPosition());
@@ -102,7 +106,7 @@
private Collection<FieldItem> getInstVarAccesses() {
ArrayList<FieldItem> fieldCallNodes = new ArrayList<FieldItem>();
- Collection<Node> allNodes = config.getDocProvider().getAllNodes();
+ Collection<Node> allNodes = NodeProvider.getAllNodes(rootNode);
for (Node currentNode : allNodes) {
if (isPossibleCall(currentNode)) {
fieldCallNodes.add(new FieldCallItem((CallNode) currentNode));
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/DocumentProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/DocumentProvider.java 2007-03-06 12:56:24 UTC (rev 2093)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/DocumentProvider.java 2007-03-06 13:48:05 UTC (rev 2094)
@@ -30,6 +30,7 @@
package org.rubypeople.rdt.refactoring.documentprovider;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -67,7 +68,12 @@
}
public Collection<Node> getAllNodes() {
- return NodeProvider.getAllNodes(getActiveFileRootNode());
+ ArrayList<Node> allNodes = new ArrayList<Node>();
+
+ for(String currentFileName : getFileNames()){
+ allNodes.addAll(getAllNodes(currentFileName));
+ }
+ return allNodes;
}
public Collection<Node> getAllNodes(String fileName){
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/DocumentWithIncluding.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/DocumentWithIncluding.java 2007-03-06 12:56:24 UTC (rev 2093)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/DocumentWithIncluding.java 2007-03-06 13:48:05 UTC (rev 2094)
@@ -33,7 +33,6 @@
import java.util.HashSet;
import org.jruby.ast.FCallNode;
-import org.jruby.ast.Node;
import org.jruby.ast.RootNode;
import org.jruby.ast.StrNode;
import org.jruby.lexer.yacc.SyntaxException;
@@ -149,14 +148,4 @@
private boolean isStrNode(FCallNode node) {
return node.getArgsNode().childNodes().iterator().next() instanceof StrNode;
}
-
- @Override
- public Collection<Node> getAllNodes() {
- ArrayList<Node> allNodes = new ArrayList<Node>();
-
- for(String currentFileName : getFileNames()){
- allNodes.addAll(getAllNodes(currentFileName));
- }
- return allNodes;
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
