mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

2005-08-12 Chris Wiebe

Browse source 
Fix PR 106577: NPE in CTags Indexer
	* index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsFileReader.java
	* index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsIndexAll.java
This commit is contained in:
Chris Wiebe 2005-08-12 19:09:10 +00:00
parent fdc0a1e7ed
commit 565769ca30
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/org.eclipse.cdt.core/ChangeLog
View file

@ -1,3 +1,8 @@
2005-08-12 Chris Wiebe
Fix PR 106577: NPE in CTags Indexer
* index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsFileReader.java
* index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsIndexAll.java
2005-08-12 Chris Wiebe 2005-08-12 Chris Wiebe
Fix PR 106778: IndexerTypesJob2 painfully slow Fix PR 106778: IndexerTypesJob2 painfully slow
* browser/org/eclipse/cdt/internal/core/browser/cache/IndexerTypesJob2.java * browser/org/eclipse/cdt/internal/core/browser/cache/IndexerTypesJob2.java

6
core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsFileReader.java
View file

@ -98,7 +98,11 @@ public class CTagsFileReader {
indexer = new MiniIndexer(currentFile.getFullPath()); indexer = new MiniIndexer(currentFile.getFullPath());
index.add(currentFile,indexer); index.add(currentFile,indexer);
} else { } else {
indexer = new MiniIndexer(rootDirectory.append(fileName)); IPath filePath = new Path(fileName);
if (!filePath.isAbsolute()) {
filePath = rootDirectory.append(fileName);
}
indexer = new MiniIndexer(filePath);
try { try {
IResource[] resources = project.members(); IResource[] resources = project.members();
IFile tempFile=null; IFile tempFile=null;

1
core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsIndexAll.java
View file

@ -111,6 +111,7 @@ class CTagsIndexAll extends CTagsIndexRequest {
//Parse the CTag File //Parse the CTag File
CTagsFileReader reader = new CTagsFileReader(project,ctagsFileToUse,indexer); CTagsFileReader reader = new CTagsFileReader(project,ctagsFileToUse,indexer);
reader.setIndex(index); reader.setIndex(index);
reader.setRootDirectory(project.getLocation());
reader.parse(); reader.parse();
// request to save index when all cus have been indexed // request to save index when all cus have been indexed