Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2518] trunk/org.rubypeople.rdt.core
|
From: <caw...@us...> - 2007-05-22 17:26:25
|
Revision: 2518
http://svn.sourceforge.net/rubyeclipse/?rev=2518&view=rev
Author: cawilliams
Date: 2007-05-22 10:26:12 -0700 (Tue, 22 May 2007)
Log Message:
-----------
rename SourceParser to SourceElementParser
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/DeltaProcessor.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScript.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/AddFolderToIndex.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexAllProject.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexManager.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/InternalSearchDocument.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexer.java
trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/DeltaProcessor.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/DeltaProcessor.java 2007-05-22 17:25:42 UTC (rev 2517)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/DeltaProcessor.java 2007-05-22 17:26:12 UTC (rev 2518)
@@ -182,7 +182,7 @@
*/
public int overridenEventType = -1;
- private SourceParser sourceElementParserCache;
+ private SourceElementParser sourceElementParserCache;
public DeltaProcessor(DeltaProcessingState state, RubyModelManager manager) {
this.state = state;
@@ -1881,7 +1881,7 @@
}
}
- private SourceParser getSourceElementParser(Openable element) {
+ private SourceElementParser getSourceElementParser(Openable element) {
if (this.sourceElementParserCache == null)
this.sourceElementParserCache = this.manager.getIndexManager().getSourceElementParser(element.getRubyProject(), null/*requestor will be set by indexer*/);
return this.sourceElementParserCache;
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java 2007-05-22 17:25:42 UTC (rev 2517)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java 2007-05-22 17:26:12 UTC (rev 2518)
@@ -39,7 +39,7 @@
RubyParser parser = new RubyParser();
Node node = parser.parse(null, new CharArrayReader(contents));
RubyScriptStructureBuilder visitor = new RubyScriptStructureBuilder(this, unitInfo, newElements);
- SourceParser sp = new SourceParser(visitor);
+ SourceElementParser sp = new SourceElementParser(visitor);
if (node != null) node.accept(sp);
unitInfo.setIsStructureKnown(true);
} catch (SyntaxException e) {
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScript.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScript.java 2007-05-22 17:25:42 UTC (rev 2517)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScript.java 2007-05-22 17:26:12 UTC (rev 2518)
@@ -137,7 +137,7 @@
ast = parser.parse((IFile) getResource(), new CharArrayReader(contents));
lastGoodAST = ast;
ISourceElementRequestor requestor = new RubyScriptStructureBuilder(this, unitInfo, newElements);
- SourceParser sp = new SourceParser(requestor);
+ SourceElementParser sp = new SourceElementParser(requestor);
if (ast != null) ast.accept(sp);
unitInfo.setIsStructureKnown(true);
} catch (SyntaxException e) {
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/AddFolderToIndex.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/AddFolderToIndex.java 2007-05-22 17:25:42 UTC (rev 2517)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/AddFolderToIndex.java 2007-05-22 17:26:12 UTC (rev 2518)
@@ -19,7 +19,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.rubypeople.rdt.core.RubyCore;
-import org.rubypeople.rdt.internal.core.SourceParser;
+import org.rubypeople.rdt.internal.core.SourceElementParser;
import org.rubypeople.rdt.internal.core.index.Index;
import org.rubypeople.rdt.internal.core.search.processing.JobManager;
import org.rubypeople.rdt.internal.core.util.Util;
@@ -55,7 +55,7 @@
final IPath container = this.containerPath;
final IndexManager indexManager = this.manager;
- final SourceParser parser = indexManager.getSourceElementParser(RubyCore.create(this.project), null/*requestor will be set by indexer*/);
+ final SourceElementParser parser = indexManager.getSourceElementParser(RubyCore.create(this.project), null/*requestor will be set by indexer*/);
if (this.exclusionPatterns == null && this.inclusionPatterns == null) {
folder.accept(
new IResourceProxyVisitor() {
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexAllProject.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexAllProject.java 2007-05-22 17:25:42 UTC (rev 2517)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexAllProject.java 2007-05-22 17:26:12 UTC (rev 2518)
@@ -28,7 +28,7 @@
import org.rubypeople.rdt.internal.compiler.util.SimpleLookupTable;
import org.rubypeople.rdt.internal.core.LoadpathEntry;
import org.rubypeople.rdt.internal.core.RubyProject;
-import org.rubypeople.rdt.internal.core.SourceParser;
+import org.rubypeople.rdt.internal.core.SourceElementParser;
import org.rubypeople.rdt.internal.core.index.Index;
import org.rubypeople.rdt.internal.core.search.processing.JobManager;
import org.rubypeople.rdt.internal.core.util.Util;
@@ -181,7 +181,7 @@
}
}
- SourceParser parser = this.manager.getSourceElementParser(javaProject, null/*requestor will be set by indexer*/);
+ SourceElementParser parser = this.manager.getSourceElementParser(javaProject, null/*requestor will be set by indexer*/);
Object[] names = indexedFileNames.keyTable;
Object[] values = indexedFileNames.valueTable;
for (int i = 0, namesLength = names.length; i < namesLength; i++) {
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexManager.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexManager.java 2007-05-22 17:25:42 UTC (rev 2517)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/IndexManager.java 2007-05-22 17:26:12 UTC (rev 2518)
@@ -27,7 +27,7 @@
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.SourceParser;
+import org.rubypeople.rdt.internal.core.SourceElementParser;
import org.rubypeople.rdt.internal.core.index.DiskIndex;
import org.rubypeople.rdt.internal.core.index.Index;
import org.rubypeople.rdt.internal.core.search.BasicSearchEngine;
@@ -404,7 +404,7 @@
* Trigger addition of a resource to an index
* Note: the actual operation is performed in background
*/
- public void addSource(IFile resource, IPath containerPath, SourceParser parser) {
+ public void addSource(IFile resource, IPath containerPath, SourceElementParser parser) {
if (RubyCore.getPlugin() == null) return;
SearchParticipant participant = BasicSearchEngine.getDefaultSearchParticipant();
SearchDocument document = participant.getDocument(resource.getFullPath().toString());
@@ -492,9 +492,9 @@
writeSavedIndexNamesFile();
}
- public SourceParser getSourceElementParser(IRubyProject project, ISourceElementRequestor requestor) {
+ public SourceElementParser getSourceElementParser(IRubyProject project, ISourceElementRequestor requestor) {
// TODO take into account the project?
- return new SourceParser(requestor);
+ return new SourceElementParser(requestor);
}
public void indexLibrary(IPath path, IProject project) {
// requestingProject is no longer used to cancel jobs but leave it here just in case
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/InternalSearchDocument.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/InternalSearchDocument.java 2007-05-22 17:25:42 UTC (rev 2517)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/InternalSearchDocument.java 2007-05-22 17:26:12 UTC (rev 2518)
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.rubypeople.rdt.internal.core.search.indexing;
-import org.rubypeople.rdt.internal.core.SourceParser;
+import org.rubypeople.rdt.internal.core.SourceElementParser;
import org.rubypeople.rdt.internal.core.index.Index;
/**
@@ -19,7 +19,7 @@
public class InternalSearchDocument {
protected Index index;
private String containerRelativePath;
- public SourceParser parser;
+ public SourceElementParser parser;
/*
* Hidden by API SearchDocument subclass
*/
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-22 17:25:42 UTC (rev 2517)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/indexing/SourceIndexer.java 2007-05-22 17:26:12 UTC (rev 2518)
@@ -7,7 +7,7 @@
import org.rubypeople.rdt.core.RubyCore;
import org.rubypeople.rdt.core.search.SearchDocument;
import org.rubypeople.rdt.internal.core.RubyModelManager;
-import org.rubypeople.rdt.internal.core.SourceParser;
+import org.rubypeople.rdt.internal.core.SourceElementParser;
import org.rubypeople.rdt.internal.core.search.matching.ConstructorPattern;
import org.rubypeople.rdt.internal.core.search.matching.FieldPattern;
import org.rubypeople.rdt.internal.core.search.matching.MethodPattern;
@@ -27,7 +27,7 @@
// Create a new Parser
SourceIndexerRequestor requestor = new SourceIndexerRequestor(this);
String documentPath = this.document.getPath();
- SourceParser parser = ((InternalSearchDocument) this.document).parser;
+ SourceElementParser parser = ((InternalSearchDocument) this.document).parser;
if (parser == null) {
IPath path = new Path(documentPath);
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(path.segment(0));
Modified: trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java 2007-05-22 17:25:42 UTC (rev 2517)
+++ trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java 2007-05-22 17:26:12 UTC (rev 2518)
@@ -18,7 +18,7 @@
import org.rubypeople.rdt.internal.core.RubyScript;
import org.rubypeople.rdt.internal.core.RubyScriptElementInfo;
import org.rubypeople.rdt.internal.core.RubyScriptStructureBuilder;
-import org.rubypeople.rdt.internal.core.SourceParser;
+import org.rubypeople.rdt.internal.core.SourceElementParser;
import org.rubypeople.rdt.internal.core.parser.RdtWarnings;
import org.rubypeople.rdt.internal.core.parser.RubyParser;
@@ -107,7 +107,7 @@
RubyScriptElementInfo unitInfo = new RubyScriptElementInfo() ;
RubyScript script = new RubyScript(null, file, DefaultWorkingCopyOwner.PRIMARY ) ;
ISourceElementRequestor visitor = new RubyScriptStructureBuilder(script, unitInfo, elements);
- SourceParser sp = new SourceParser(visitor);
+ SourceElementParser sp = new SourceElementParser(visitor);
if (node != null) {
node.accept(sp);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
