[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2450] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt/internal/core/search/indexing

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

Revision: 2450
          http://svn.sourceforge.net/rubyeclipse/?rev=2450&view=rev
Author:   cawilliams
Date:     2007-05-08 07:14:02 -0700 (Tue, 08 May 2007)

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


Modified Paths:
--------------
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexer.java
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexerRequestor.java

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexer.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexer.java	2007-05-08 14:13:35 UTC (rev 2449)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexer.java	2007-05-08 14:14:02 UTC (rev 2450)
@@ -61,7 +61,7 @@
 		char[] indexKey = TypeDeclarationPattern.createIndexKey(modifiers, name, packageName, enclosingTypeNames, secondary);
 		addIndexEntry(TYPE_DECL, indexKey);
 
-		if (superclass != null) {
+		if (superclass != null && !superclass.equals("Object")) {
 			addTypeReference(superclass);
 		}
 		// FIXME Add back in references to super type when we have SuperTypePattern!
@@ -77,7 +77,7 @@
 	
 	public void addFieldDeclaration(char[] typeName, char[] fieldName) {
 		addIndexEntry(FIELD_DECL, FieldPattern.createIndexKey(fieldName));
-		addTypeReference(typeName);
+		if (typeName != null) addTypeReference(typeName);
 	}
 	public void addFieldReference(char[] fieldName) {
 		addNameReference(fieldName);

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexerRequestor.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexerRequestor.java	2007-05-08 14:13:35 UTC (rev 2449)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexerRequestor.java	2007-05-08 14:14:02 UTC (rev 2450)
@@ -21,8 +21,7 @@
 	}
 
 	public void acceptFieldReference(String name, int offset) {
-		// TODO Auto-generated method stub
-
+		indexer.addFieldReference(name.toCharArray());
 	}
 
 	public void acceptImport(String value, int startOffset, int endOffset) {
@@ -35,7 +34,7 @@
 	}
 
 	public void acceptMixin(String string) {
-		// TODO Auto-generated method stub
+		indexer.addTypeReference(string.toCharArray());
 
 	}
 


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