From 22055aad20a038d1f7c8402cac29781a6e0234e6 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Fri, 21 May 2004 14:34:44 +0000
Subject: [PATCH] bug 63320 - Search does not consider working copies Added a
 check to turn off indexer timer thread, if number entered is <= 0

---
 .../core/search/indexing/SourceIndexer.java      |  6 ++++--
 core/org.eclipse.cdt.core/search/ChangeLog       |  4 ++++
 .../eclipse/cdt/core/search/SearchEngine.java    | 16 ++++++++++------
 .../core/search/matching/MatchLocator.java       |  5 +----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java
index 6d6f114d5ae..21e817ca452 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java
@@ -119,8 +119,10 @@ public class SourceIndexer extends AbstractIndexer {
 			// start timer
 			String timeOut = CCorePlugin.getDefault().getPluginPreferences().getString(CDT_INDEXER_TIMEOUT);
 			Integer timeOutValue = new Integer(timeOut);
-			requestor.setTimeout(timeOutValue.intValue());
-			requestor.startTimer();
+			if (timeOutValue.intValue() > 0) {
+				requestor.setTimeout(timeOutValue.intValue());
+				requestor.startTimer();
+			}
 			boolean retVal = parser.parse();
 			
 			if (!retVal)
diff --git a/core/org.eclipse.cdt.core/search/ChangeLog b/core/org.eclipse.cdt.core/search/ChangeLog
index 561b4933c35..df1b5ece016 100644
--- a/core/org.eclipse.cdt.core/search/ChangeLog
+++ b/core/org.eclipse.cdt.core/search/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-21 Bogdan Gheorghe
+	bug 63320 - Search does not consider working copies
+	Added a check to turn off indexer timer thread, if number entered is <= 0
+	
 2004-05-18 Andrew Niefer
 	bug 62651 - indexer job hangs if project deleted from workspace
 	When we discard jobs, we must downtick the indexing job as well.
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/SearchEngine.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/SearchEngine.java
index dc2e1ee7e5f..eb730faa004 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/SearchEngine.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/SearchEngine.java
@@ -18,6 +18,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 
 import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.model.IWorkingCopy;
@@ -229,12 +230,15 @@ public class SearchEngine implements ICSearchConstants{
 		IWorkingCopy[] results= new IWorkingCopy[length];
 		int index=0;
 
-		for (int i=0;i<length;i++){
-		  IWorkingCopy workingCopy = copies[i];
-		  if(scope.encloses(workingCopy.getPath().toOSString())){
-		  	results[index++]=workingCopy;
-		  }
-		}
+		try {
+			for (int i=0;i<length;i++){
+				IWorkingCopy workingCopy = copies[i];
+				if(scope.encloses(workingCopy.getPath().toOSString()) &&
+				  	 workingCopy.hasUnsavedChanges()){
+				  	results[index++]=workingCopy;
+				  }
+			}
+		} catch (CModelException e) {}
 		
 		System.arraycopy(results,0,results= new IWorkingCopy[index],0,index);
 		
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
index ea5a020e263..fdbfc15cfd6 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
@@ -343,9 +343,6 @@ public class MatchLocator implements IMatchLocator{
    
 	public void locateMatches( String [] paths, IWorkspace workspace, IWorkingCopy[] workingCopies ) throws InterruptedException{
 		
-		if (!(paths.length > 0))
-			return;
-		
 		matchStorage = new ArrayList();
 		workspaceRoot = (workspace != null) ? workspace.getRoot() : null;
 		
@@ -356,7 +353,7 @@ public class MatchLocator implements IMatchLocator{
 			
 			for( int i = 0; i < wcLength; i++ ){
 				IWorkingCopy workingCopy = workingCopies[ i ];
-				String path = workingCopy.getOriginalElement().getPath().toString();
+				String path = workingCopy.getOriginalElement().getPath().toString();	
 				wcPaths.put( path, workingCopy );
 				newPaths[ i ] = path;
 			}