User Docs for indexer

Take out "Add to index menu item"

2 files changed, 4 insertions, 9 deletions

diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsIndexAll.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsIndexAll.java
index 1252cf38d87..26e83262d90 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsIndexAll.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsIndexAll.java
@@ -68,8 +68,6 @@ class CTagsIndexAll extends CTagsIndexRequest {
 		if (progressMonitor != null && progressMonitor.isCanceled()) return true;
 		if (!project.isAccessible()) return true; // nothing to do
 		
-		String test = this.indexPath.toOSString();
-		
 		IIndex index = indexer.getIndex(this.indexPath, true, /*reuse index file*/ true /*create if none*/);
 		if (index == null) return true;
 		ReadWriteMonitor monitor = indexer.getMonitorFor(index);
@@ -151,6 +149,9 @@ class CTagsIndexAll extends CTagsIndexRequest {
 			refs = cProj.getIncludeReferences();
 		} catch (CModelException e) {}
 		
+		//This project has no references, don't bother processing any further
+		if (refs.length == 0)
+			return;
 		
 		//Find common base for references
 		String[] pathString = new String[refs.length];
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
index 6f1caf7ae44..95bf90826e4 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
@@ -15,7 +15,6 @@ import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.internal.ui.IContextMenuConstants;
 import org.eclipse.cdt.internal.ui.actions.SelectionConverter;
 import org.eclipse.cdt.internal.ui.editor.OpenIncludeAction;
-import org.eclipse.cdt.internal.ui.search.actions.AddToIndexAction;
 import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup;
 import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup;
 import org.eclipse.cdt.ui.actions.RefactoringActionGroup;
@@ -78,8 +77,6 @@ public class MainActionGroup extends CViewActionGroup {
 	WorkingSetFilterActionGroup workingSetGroup;
 	CustomFiltersActionGroup fCustomFiltersActionGroup;	
 
-	AddToIndexAction addToIndexAction; 
-	
 	SelectionSearchGroup selectionSearchGroup;
 	RefactoringActionGroup refactoringActionGroup;
 
@@ -165,8 +162,7 @@ public class MainActionGroup extends CViewActionGroup {
 
 		selectionSearchGroup = new SelectionSearchGroup(getCView().getSite());
 		refactoringActionGroup = new RefactoringActionGroup(getCView().getSite(), null);	
-		
-		addToIndexAction = new AddToIndexAction(getCView().getSite());
+	
 	}
 
 	/**
@@ -205,8 +201,6 @@ public class MainActionGroup extends CViewActionGroup {
 		menu.add(new Separator());
 		buildGroup.fillContextMenu(menu);
 		menu.add(new Separator());
-		menu.add(addToIndexAction);
-		menu.add(new Separator());
 		refactorGroup.fillContextMenu(menu);
 		menu.add(new Separator());
 		importAction.selectionChanged(resources);