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

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

Revision: 2314
          http://svn.sourceforge.net/rubyeclipse/?rev=2314&view=rev
Author:   cawilliams
Date:     2007-04-13 13:10:32 -0700 (Fri, 13 Apr 2007)

Log Message:
-----------
hey, external libraries are working now too!

Modified Paths:
--------------
    branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/RubySearchDocument.java
    branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/AddExternalFolderToIndex.java
    branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexerRequestor.java

Modified: branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/RubySearchDocument.java
===================================================================
--- branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/RubySearchDocument.java	2007-04-13 19:36:06 UTC (rev 2313)
+++ branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/RubySearchDocument.java	2007-04-13 20:10:32 UTC (rev 2314)
@@ -17,6 +17,11 @@
 	public RubySearchDocument(String documentPath, SearchParticipant participant) {
 		super(documentPath, participant);
 	}
+	
+	public RubySearchDocument(String documentPath, char[] contents, SearchParticipant participant) {
+		this(documentPath, participant);
+		this.charContents = contents;
+	}
 
 	@Override
 	public char[] getCharContents() {

Modified: branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/AddExternalFolderToIndex.java
===================================================================
--- branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/AddExternalFolderToIndex.java	2007-04-13 19:36:06 UTC (rev 2313)
+++ branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/AddExternalFolderToIndex.java	2007-04-13 20:10:32 UTC (rev 2314)
@@ -1,7 +1,9 @@
 package org.rubypeople.rdt.internal.core.search.indexing;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -135,7 +137,9 @@
 					}
 					String name = children[i].getName();
 					if (Util.isRubyLikeFileName(name)) {
-						RubySearchDocument entryDocument = new RubySearchDocument(children[i].getAbsolutePath(), participant);
+						InputStream stream = new FileInputStream(children[i]);
+						char[] contents = Util.getInputStreamAsCharArray(stream, -1, null);
+						RubySearchDocument entryDocument = new RubySearchDocument(children[i].getAbsolutePath(), contents, participant);
 						this.manager.indexDocument(entryDocument, participant, index, this.containerPath);
 					}
 				}

Modified: branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexerRequestor.java
===================================================================
--- branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexerRequestor.java	2007-04-13 19:36:06 UTC (rev 2313)
+++ branches/search_engine/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexerRequestor.java	2007-04-13 20:10:32 UTC (rev 2314)
@@ -74,7 +74,11 @@
 			mod[i] = modules[i].toCharArray();
 		}
 		char[] packName = new char[0];
-		indexer.addClassDeclaration(type.isModule ? Flags.AccModule : 0, type.name.toCharArray(), packName, null, type.superclass.toCharArray(), mod, type.secondary);
+		char[] superclass = new char[0];
+		if (type.superclass != null) {
+			superclass = type.superclass.toCharArray();
+		}
+		indexer.addClassDeclaration(type.isModule ? Flags.AccModule : 0, type.name.toCharArray(), packName, null, superclass, mod, type.secondary);
 	}
 
 	public void exitConstructor(int endOffset) {


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