[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2148] branches/search_engine/org.rubypeople.rdt. core/src/org/rubypeople/rdt/internal/core

[<caw...@us...>]

Revision: 2148
          http://svn.sourceforge.net/rubyeclipse/?rev=2148&view=rev
Author:   cawilliams
Date:     2007-03-13 11:18:56 -0700 (Tue, 13 Mar 2007)

Log Message:
-----------


Modified Paths:
--------------
    branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyProject.java
    branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/HandleFactory.java

Modified: branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyProject.java
===================================================================
--- branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyProject.java	2007-03-13 18:17:22 UTC (rev 2147)
+++ branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyProject.java	2007-03-13 18:18:56 UTC (rev 2148)
@@ -2208,10 +2208,10 @@
 	}
 
 	public ISourceFolderRoot getSourceFolderRoot(String string) {
-		return getPackageFragmentRoot0(RubyProject.canonicalizedPath(new Path(string)));
+		return getSourceFolderRoot0(RubyProject.canonicalizedPath(new Path(string)));
 	}
 
-	private ISourceFolderRoot getPackageFragmentRoot0(IPath path) {
+	public ISourceFolderRoot getSourceFolderRoot0(IPath path) {
 		return new ExternalSourceFolderRoot(path, this);
 	}
 
@@ -2431,7 +2431,7 @@
 				IPath path = new Path(rootPath);
 				RubyElement root;
 				if(path.isAbsolute()) {
-					root = (RubyElement) getPackageFragmentRoot0(path);
+					root = (RubyElement) getSourceFolderRoot0(path);
 				} else
 					root = (RubyElement)getSourceFolderRoot(path);
 				if (token != null && token.charAt(0) == JEM_SOURCE_FOLDER) {

Modified: branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/HandleFactory.java
===================================================================
--- branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/HandleFactory.java	2007-03-13 18:17:22 UTC (rev 2147)
+++ branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/HandleFactory.java	2007-03-13 18:18:56 UTC (rev 2148)
@@ -30,13 +30,13 @@
 import org.rubypeople.rdt.core.RubyCore;
 import org.rubypeople.rdt.core.RubyModelException;
 import org.rubypeople.rdt.core.search.IRubySearchScope;
+import org.rubypeople.rdt.internal.compiler.env.lookup.Scope;
 import org.rubypeople.rdt.internal.core.Openable;
 import org.rubypeople.rdt.internal.core.RubyModel;
 import org.rubypeople.rdt.internal.core.RubyModelManager;
 import org.rubypeople.rdt.internal.core.RubyProject;
 import org.rubypeople.rdt.internal.core.SourceFolderRoot;
 import org.rubypeople.rdt.internal.core.SourceRefElement;
-import org.rubypeople.rdt.internal.ti.Scope;
 
 import sun.reflect.generics.scope.ClassScope;
 import sun.reflect.generics.scope.MethodScope;
@@ -134,25 +134,25 @@
 			case Scope.CLASS_SCOPE :
 				IRubyElement parentElement = createElement(scope.parent, elementPosition, unit, existingElements, knownScopes);
 				switch (parentElement.getElementType()) {
-					case IRubyElement.COMPILATION_UNIT :
+					case IRubyElement.SCRIPT :
 						newElement = ((IRubyScript)parentElement).getType(new String(scope.enclosingSourceType().sourceName));
 						break;						
 					case IRubyElement.TYPE :
 						newElement = ((IType)parentElement).getType(new String(scope.enclosingSourceType().sourceName));
 						break;
 					case IRubyElement.FIELD :
-					case IRubyElement.INITIALIZER :
+//					case IRubyElement.INITIALIZER :
 					case IRubyElement.METHOD :
 					    IMember member = (IMember)parentElement;
-					    if (member.isBinary()) {
-					        return null;
-					    } else {
+//					    if (member.isBinary()) {
+//					        return null;
+//					    } else {
 							newElement = member.getType(new String(scope.enclosingSourceType().sourceName), 1);
 							// increment occurrence count if collision is detected
 							if (newElement != null) {
 								while (!existingElements.add(newElement)) ((SourceRefElement)newElement).occurrenceCount++;
 							}
-					    }
+//					    }
 						break;						
 				}
 				if (newElement != null) {


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