Fix for 62366 allow to resume indexing after it was cancelled.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexManager.java

@@ -13,6 +13,7 @@ package org.eclipse.cdt.core.index;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.IPDOMManager;
+import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -59,6 +60,18 @@ public interface IIndexManager extends IPDOMManager {
 	 * @see IIndexManager#joinIndexer(int, IProgressMonitor)
 	 */
 	public final static int FOREVER= -1;
+	
+	/**
+	 * Constant for indicating to update all translation units.
+	 */
+	public final static int UPDATE_ALL= 0x1;
+
+	/**
+	 * Constant for indicating to update translation units only if their timestamp
+	 * has changed.
+	 */
+	public final static int UPDATE_CHECK_TIMESTAMPS= 0x2;
+	
 	/**
 	 * Returns the index for the given project.
 	 * @param project the project to get the index for
@@ -156,6 +169,19 @@ public interface IIndexManager extends IPDOMManager {
 	 */
 	public void reindex(ICProject project) throws CoreException;
 
+	/**
+	 * Updates the index for the given selection of translation units considering
+	 * the options supplied. The selection is defined by an array of translation
+	 * units, containers and projects. For containers and projects all recursively
+	 * nested translation units are considered.
+	 * Valid options are {@link #UPDATE_ALL} and {@link #UPDATE_CHECK_TIMESTAMPS}
+	 * @param tuSelection the translation units to update.
+	 * @param options one of {@link #UPDATE_ALL} or {@link #UPDATE_CHECK_TIMESTAMPS}.
+	 * @throws CoreException
+	 * @since 4.0
+	 */
+	public void update(ICElement[] tuSelection, int options) throws CoreException;
+	
 	/**
 	 * Export index for usage within a team.
 	 * @param project a project for which the pdom is to be exported.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/LanguageMappingChangeListener.java

@@ -7,20 +7,19 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Markus Schorn (Wind River Systems)
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.pdom;
 
 import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.index.IIndexManager;
 import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.ICElementDelta;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.model.ILanguageMappingChangeEvent;
 import org.eclipse.cdt.core.model.ILanguageMappingChangeListener;
-import org.eclipse.cdt.internal.core.model.CElementDelta;
 import org.eclipse.cdt.internal.core.model.CModelManager;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 
 /**
@@ -32,9 +31,9 @@ import org.eclipse.core.runtime.CoreException;
 public class LanguageMappingChangeListener implements
 		ILanguageMappingChangeListener {
 
-	private PDOMManager fManager;
+	private IIndexManager fManager;
 	
-	public LanguageMappingChangeListener(PDOMManager manager) {
+	public LanguageMappingChangeListener(IIndexManager manager) {
 		fManager = manager;
 	}
 	
@@ -43,35 +42,18 @@ public class LanguageMappingChangeListener implements
 	 * @see org.eclipse.cdt.core.model.ILanguageMappingChangeListener#handleLanguageMappingChangeEvent(org.eclipse.cdt.core.model.ILanguageMappingsChangeEvent)
 	 */
 	public void handleLanguageMappingChangeEvent(ILanguageMappingChangeEvent event) {
-		IProject project = event.getProject();
-		
 		CModelManager manager = CModelManager.getDefault();
-		if(project != null) {
-			ICProject cProject = manager.getCModel().findCProject(project);
-			
-			if(cProject != null)
-				try {
-					fManager.reindex(cProject);
-				} catch (CoreException e) {
-					CCorePlugin.log(e);
-				}
-		}
-		
 		if (event.getType() == ILanguageMappingChangeEvent.TYPE_WORKSPACE) {
 			// For now reindex all projects.
 			// TODO: This should be smarter about figuring out which projects
 			// are potentially unaffected due to project settings
 			try {
 				ICProject[] cProjects = manager.getCModel().getCProjects();
-				for(int k = 0; k < cProjects.length; k++) {
-					try {
-						fManager.reindex(cProjects[k]);
-					} catch (CoreException e) {
-						CCorePlugin.log(e);
-					}
-				}
+				fManager.update(cProjects, IIndexManager.UPDATE_ALL);
 			} catch (CModelException e) {
 				CCorePlugin.log(e);
+			} catch (CoreException e) {
+				CCorePlugin.log(e);
 			}
 		} else if (event.getType() == ILanguageMappingChangeEvent.TYPE_PROJECT) {
 			// For now, reindex the entire project since we don't know which
@@ -89,10 +71,8 @@ public class LanguageMappingChangeListener implements
 			IFile file = event.getFile();
 			ICProject cProject = manager.getCModel().getCProject(file);
 			ICElement element = manager.create(file, cProject);
-			CElementDelta delta = new CElementDelta(element);
-			delta.changed(element, ICElementDelta.F_CONTENT);
 			try {
-				fManager.changeProject(cProject, delta);
+				fManager.update(new ICElement[] {element}, IIndexManager.UPDATE_ALL);
 			} catch (CoreException e) {
 				CCorePlugin.log(e);
 			}

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java

@@ -20,9 +20,11 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.channels.FileChannel;
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -37,10 +39,13 @@ import org.eclipse.cdt.core.index.IIndexChangeListener;
 import org.eclipse.cdt.core.index.IIndexLocationConverter;
 import org.eclipse.cdt.core.index.IIndexerStateListener;
 import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.ICContainer;
+import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ICElementDelta;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.model.IElementChangedListener;
 import org.eclipse.cdt.core.model.ILanguageMappingChangeListener;
+import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.core.model.LanguageManager;
 import org.eclipse.cdt.internal.core.CCoreInternals;
 import org.eclipse.cdt.internal.core.index.IIndexFragment;
@@ -1049,4 +1054,89 @@ public class PDOMManager implements IWritableIndexManager, IListener {
 	public boolean isProjectIndexed(ICProject proj) {
 		return !IPDOMManager.ID_NO_INDEXER.equals(getIndexerId(proj));
 	}
+
+	public void update(ICElement[] tuSelection, int options) throws CoreException {
+		Map projectsToElements= splitSelection(tuSelection);
+		for (Iterator i = projectsToElements.entrySet().iterator(); i
+				.hasNext();) {
+			Map.Entry entry = (Map.Entry) i.next();
+			ICProject project = (ICProject) entry.getKey();
+			List filesAndFolders = (List) entry.getValue();
+			
+			update(project, filesAndFolders, options);
+		}
+	}
+
+	/**
+	 * computes a map from projects to a collection containing the minimal
+	 * set of folders and files specifying the selection.
+	 */
+	private Map splitSelection(ICElement[] tuSelection) {
+		HashMap result= new HashMap();
+		allElements: for (int i = 0; i < tuSelection.length; i++) {
+			ICElement element = tuSelection[i];
+			if (element instanceof ICProject || element instanceof ICContainer || element instanceof ITranslationUnit) {
+				ICProject project= element.getCProject();
+				ArrayList set= (ArrayList) result.get(project);
+				if (set == null) {
+					set= new ArrayList();
+					result.put(project, set);
+				}
+				for (int j= 0; j<set.size(); j++) {
+					ICElement other= (ICElement) set.get(j);
+					if (contains(other, element)) {
+						continue allElements;
+					}
+					else if (contains(element, other)) {
+						set.set(j, element);
+						continue allElements;
+					}					
+				}
+				set.add(element);
+			}
+		}
+		return result;
+	}
+	
+	private boolean contains(final ICElement a, ICElement b) {
+		if (a.equals(b)) {
+			return true;
+		}
+		b= b.getParent();
+		if (b == null) {
+			return false;
+		}
+		return contains(a, b);
+	}
+
+	private void update(ICProject project, List filesAndFolders, int options) throws CoreException {
+		boolean all= false;
+		boolean timestamps= false;
+		if ((options & UPDATE_ALL) != 0) {
+			all= true;
+		}
+		else if ((options & UPDATE_CHECK_TIMESTAMPS) != 0) {
+			timestamps= true;
+		}
+		else {
+			throw new IllegalArgumentException();
+		}
+			
+		if (all && filesAndFolders.size() == 1 && project.equals(filesAndFolders.get(0))) {
+			reindex(project);
+		}
+		else {
+			assert !Thread.holdsLock(fProjectToPDOM);
+			synchronized (fIndexerMutex) {
+				IPDOMIndexer indexer= getIndexer(project);
+				PDOMUpdateTask task= new PDOMUpdateTask(indexer);
+				task.setCheckTimestamps(timestamps);
+				task.setTranslationUnitSelection(filesAndFolders);
+				if (indexer != null) {
+					enqueue(task);
+				}
+			}
+		}
+	}
+
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java

@@ -65,7 +65,6 @@ public abstract class PDOMIndexerTask extends PDOMWriter implements IPDOMIndexer
 	
 	private AbstractPDOMIndexer fIndexer;
 	protected Map/*<IIndexFileLocation, Object>*/ fContextMap = new HashMap/*<IIndexFileLocation, Object>*/();
-	private boolean fCheckTimestamps= false;
 	private List fFilesUpFront= new ArrayList();
 	private String fDummyFileName;
 	private URI fDummyFileURI;
@@ -94,10 +93,8 @@ public abstract class PDOMIndexerTask extends PDOMWriter implements IPDOMIndexer
 		return super.getProgressInformation();
 	}
 	
-	final public void setCheckTimestamps(boolean val) {
-		fCheckTimestamps= val;
-	}
-	
+	abstract public void setCheckTimestamps(boolean val);
+		
 	final public void setParseUpFront() {
 		fFilesUpFront.addAll(Arrays.asList(fIndexer.getFilesToParseUpFront()));
 	}
@@ -182,10 +179,7 @@ public abstract class PDOMIndexerTask extends PDOMWriter implements IPDOMIndexer
 				return;
 			ITranslationUnit tu = (ITranslationUnit) iter.next();
 			final IIndexFileLocation ifl = IndexLocationFactory.getIFL(tu);
-			if (fCheckTimestamps && !isOutdated(tu, ifl, index)) {
-				updateInfo(0,0,-1);
-			}
-			else if (needToUpdate(ifl)) {
+			if (needToUpdate(ifl)) {
 				parseTU(tu, options, index, readlockCount, monitor);
 			}
 		}
@@ -196,11 +190,7 @@ public abstract class PDOMIndexerTask extends PDOMWriter implements IPDOMIndexer
 				return;
 			ITranslationUnit tu = (ITranslationUnit) iter.next();
 			IIndexFileLocation location = IndexLocationFactory.getIFL(tu);
-			if (fCheckTimestamps && !isOutdated(tu, location, index)) {
-				updateInfo(0,0,-1);
-				iter.remove();
-			}
-			else if (!needToUpdate(location)) {
+			if (!needToUpdate(location)) {
 				iter.remove();
 			} 
 			else {
@@ -218,11 +208,7 @@ public abstract class PDOMIndexerTask extends PDOMWriter implements IPDOMIndexer
 					return;
 				ITranslationUnit tu = (ITranslationUnit) iter.next();
 				final IIndexFileLocation ifl = IndexLocationFactory.getIFL(tu);
-				if (fCheckTimestamps && !isOutdated(tu, ifl, index)) {
-					updateInfo(0,0,-1);
-					iter.remove();
-				} 
-				else if (!needToUpdate(ifl)) {
+				if (!needToUpdate(ifl)) {
 					iter.remove();
 				}
 				else {
@@ -232,11 +218,16 @@ public abstract class PDOMIndexerTask extends PDOMWriter implements IPDOMIndexer
 		}
 	}
 	
-	private boolean isOutdated(ITranslationUnit tu, IIndexFileLocation ifl, IIndex index) throws CoreException {
+	/**
+	 * Convinience method to check whether a translation unit in the index is outdated
+	 * with respect to its timestamp.
+	 * @throws CoreException
+	 * @since 4.0
+	 */
+	final protected boolean isOutdated(ITranslationUnit tu, IIndexFile indexFile) throws CoreException {
 		boolean outofdate= true;
 		IResource res= tu.getResource();
 		if (res != null) {
-			IIndexFile indexFile= index.getFile(ifl);
 			if (indexFile != null) {
 				if (res.getLocalTimeStamp() == indexFile.getTimestamp()) {
 					outofdate= false;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java

@@ -12,12 +12,15 @@
 package org.eclipse.cdt.internal.core.pdom.indexer;
 
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.IPDOMIndexer;
 import org.eclipse.cdt.core.dom.IPDOMIndexerTask;
 import org.eclipse.cdt.core.dom.IPDOMManager;
+import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.internal.core.pdom.IndexerProgress;
@@ -32,6 +35,8 @@ public class PDOMUpdateTask implements IPDOMIndexerTask {
 	private final IPDOMIndexer fIndexer;
 	private final IndexerProgress fProgress;
 	private volatile IPDOMIndexerTask fDelegate;
+	private boolean fCheckTimestamps= true;
+	private ArrayList fFilesAndFolders= null;
 
 	public PDOMUpdateTask(IPDOMIndexer indexer) {
 		fIndexer= indexer;
@@ -70,13 +75,21 @@ public class PDOMUpdateTask implements IPDOMIndexerTask {
 	
 	private synchronized void createDelegate(ICProject project, IProgressMonitor monitor) throws CoreException {
 		boolean allFiles= TRUE.equals(fIndexer.getProperty(IndexerPreferences.KEY_INDEX_ALL_FILES));
-		List list= new ArrayList();
-		TranslationUnitCollector collector= new TranslationUnitCollector(list, list, allFiles, monitor);
-		project.accept(collector);
-		ITranslationUnit[] tus= (ITranslationUnit[]) list.toArray(new ITranslationUnit[list.size()]);
+		HashSet set= new HashSet();
+		TranslationUnitCollector collector= new TranslationUnitCollector(set, set, allFiles, monitor);
+		if (fFilesAndFolders == null) {
+			project.accept(collector);
+		}
+		else {
+			for (Iterator iterator = fFilesAndFolders.iterator(); iterator.hasNext();) {
+				ICElement elem = (ICElement) iterator.next();
+				elem.accept(collector);
+			}
+		}
+		ITranslationUnit[] tus= (ITranslationUnit[]) set.toArray(new ITranslationUnit[set.size()]);
 		fDelegate= fIndexer.createTask(tus, NO_TUS, NO_TUS);
 		if (fDelegate instanceof PDOMIndexerTask) {
-			((PDOMIndexerTask) fDelegate).setCheckTimestamps(true);
+			((PDOMIndexerTask) fDelegate).setCheckTimestamps(fCheckTimestamps);
 		}
 	}
 
@@ -84,4 +97,13 @@ public class PDOMUpdateTask implements IPDOMIndexerTask {
 	public synchronized IndexerProgress getProgressInformation() {
 		return fDelegate != null ? fDelegate.getProgressInformation() : fProgress;
 	}
+
+	public void setCheckTimestamps(boolean timestamps) {
+		fCheckTimestamps= timestamps;
+	}
+
+	public void setTranslationUnitSelection(List filesAndFolders) {
+		fFilesAndFolders= new ArrayList(filesAndFolders.size());
+		fFilesAndFolders.addAll(filesAndFolders);
+	}
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastIndexerTask.java

@@ -14,7 +14,6 @@ package org.eclipse.cdt.internal.core.pdom.indexer.fast;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -44,6 +43,7 @@ class PDOMFastIndexerTask extends PDOMIndexerTask {
 	private IWritableIndex fIndex;
 	private IndexBasedCodeReaderFactory fCodeReaderFactory;
 	private Map fIflCache;
+	private boolean fCheckTimestamps= false;
 
 	public PDOMFastIndexerTask(PDOMFastIndexer indexer, ITranslationUnit[] added,
 			ITranslationUnit[] changed, ITranslationUnit[] removed) {
@@ -60,7 +60,7 @@ class PDOMFastIndexerTask extends PDOMIndexerTask {
 			setupIndexAndReaderFactory();
 			fIndex.acquireReadLock();
 			try {
-				registerTUsInReaderFactory(fChanged);
+				registerTUsInReaderFactory();
 
 				Iterator i= fRemoved.iterator();
 				while (i.hasNext()) {
@@ -109,13 +109,21 @@ class PDOMFastIndexerTask extends PDOMIndexerTask {
 		this.fCodeReaderFactory = new IndexBasedCodeReaderFactory(fIndex, fIflCache);
 	}
 
-	private void registerTUsInReaderFactory(Collection files) throws CoreException {
-		for (Iterator iter = files.iterator(); iter.hasNext();) {
+	private void registerTUsInReaderFactory() throws CoreException {
+		int removed= 0;
+		for (Iterator iter = fChanged.iterator(); iter.hasNext();) {
 			ITranslationUnit tu = (ITranslationUnit) iter.next();
-			IIndexFileLocation location = IndexLocationFactory.getIFL(tu);
-			FileInfo info= fCodeReaderFactory.createFileInfo(location);
-			info.setRequested(true);
+			IIndexFileLocation ifl = IndexLocationFactory.getIFL(tu);
+			FileInfo info= fCodeReaderFactory.createFileInfo(ifl);
+			if (fCheckTimestamps && !isOutdated(tu, info.fFile)) {
+				iter.remove();
+				removed++;
+			}
+			else {
+				info.setRequested(true);
+			}
 		}
+		updateInfo(0, 0, -removed);
 	}
 
 	protected IIndexFileLocation findLocation(String absolutePath) {
@@ -158,4 +166,8 @@ class PDOMFastIndexerTask extends PDOMIndexerTask {
 		}
 		return false;
 	}
+
+	public void setCheckTimestamps(boolean val) {
+		fCheckTimestamps= val;
+	}
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/full/PDOMFullIndexerTask.java

@@ -51,6 +51,7 @@ class PDOMFullIndexerTask extends PDOMIndexerTask {
 	private IWritableIndex fIndex = null;
 	private Map filePathsToParse = new HashMap/*<IIndexFileLocation, Object>*/();
 	private Map fIflCache = new HashMap/*<String, IIndexFileLocation>*/();
+	private boolean fCheckTimestamps= false;
 
 	public PDOMFullIndexerTask(PDOMFullIndexer indexer, ITranslationUnit[] added,
 			ITranslationUnit[] changed, ITranslationUnit[] removed) {
@@ -69,14 +70,24 @@ class PDOMFullIndexerTask extends PDOMIndexerTask {
 			// separate headers
 			List headers= new ArrayList();
 			List sources= fChanged;
+			int removed= 0;
 			for (Iterator iter = fChanged.iterator(); iter.hasNext();) {
 				ITranslationUnit tu = (ITranslationUnit) iter.next();
+				if (fCheckTimestamps) {
+					IIndexFileLocation ifl = IndexLocationFactory.getIFL(tu);
+					IIndexFile file= fIndex.getFile(ifl);
+					if (!isOutdated(tu, file)) {
+						iter.remove();
+						removed++;
+						continue;
+					}
+				}
 				if (!tu.isSourceUnit()) {
 					headers.add(tu);
 					iter.remove();
 				}
 			}
-
+			updateInfo(0, 0, -removed);
 			registerTUsInReaderFactory(sources);
 			registerTUsInReaderFactory(headers);
 					
@@ -161,4 +172,8 @@ class PDOMFullIndexerTask extends PDOMIndexerTask {
 		filePathsToParse.put(location, SKIP);
 		return required == REQUIRED;
 	}
+
+	public void setCheckTimestamps(boolean val) {
+		fCheckTimestamps= val;
+	}
 }

core/org.eclipse.cdt.ui/plugin.properties

@@ -357,7 +357,7 @@ CDTIndexer.fastindexer=Fast C/C++ Indexer (recommended)
 
 IndexView.name=C/C++ Index
 RebuildIndex.name=Rebuild
-SyncIndex.name=Update Modified Files
+SyncIndex.name=Update with Modified Files
 
 indexerPage.name = Indexer Page
 proposalFilter.name = Code Completion Proposal Filter

core/org.eclipse.cdt.ui/plugin.xml

@@ -716,11 +716,16 @@
    <extension
          point="org.eclipse.ui.popupMenus">
       <objectContribution
-          adaptable="true"
+          adaptable="false"
           id="org.eclipse.cdt.ui.rebuildIndexContribution"
-          objectClass="org.eclipse.cdt.core.model.ICProject">
+          objectClass="org.eclipse.cdt.core.model.ICElement">
          <action
-             class="org.eclipse.cdt.internal.ui.indexview.RebuildIndexActionDelegate"
+             class="org.eclipse.cdt.internal.ui.actions.UpdateIndexWithModifiedFilesAction"
+             id="org.eclipse.cdt.ui.syncIndexWithDiskAction"
+             label="%SyncIndex.name"
+             menubarPath="org.eclipse.cdt.ui.indexmenu/gm1"/>
+         <action
+             class="org.eclipse.cdt.internal.ui.actions.RebuildIndexAction"
              id="org.eclipse.cdt.ui.rebuildIndexAction"
              label="%RebuildIndex.name"
              menubarPath="org.eclipse.cdt.ui.indexmenu/gm1"/>
@@ -732,6 +737,19 @@
                   name="gm1">
             </groupMarker>
          </menu>
+         <visibility>
+            <or>
+               <objectClass
+                     name="org.eclipse.cdt.core.model.ICProject">
+               </objectClass>
+               <objectClass
+                     name="org.eclipse.cdt.core.model.ICContainer">
+               </objectClass>
+               <objectClass
+                     name="org.eclipse.cdt.core.model.ITranslationUnit">
+               </objectClass>
+            </or>
+         </visibility>
       </objectContribution>
       <objectContribution
             objectClass="org.eclipse.core.resources.IMarker"

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

@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Markus Schorn - initial API and implementation
+ *******************************************************************************/ 
+
+package org.eclipse.cdt.internal.ui.actions;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IActionDelegate;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.index.IIndexManager;
+import org.eclipse.cdt.core.model.ICContainer;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.ui.CUIPlugin;
+
+public abstract class AbstractUpdateIndexAction implements IObjectActionDelegate {
+
+	private ISelection fSelection;
+	
+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+	}
+
+	public void run(IAction action) {
+		if (!(fSelection instanceof IStructuredSelection))
+			return;
+		
+		Iterator i= ((IStructuredSelection)fSelection).iterator();
+		ArrayList tuSelection= new ArrayList();
+		while (i.hasNext()) {
+			Object o= i.next();
+			if (o instanceof ICProject || o instanceof ICContainer || 
+					o instanceof ITranslationUnit) {
+				tuSelection.add(o);
+			}
+		}
+		ICElement[] tuArray= (ICElement[]) tuSelection.toArray(new ICElement[tuSelection.size()]);
+		
+		try {
+			CCorePlugin.getIndexManager().update(tuArray, getUpdateOptions());
+		}
+		catch (CoreException e) {
+			CUIPlugin.getDefault().log(e);
+		}
+	}
+
+	/**
+	 * Return the options to update the translation.
+	 * @see IIndexManager#update(ICElement[], int)
+	 * @since 4.0
+	 */
+	abstract protected int getUpdateOptions();
+
+	/**
+	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+		fSelection = selection;
+	}
+}

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

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 QNX Softare Systems
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     QNX Software Systems - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.ui.CUIPlugin;
-
-public class PDOMUpdateProjectAction implements IObjectActionDelegate {
-
-	private ISelection selection;
-	
-	/**
-	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		if (!(selection instanceof IStructuredSelection))
-			return;
-		
-		Object[] objs = ((IStructuredSelection)selection).toArray();
-		for (int i = 0; i < objs.length; ++i) {
-			if (!(objs[i] instanceof ICProject))
-				continue;
-			
-			ICProject project = (ICProject)objs[i];
-			try {
-				CCorePlugin.getIndexManager().reindex(project);
-			} catch (CoreException e) {
-				CUIPlugin.getDefault().log(e);
-			}
-		}
-	}
-
-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-	}
-
-}

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

@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Markus Schorn - initial API and implementation
+ *******************************************************************************/ 
+
+package org.eclipse.cdt.internal.ui.actions;
+
+import org.eclipse.cdt.core.index.IIndexManager;
+
+public class RebuildIndexAction extends AbstractUpdateIndexAction {
+
+	protected int getUpdateOptions() {
+		return IIndexManager.UPDATE_ALL;
+	}
+}

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

@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Markus Schorn - initial API and implementation
+ *******************************************************************************/ 
+
+package org.eclipse.cdt.internal.ui.actions;
+
+import org.eclipse.cdt.core.index.IIndexManager;
+
+public class UpdateIndexWithModifiedFilesAction extends AbstractUpdateIndexAction {
+
+	protected int getUpdateOptions() {
+		return IIndexManager.UPDATE_CHECK_TIMESTAMPS;
+	}
+}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/RebuildIndexActionDelegate.java

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 QNX Software Systems 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * QNX - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.internal.ui.indexview;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.ui.CUIPlugin;
-
-/**
- * @author Doug Schaefer
- *
- */
-public class RebuildIndexActionDelegate implements IObjectActionDelegate {
-
-	private IWorkbenchPart targetPart;
-	
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		this.targetPart = targetPart;
-	}
-
-	public void run(IAction action) {
-		ISelection selection = targetPart.getSite().getSelectionProvider().getSelection();
-		if (!(selection instanceof IStructuredSelection))
-			return;
-		
-		Object[] objs = ((IStructuredSelection)selection).toArray();
-		for (int i = 0; i < objs.length; ++i) {
-			if (!(objs[i] instanceof ICProject))
-				continue;
-			
-			ICProject project = (ICProject)objs[i];
-			try {
-				CCorePlugin.getIndexManager().reindex(project);
-			} catch (CoreException e) {
-				CUIPlugin.getDefault().log(e);
-			}
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-}