Bug 426675: fix "index update with modified files" for a sub-directory

Change-Id: I3dad716cd11a464c97ee35fdabb8b9762238ccf3
Signed-off-by: Wei Li <wei.r.li@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/34434
Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexAction.java

@@ -44,13 +44,13 @@ public abstract class AbstractUpdateIndexAction implements IObjectActionDelegate
 		if(!(fSelection instanceof IStructuredSelection) && !(fSelection instanceof ITextSelection)) {
 			return;
 		}
-		ICProject[] projects = getSelectedCProjects();
+		ICElement[] elements = getSelectedCElements();
-		doRun(projects);
+		doRun(elements);
 	}
 
-	protected void doRun(ICProject[] projects) {
+	protected void doRun(ICElement[] elements) {
 		try {
-			CCorePlugin.getIndexManager().update(projects, getUpdateOptions());
+			CCorePlugin.getIndexManager().update(elements, getUpdateOptions());
 		} catch (CoreException e) {
 			CUIPlugin.log(e);
 		}
@@ -70,20 +70,20 @@ public abstract class AbstractUpdateIndexAction implements IObjectActionDelegate
 	
 	public boolean isEnabledFor(ISelection selection) {
 		selectionChanged(null, selection);
-		ICProject[] project = getSelectedCProjects();
+		ICElement[] elements = getSelectedCElements();
-		return project.length > 0;
+		return elements.length > 0;
 	}
 	
-	protected ICProject[] getSelectedCProjects() {
+	protected ICElement[] getSelectedCElements() {
-		ArrayList<ICProject> tuSelection= new ArrayList<ICProject>();
+		ArrayList<ICElement> tuSelection= new ArrayList<ICElement>();
 		if(fSelection instanceof IStructuredSelection) {
 			IStructuredSelection resources = SelectionConverter.convertSelectionToResources(fSelection);
 			for (Iterator<?> i= resources.iterator(); i.hasNext();) {
 				Object o= i.next();
 				if(o instanceof IResource) {
-					ICProject cproject= CCorePlugin.getDefault().getCoreModel().create(((IResource)o).getProject());
+					ICElement celement= CCorePlugin.getDefault().getCoreModel().create((IResource)o);
-					if(cproject != null) {
+					if(celement != null) {
-						tuSelection.add(cproject);
+						tuSelection.add(celement);
 					}
 				}
 			}
@@ -96,6 +96,6 @@ public abstract class AbstractUpdateIndexAction implements IObjectActionDelegate
 				}
 			}
 		}
-		return tuSelection.toArray(new ICProject[tuSelection.size()]);
+		return tuSelection.toArray(new ICElement[tuSelection.size()]);
 	}
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RebuildIndexAction.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2014 Wind River Systems, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,21 +7,29 @@
  *
  * Contributors:
  *     Markus Schorn - initial API and implementation
+ *     Sergey Prigogin (Google)
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.actions;
 
+import java.util.LinkedHashSet;
+import java.util.Set;
+
 import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ICProject;
 
 public class RebuildIndexAction extends AbstractUpdateIndexAction {
-	
 	@Override
-	protected void doRun(ICProject[] projects) {
+	protected void doRun(ICElement[] elements) {
-		for (ICProject proj : projects) {
+		Set<ICProject> projects = new LinkedHashSet<>();
-			if(proj != null) {
+		for (ICElement element : elements) {
-				CCorePlugin.getIndexManager().reindex(proj);
+			if (element != null) {
+				projects.add(element.getCProject());
 			}
 		}
+		for (ICProject project : projects) {
+			CCorePlugin.getIndexManager().reindex(project);
+		}
 	}
 
 	@Override

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindUnresolvedIncludesProjectAction.java

@@ -16,7 +16,7 @@ import org.eclipse.search.ui.NewSearchUI;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchSite;
 
-import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.model.ICElement;
 
 import org.eclipse.cdt.internal.ui.actions.AbstractUpdateIndexAction;
 import org.eclipse.cdt.internal.ui.search.CSearchMessages;
@@ -34,13 +34,13 @@ public class FindUnresolvedIncludesProjectAction extends AbstractUpdateIndexActi
 	}
 
 	@Override
-	protected void doRun(ICProject[] projects) {
+	protected void doRun(ICElement[] elements) {
-		if (projects.length == 0) {
+		if (elements.length == 0) {
 			StatusLineHandler.showStatusLineMessage(fSite, CSearchMessages.CSearchOperation_operationUnavailable_message);
 	 		return;
 	 	}
 
-	 	ISearchQuery searchJob= new CSearchUnresolvedIncludesQuery(projects);
+	 	ISearchQuery searchJob= new CSearchUnresolvedIncludesQuery(elements);
 
 		StatusLineHandler.clearStatusLine(fSite);
 		NewSearchUI.activateSearchResultView();