Fix for 67656: [Indexer] getting called twice after creating a project with a file system

5 files changed, 11 insertions, 4 deletions

diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 0eb94c101b7..bb0b6fca526 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-28 Bogdan Gheorghe
+	Fix for 67656: [Indexer] getting called twice after creating a project with a file system
+	* model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java
+
 2004-06-24 Alain Magloire
 
 	Fix for 68226
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java
index 85a67d5c5f6..54dbc31d7e9 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java
@@ -495,6 +495,9 @@ public class DeltaProcessor {
 				if (element != null) {
 					updateIndexAddResource(element, delta);
 					elementAdded(element, delta);
+					//If new project has been added, don't need to add the children 
+					//as the indexing job will do that for us
+					if (element.getElementType() == ICElement.C_PROJECT) return false;
 				}
 				return true;
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSearchPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSearchPreferencePage.java
index b7eede69768..a786063c65c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSearchPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSearchPreferencePage.java
@@ -105,7 +105,7 @@ public class CSearchPreferencePage extends PreferencePage
 			}
 		});
 	
-		fExternLinks = createComboBox(group,PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.EnableMarkerLinkType"),new String[]{PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.Visible"),PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.Invisible")},PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.Invisible")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		fExternLinks = createComboBox(group,PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.EnableMarkerLinkType"),new String[]{PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.Invisible")},PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.Invisible")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 		fExternLinks.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
index 646a4311175..3b2bf25bf25 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
@@ -264,6 +264,9 @@ public class CSearchResultPage extends AbstractTextSearchViewPage {
 		
 	private IFile getCanonicalFile(IFile originalFile){
 		
+		if (originalFile == null)
+			return null;
+		
 		File tempFile = originalFile.getRawLocation().toFile();
 		String canonicalPath = null;
 		try {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/NewSearchResultCollector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/NewSearchResultCollector.java
index 6a8966b42f6..c58f4d15112 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/NewSearchResultCollector.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/NewSearchResultCollector.java
@@ -100,9 +100,6 @@ public class NewSearchResultCollector extends BasicSearchResultCollector {
           		linksFile.createLink(externalMatchLocation,IResource.NONE,null);
           		int number = store.getInt(CSearchPage.EXTERNALMATCH_VISIBLE);
           		if (number==0){
-          			linksFile.setDerived(true);
-          		}
-          		else{
           			linksFile.setTeamPrivateMember(true);
           		}