From f60b2f1bb14c3f0ea65f4891905b2d1a1500074e Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Mon, 6 Nov 2006 13:17:58 +0000
Subject: [PATCH] Delays traversal of project to indexer job

---
 .../core/pdom/indexer/fast/PDOMFastReindex.java       | 11 ++++++++---
 .../core/pdom/indexer/full/PDOMFullReindex.java       | 10 +++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastReindex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastReindex.java
index f3000b188f7..eac4e36cadb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastReindex.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastReindex.java
@@ -28,15 +28,20 @@ class PDOMFastReindex extends PDOMFastIndexerJob {
 	
 	public PDOMFastReindex(PDOMFastIndexer indexer) throws CoreException {
 		super(indexer);
-		collectSources(indexer.getProject(), fTUs, fTUs);
-		fFilesToIndex= fTUs.size()+1;
+		fFilesToIndex= 1;
 	}
 		
 	public void run(final IProgressMonitor monitor) {
 		try {
 			long start = System.currentTimeMillis();
-			setupIndexAndReaderFactory();
+			collectSources(indexer.getProject(), fTUs, fTUs);
+			fFilesToIndex= fTUs.size()+1;
+
+			if (fFilesToIndex == 1 || monitor.isCanceled()) {
+				return;
+			}
 			
+			setupIndexAndReaderFactory();
 			clearIndex(index);
 			registerTUsInReaderFactory(fTUs);
 			fFilesToIndex--;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/full/PDOMFullReindex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/full/PDOMFullReindex.java
index 78cb0bb4d10..81b788d8455 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/full/PDOMFullReindex.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/full/PDOMFullReindex.java
@@ -30,14 +30,18 @@ class PDOMFullReindex extends PDOMFullIndexerJob {
 
 	public PDOMFullReindex(PDOMFullIndexer indexer) throws CoreException {
 		super(indexer);
-		collectSources(indexer.getProject(), fTUs, fTUs);
-		fFilesToIndex= fTUs.size() + 1;
+		fFilesToIndex= 1;
 	}
 
 	public void run(final IProgressMonitor monitor) {
 		try {
-			System.out.println(this);
 			long start = System.currentTimeMillis();			
+			collectSources(indexer.getProject(), fTUs, fTUs);
+			fFilesToIndex= fTUs.size()+1;
+
+			if (fFilesToIndex == 1 || monitor.isCanceled()) {
+				return;
+			}
 
 			setupIndexAndReaderFactory();
 			clearIndex(index);