Attachment #205241 for bug #356620

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchScopeTests.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 1025-1031 Link Here
1025		1025
1026	// Index the output location as it is a library for the project	1026	// Index the output location as it is a library for the project
1027	IndexManager indexManager = JavaModelManager.getIndexManager();	1027	IndexManager indexManager = JavaModelManager.getIndexManager();
1028	indexManager.indexLibrary(new Path("/P1/bin"), project.getProject());	1028	indexManager.indexLibrary(new Path("/P1/bin"), project.getProject(), null);
1029	waitUntilIndexesReady();	1029	waitUntilIndexesReady();
1030		1030
1031	// Search for all types	1031	// Search for all types

Lines 17-22 Link Here

(-)a/org.eclipse.jdt.core/META-INF/MANIFEST.MF (+1 lines)
17	org.eclipse.jdt.core.jdom,	17	org.eclipse.jdt.core.jdom,
18	org.eclipse.jdt.core.search,	18	org.eclipse.jdt.core.search,
19	org.eclipse.jdt.core.util,	19	org.eclipse.jdt.core.util,
		20	org.eclipse.jdt.core.index,
20	org.eclipse.jdt.internal.codeassist;x-internal:=true,	21	org.eclipse.jdt.internal.codeassist;x-internal:=true,
21	org.eclipse.jdt.internal.codeassist.complete;x-internal:=true,	22	org.eclipse.jdt.internal.codeassist.complete;x-internal:=true,
22	org.eclipse.jdt.internal.codeassist.impl;x-internal:=true,	23	org.eclipse.jdt.internal.codeassist.impl;x-internal:=true,

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/antadapter/org/eclipse/jdt/internal/antadapter/messages.properties (-1 / +5 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2000, 2006 IBM Corporation and others.	2	# Copyright (c) 2000, 2011 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 19-21 Link Here
19	checkDebugAttributes.property.argument.cannot.be.null=The property argument cannot be null	19	checkDebugAttributes.property.argument.cannot.be.null=The property argument cannot be null
20	checkDebugAttributes.ioexception.occured=IOException occurred while reading	20	checkDebugAttributes.ioexception.occured=IOException occurred while reading
21	checkDebugAttributes.file.argument.must.be.a.classfile.or.a.jarfile=The file argument must be a .class or a .jar file	21	checkDebugAttributes.file.argument.must.be.a.classfile.or.a.jarfile=The file argument must be a .class or a .jar file
		22
		23	buildJarIndex.jarFile.cannot.be.null=The jar file argument cannot be null
		24	buildJarIndex.indexFile.cannot.be.null=The index file argument cannot be null
		25	buildJarIndex.ioexception.occured=IOException - {0}

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/build.properties (-2 / +3 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2000, 2010 IBM Corporation and others.	2	# Copyright (c) 2000, 2011 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 24-30 Link Here
24	org.eclipse.jdt.core.jdom.*,\	24	org.eclipse.jdt.core.jdom.*,\
25	org.eclipse.jdt.core.dom.*,\	25	org.eclipse.jdt.core.dom.*,\
26	org.eclipse.jdt.core.dom.rewrite.*,\	26	org.eclipse.jdt.core.dom.rewrite.*,\
27	org.eclipse.jdt.core.search.*	27	org.eclipse.jdt.core.search.*,\
		28	org.eclipse.jdt.core.index.*
28	source.. = batch/,\	29	source.. = batch/,\
29	codeassist/,\	30	codeassist/,\
30	compiler/,\	31	compiler/,\




/*******************************************************************************
 * Copyright (c) 2005, 2011 IBM Corporation 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

	 * @since 3.1
	 */
	String JAVADOC_LOCATION_ATTRIBUTE_NAME = "javadoc_location"; //$NON-NLS-1$
	
	/**
	 * Constant for the name of the index location attribute.
	 * 
	 * <p>The value for this attribute has to be the string representation of a URL.
	 * It should point to an existing index file in a folder or a jar.</p>
	 * 
	 * @since 3.8
	 */
	String INDEX_LOCATION_ATTRIBUTE_NAME = "index_location"; //$NON-NLS-1$

	/**
	 * Constant for the name of the optional attribute. The possible values

Lines 57-62 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaElementDelta.java (+26 lines)
57	* <li>{@link #F_SOURCEDETACHED} - The source attachment path or the source attachment root path	57	* <li>{@link #F_SOURCEDETACHED} - The source attachment path or the source attachment root path
58	* of a classpath entry corresponding to the element was removed. This flag is only valid if the element is an	58	* of a classpath entry corresponding to the element was removed. This flag is only valid if the element is an
59	* {@link IPackageFragmentRoot}.</li>	59	* {@link IPackageFragmentRoot}.</li>
		60	* <li>{@link #F_INDEXATTACHED} - The index path or the index root path
		61	* of a classpath entry corresponding to the element was added. This flag is only valid if the element is an
		62	* {@link IPackageFragmentRoot}.</li>
		63	* <li>{@link #F_INDEXDETACHED} - The index path or the index root path
		64	* of a classpath entry corresponding to the element was removed. This flag is only valid if the element is an
		65	* {@link IPackageFragmentRoot}.</li>
60	* <li>{@link #F_SUPER_TYPES} - One of the supertypes of an {@link IType} has changed</li>.	66	* <li>{@link #F_SUPER_TYPES} - One of the supertypes of an {@link IType} has changed</li>.
61	* </ul>	67	* </ul>
62	* </li>	68	* </li>
Lines 312-317 Link Here
312	* @since 3.4	318	* @since 3.4
313	*/	319	*/
314	public int F_ANNOTATIONS = 0x400000;	320	public int F_ANNOTATIONS = 0x400000;
		321
		322	/**
		323	* TODO SATYAM: We probably don't need this delta..
		324	*
		325	* Change flag indicating that the index file of a classpath entry
		326	* corresponding to the element was added. This flag is only valid if the element is an
		327	* {@link IPackageFragmentRoot}.
		328	*
		329	* @since 3.8
		330	*/
		331	public int F_INDEXATTACHED = 0x800000;
		332
		333	/**
		334	* Change flag indicating that the index file of a classpath entry
		335	* corresponding to the element was removed. This flag is only valid if the element is an
		336	* {@link IPackageFragmentRoot}.
		337	*
		338	* @since 3.8
		339	*/
		340	public int F_INDEXDETACHED = 0x1000000;
315		341
316	/**	342	/**
317	* Returns deltas for the children that have been added.	343	* Returns deltas for the children that have been added.




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation 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

 *******************************************************************************/
package org.eclipse.jdt.core;

import java.net.URL;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;


	 */
	void delete(int updateResourceFlags, int updateModelFlags, IProgressMonitor monitor) throws JavaModelException;
	/**
	 * Returns the URL to the index file attached to this package fragment root's binary archive.
	 *
	 * @return the URL to the corresponding index file,
	 *   or <code>null</code> if this package fragment root's binary archive
	 *   has no corresponding index file, or if this package fragment root
	 *   is not a binary archive
	 * @exception JavaModelException if this operation fails
	 * 
	 * @since 3.8
	 */
	URL getIndexPath() throws JavaModelException;
	/**
	 * Returns this package fragment root's kind encoded as an integer.
	 * A package fragment root can contain source files (i.e. files with one
	 * of the {@link JavaCore#getJavaLikeExtensions() Java-like extensions},

Lines 10-15 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathChange.java (-4 / +36 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.internal.core;	11	package org.eclipse.jdt.internal.core;
12		12
		13	import java.net.URL;
13	import java.util.ArrayList;	14	import java.util.ArrayList;
14	import java.util.HashMap;	15	import java.util.HashMap;
15	import java.util.HashSet;	16	import java.util.HashSet;
Lines 362-373 Link Here
362	}	363	}
363		364
364	// check source attachment	365	// check source attachment
		366	// TODO SATYAM: Understand this
365	IPath newSourcePath = newResolvedClasspath[index].getSourceAttachmentPath();	367	IPath newSourcePath = newResolvedClasspath[index].getSourceAttachmentPath();
366	int sourceAttachmentFlags = getSourceAttachmentDeltaFlag(this.oldResolvedClasspath[i].getSourceAttachmentPath(), newSourcePath);	368	int sourceAttachmentFlags = getSourceAttachmentDeltaFlag(this.oldResolvedClasspath[i].getSourceAttachmentPath(), newSourcePath);
367	IPath oldRootPath = this.oldResolvedClasspath[i].getSourceAttachmentRootPath();	369	IPath oldRootPath = this.oldResolvedClasspath[i].getSourceAttachmentRootPath();
368	IPath newRootPath = newResolvedClasspath[index].getSourceAttachmentRootPath();	370	IPath newRootPath = newResolvedClasspath[index].getSourceAttachmentRootPath();
369	int sourceAttachmentRootFlags = getSourceAttachmentDeltaFlag(oldRootPath, newRootPath);	371	int sourceAttachmentRootFlags = getSourceAttachmentDeltaFlag(oldRootPath, newRootPath);
370	int flags = sourceAttachmentFlags \| sourceAttachmentRootFlags;	372	URL newIndexPath = ((ClasspathEntry)newResolvedClasspath[index]).getLibraryIndexLocation();
		373	int indexFlags = getIndexDeltaFlag(((ClasspathEntry)this.oldResolvedClasspath[i]).getLibraryIndexLocation(), newIndexPath);
		374	int flags = sourceAttachmentFlags \| sourceAttachmentRootFlags \| indexFlags;
371	if (flags != 0) {	375	if (flags != 0) {
372	addClasspathDeltas(delta, this.project.computePackageFragmentRoots(this.oldResolvedClasspath[i]), flags);	376	addClasspathDeltas(delta, this.project.computePackageFragmentRoots(this.oldResolvedClasspath[i]), flags);
373	} else {	377	} else {
Lines 432-437 Link Here
432	}	436	}
433		437
434	return result;	438	return result;
		439	}
		440
		441	/*
		442	* TODO SATYAM: Put a comment
		443	*/
		444	private int getIndexDeltaFlag(URL oldPath, URL newPath) {
		445	if (oldPath == null) {
		446	if (newPath != null) {
		447	return IJavaElementDelta.F_INDEXATTACHED;
		448	} else {
		449	return 0;
		450	}
		451	} else if (newPath == null) {
		452	return IJavaElementDelta.F_INDEXDETACHED;
		453	} else if (!oldPath.equals(newPath)) {
		454	return IJavaElementDelta.F_INDEXATTACHED \| IJavaElementDelta.F_INDEXDETACHED;
		455	} else {
		456	return 0;
		457	}
435	}	458	}
436		459
437	/*	460	/*
Lines 511-517 Link Here
511		534
512	for (int i = 0; i < newLength; i++) {	535	for (int i = 0; i < newLength; i++) {
513	int index = classpathContains(this.oldResolvedClasspath, newResolvedClasspath[i]);	536	int index = classpathContains(this.oldResolvedClasspath, newResolvedClasspath[i]);
514	if (index == -1) {	537	if (index == -1 \|\| newResolvedClasspath[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
515	// remote projects are not indexed in this project	538	// remote projects are not indexed in this project
516	if (newResolvedClasspath[i].getEntryKind() == IClasspathEntry.CPE_PROJECT){	539	if (newResolvedClasspath[i].getEntryKind() == IClasspathEntry.CPE_PROJECT){
517	continue;	540	continue;
Lines 524-537 Link Here
524	boolean pathHasChanged = true;	547	boolean pathHasChanged = true;
525	IPath newPath = newResolvedClasspath[i].getPath();	548	IPath newPath = newResolvedClasspath[i].getPath();
526	for (int j = 0; j < oldLength; j++) {	549	for (int j = 0; j < oldLength; j++) {
		550	//TODO SATYAM: Isn't index == j?
527	IClasspathEntry oldEntry = this.oldResolvedClasspath[j];	551	IClasspathEntry oldEntry = this.oldResolvedClasspath[j];
528	if (oldEntry.getPath().equals(newPath)) {	552	if (oldEntry.getPath().equals(newPath)) {
529	pathHasChanged = false;	553	URL oldurl = ((ClasspathEntry)oldEntry).getLibraryIndexLocation();
		554	URL newurl = ((ClasspathEntry)newResolvedClasspath[i]).getLibraryIndexLocation();
		555	if (oldurl == null && newurl == null) {
		556	pathHasChanged = false;
		557	} else if (oldurl != null && newurl != null) {
		558	pathHasChanged = !(newurl.equals(oldurl));
		559	} else if (oldurl != null) {
		560	indexManager.removeIndex(newPath);
		561	}
530	break;	562	break;
531	}	563	}
532	}	564	}
533	if (pathHasChanged) {	565	if (pathHasChanged) {
534	indexManager.indexLibrary(newPath, this.project.getProject());	566	indexManager.indexLibrary(newPath, this.project.getProject(),((ClasspathEntry)newResolvedClasspath[i]).getLibraryIndexLocation());
535	}	567	}
536	break;	568	break;
537	case IClasspathEntry.CPE_SOURCE:	569	case IClasspathEntry.CPE_SOURCE:

Lines 16-21 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java (+29 lines)
16	import java.io.InputStream;	16	import java.io.InputStream;
17	import java.io.OutputStreamWriter;	17	import java.io.OutputStreamWriter;
18	import java.io.UnsupportedEncodingException;	18	import java.io.UnsupportedEncodingException;
		19	import java.net.MalformedURLException;
		20	import java.net.URL;
19	import java.util.ArrayList;	21	import java.util.ArrayList;
20	import java.util.HashMap;	22	import java.util.HashMap;
21	import java.util.HashSet;	23	import java.util.HashSet;
Lines 2164-2167 Link Here
2164	}	2166	}
2165	return JavaModelStatus.VERIFIED_OK;	2167	return JavaModelStatus.VERIFIED_OK;
2166	}	2168	}
		2169
		2170	/*
		2171	* This function computes the URL of the index location for this classpath entry.
		2172	* It returns null if the URL is invalid.
		2173	*/
		2174	public URL getLibraryIndexLocation() {
		2175	switch(getEntryKind()) {
		2176	case IClasspathEntry.CPE_LIBRARY :
		2177	case IClasspathEntry.CPE_VARIABLE :
		2178	break;
		2179	default :
		2180	return null;
		2181	}
		2182
		2183	for (int i= 0; i < this.extraAttributes.length; i++) {
		2184	IClasspathAttribute attrib= this.extraAttributes[i];
		2185	if (IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME.equals(attrib.getName())) {
		2186	String value = attrib.getValue();
		2187	try {
		2188	return new URL(value);
		2189	} catch (MalformedURLException e) {
		2190	return null;
		2191	}
		2192	}
		2193	}
		2194	return null;
		2195	}
2167	}	2196	}

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessingState.java (-2 / +15 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 18-23 Link Here
18	import java.io.FileInputStream;	18	import java.io.FileInputStream;
19	import java.io.FileOutputStream;	19	import java.io.FileOutputStream;
20	import java.io.IOException;	20	import java.io.IOException;
		21	import java.net.URL;
21	import java.util.*;	22	import java.util.*;
22		23
23	import org.eclipse.core.resources.*;	24	import org.eclipse.core.resources.*;
Lines 75-80 Link Here
75	/* A table from IPath (a source attachment path from a classpath entry) to IPath (a root path) */	76	/* A table from IPath (a source attachment path from a classpath entry) to IPath (a root path) */
76	public HashMap sourceAttachments = new HashMap();	77	public HashMap sourceAttachments = new HashMap();
77		78
		79	/* TODO SATYAM: Is this necessary?*/
		80	public HashMap indexMap = new HashMap();
		81
78	/* A table from IJavaProject to IJavaProject[] (the list of direct dependent of the key) */	82	/* A table from IJavaProject to IJavaProject[] (the list of direct dependent of the key) */
79	public HashMap projectDependencies = new HashMap();	83	public HashMap projectDependencies = new HashMap();
80		84
Lines 262-267 Link Here
262	this.otherRoots = rootInfos[1];	266	this.otherRoots = rootInfos[1];
263	this.sourceAttachments = rootInfos[2];	267	this.sourceAttachments = rootInfos[2];
264	this.projectDependencies = rootInfos[3];	268	this.projectDependencies = rootInfos[3];
		269	this.indexMap = rootInfos[4];
265	this.rootsAreStale = false;	270	this.rootsAreStale = false;
266	}	271	}
267	}	272	}
Lines 274-279 Link Here
274	this.otherRoots = rootInfos[1];	279	this.otherRoots = rootInfos[1];
275	this.sourceAttachments = rootInfos[2];	280	this.sourceAttachments = rootInfos[2];
276	this.projectDependencies = rootInfos[3];	281	this.projectDependencies = rootInfos[3];
		282	this.indexMap = rootInfos[4];
277	this.rootsAreStale = false;	283	this.rootsAreStale = false;
278	}	284	}
279	}	285	}
Lines 283-288 Link Here
283	HashMap newOtherRoots = new HashMap();	289	HashMap newOtherRoots = new HashMap();
284	HashMap newSourceAttachments = new HashMap();	290	HashMap newSourceAttachments = new HashMap();
285	HashMap newProjectDependencies = new HashMap();	291	HashMap newProjectDependencies = new HashMap();
		292	HashMap newIndexes = new HashMap();
286		293
287	IJavaModel model = JavaModelManager.getJavaModelManager().getJavaModel();	294	IJavaModel model = JavaModelManager.getJavaModelManager().getJavaModel();
288	IJavaProject[] projects;	295	IJavaProject[] projects;
Lines 354-362 Link Here
354	if (sourceAttachmentPath != null) {	361	if (sourceAttachmentPath != null) {
355	newSourceAttachments.put(sourceAttachmentPath, path);	362	newSourceAttachments.put(sourceAttachmentPath, path);
356	}	363	}
		364
		365	//TODO SATYAM: Do we need something like this?
		366	URL url = ((ClasspathEntry)entry).getLibraryIndexLocation();
		367	if (url != null) {
		368	newIndexes.put(url, path);
		369	}
357	}	370	}
358	}	371	}
359	return new HashMap[] {newRoots, newOtherRoots, newSourceAttachments, newProjectDependencies};	372	return new HashMap[] {newRoots, newOtherRoots, newSourceAttachments, newProjectDependencies, newIndexes};
360	}	373	}
361		374
362	public synchronized ClasspathValidation[] removeClasspathValidations() {	375	public synchronized ClasspathValidation[] removeClasspathValidations() {




			}
		}
	}
	private void checkIndexChange(IResourceDelta delta, IResource res) {
		IPath rootPath = (IPath)this.state.indexMap.get(externalPath(res));
		if (rootPath != null) {
			RootInfo rootInfo = rootInfo(rootPath, delta.getKind());
			if (rootInfo != null) {
				IJavaProject projectOfRoot = rootInfo.project;
				IPackageFragmentRoot root = null;
				try {
					// close the root so that source attachment cache is flushed
					root = projectOfRoot.findPackageFragmentRoot(rootPath);
					if (root != null) {
						root.close();
					}
				} catch (JavaModelException e) {
					// root doesn't exist: ignore
				}
				if (root == null) return;
				switch (delta.getKind()) {
					case IResourceDelta.ADDED:
						currentDelta().indexAttached(root);
						break;
					case IResourceDelta.CHANGED:
						currentDelta().indexDetached(root);
						currentDelta().indexAttached(root);
						break;
					case IResourceDelta.REMOVED:
						currentDelta().indexDetached(root);
						break;
				}
			}
		}
	}
	/*
	 * Closes the given element, which removes it from the cache of open elements.
	 */

									// first remove the index so that it is forced to be re-indexed
									this.manager.indexManager.removeIndex(entryPath);
									// then index the jar
									this.manager.indexManager.indexLibrary(entryPath, project.getProject(), ((ClasspathEntry)entries[j]).getLibraryIndexLocation());
								} else {
									externalArchivesStatus.put(entryPath, EXTERNAL_JAR_UNCHANGED);
								}

									this.state.getExternalLibTimeStamps().put(entryPath, new Long(newTimeStamp));
									// index the new jar
									this.manager.indexManager.removeIndex(entryPath);
									this.manager.indexManager.indexLibrary(entryPath, project.getProject(), ((ClasspathEntry)entries[j]).getLibraryIndexLocation());
								}
							}
						} else { // internal JAR


				// check source attachment change
				checkSourceAttachmentChange(child, childRes);
				checkIndexChange(child, childRes);

				// find out whether the child is a package fragment root of the current project
				IPath childPath = externalPath(childRes);

					switch (delta.getKind()) {
						case IResourceDelta.ADDED:
							// index the new jar
							indexManager.indexLibrary(jarPath, root.getJavaProject().getProject(), root.getIndexPath() );
							break;
						case IResourceDelta.CHANGED:
							// first remove the index so that it is forced to be re-indexed
							indexManager.removeIndex(jarPath);
							// then index the jar
							indexManager.indexLibrary(jarPath, root.getJavaProject().getProject(), root.getIndexPath());
							break;
						case IResourceDelta.REMOVED:
							// the jar was physically removed: remove the index




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation 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

	detachedDelta.changed(F_SOURCEDETACHED);
	insertDeltaTree(element, detachedDelta);
}

/**
 * Creates the nested deltas resulting from a change operation.
 * Convenience method for creating change deltas.
 * The constructor should be used to create the root delta
 * and then a change operation should call this method.
 */
public void indexAttached(IJavaElement element) {
	JavaElementDelta attachedDelta = new JavaElementDelta(element);
	attachedDelta.changed(F_INDEXATTACHED);
	insertDeltaTree(element, attachedDelta);
}
/**
 * Creates the nested deltas resulting from a change operation.
 * Convenience method for creating change deltas.
 * The constructor should be used to create the root delta
 * and then a change operation should call this method.
 */
public void indexDetached(IJavaElement element) {
	JavaElementDelta detachedDelta = new JavaElementDelta(element);
	detachedDelta.changed(F_INDEXDETACHED);
	insertDeltaTree(element, detachedDelta);
}
/**
 * Returns a string representation of this delta's
 * structure suitable for debug purposes.

Lines 180-185 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java (+2 lines)
180	* Map from a package fragment root's path to a source attachment property (source path + ATTACHMENT_PROPERTY_DELIMITER + source root path)	180	* Map from a package fragment root's path to a source attachment property (source path + ATTACHMENT_PROPERTY_DELIMITER + source root path)
181	*/	181	*/
182	public Map rootPathToAttachments = new Hashtable();	182	public Map rootPathToAttachments = new Hashtable();
		183	//TODO SATYAM: Is this necessary
		184	public Map rootPathToIndexes = new Hashtable();
183		185
184	public final static String CP_VARIABLE_PREFERENCES_PREFIX = JavaCore.PLUGIN_ID+".classpathVariable."; //$NON-NLS-1$	186	public final static String CP_VARIABLE_PREFERENCES_PREFIX = JavaCore.PLUGIN_ID+".classpathVariable."; //$NON-NLS-1$
185	public final static String CP_CONTAINER_PREFERENCES_PREFIX = JavaCore.PLUGIN_ID+".classpathContainer."; //$NON-NLS-1$	187	public final static String CP_CONTAINER_PREFERENCES_PREFIX = JavaCore.PLUGIN_ID+".classpathContainer."; //$NON-NLS-1$




 *******************************************************************************/
package org.eclipse.jdt.internal.core;

import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Map;

	}
}

public URL getIndexPath() {
	try {
		if (getKind() != K_BINARY) return null;

		IClasspathEntry entry = ((JavaProject) getParent()).getClasspathEntryFor(getPath());
		URL indexPath;
		if (entry != null && (indexPath = ((ClasspathEntry)entry).getLibraryIndexLocation()) != null)
			return indexPath;
	
	} catch (JavaModelException e) {
		// ignore exception
	}
	return null;
}

}

Lines 1-7 Link Here

(-)a/org.eclipse.jdt.core/plugin.xml (-1 / +17 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<?eclipse version="3.0"?>	2	<?eclipse version="3.0"?>
3	<!--	3	<!--
4	Copyright (c) 2004, 2010 IBM Corporation and others.	4	Copyright (c) 2004, 2011 IBM Corporation and others.
5	All rights reserved. This program and the accompanying materials	5	All rights reserved. This program and the accompanying materials
6	are made available under the terms of the Eclipse Public License v1.0	6	are made available under the terms of the Eclipse Public License v1.0
7	which accompanies this distribution, and is available at	7	which accompanies this distribution, and is available at
Lines 158-163 Link Here
158	class="org.eclipse.jdt.core.CheckDebugAttributes"	158	class="org.eclipse.jdt.core.CheckDebugAttributes"
159	library="jdtCompilerAdapter.jar">	159	library="jdtCompilerAdapter.jar">
160	</antTask>	160	</antTask>
		161	<antTask
		162	name="eclipse.buildJarIndex"
		163	class="org.eclipse.jdt.core.BuildJarIndex"
		164	library="jdtCompilerAdapter.jar">
		165	</antTask>
161	</extension>	166	</extension>
162		167
163	<!-- =================================================================================== -->	168	<!-- =================================================================================== -->
Lines 196-201 Link Here
196	</extension>	201	</extension>
197		202
198	<!-- =================================================================================== -->	203	<!-- =================================================================================== -->
		204	<!-- Extension: Java Generate Indexer -->
		205	<!-- =================================================================================== -->
		206	<extension
		207	id="JavaIndexer"
		208	point="org.eclipse.core.runtime.applications">
		209	<application>
		210	<run class="org.eclipse.jdt.core.index.JavaIndexerApplication" />
		211	</application>
		212	</extension>
		213
		214	<!-- =================================================================================== -->
199	<!-- Extension: Java Content Types -->	215	<!-- Extension: Java Content Types -->
200	<!-- =================================================================================== -->	216	<!-- =================================================================================== -->
201	<extension point="org.eclipse.core.contenttype.contentTypes">	217	<extension point="org.eclipse.core.contenttype.contentTypes">




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation 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:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.core.index;

import java.io.IOException;
import org.eclipse.jdt.internal.core.search.indexing.DefaultJavaIndexer;

/**
 * TODO SATYAM: Write a proper javadoc
 * @since 3.8
 */
public class JavaIndexer {

	/**
	 * TODO SATYAM: Write a javadoc
	 * @param pathToJar
	 * @param pathToIndexFile
	 * @throws IOException
	 */
	public static void generateIndexForJar(String pathToJar, String pathToIndexFile) throws IOException {
		new DefaultJavaIndexer().generateIndexForJar(pathToJar, pathToIndexFile);
	}

}




/*******************************************************************************
 *  Copyright (c) 2011 IBM Corporation 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:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.core.index;

import java.io.File;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;

import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.osgi.util.NLS;

/**
 * Implements an Eclipse Application for org.eclipse.jdt.core.JavaIndexer.
 * 
 * TODO SATYAM: Improve the javadoc to include the arguments.
 * <p>
 * On MacOS, when invoked using the Eclipse executable, the "user.dir" property is set to the folder in which the
 * eclipse.ini file is located. This makes it harder to use relative paths to point to the files to be formatted or the
 * configuration file to use to set the code formatter's options.
 * </p>
 * 
 * 
 * @since 3.8
 * @noinstantiate This class is not intended to be instantiated by clients.
 * @noextend This class is not intended to be subclassed by clients.
 */
public class JavaIndexerApplication implements IApplication {

	private final static class Messages extends NLS {
		private static final String MESSAGES_NAME = "org.eclipse.jdt.core.index.messages";//$NON-NLS-1$

		public static String CommandLineProcessing;
		public static String CommandLineUsage;
		public static String CommandLineOnlyOutputError;
		public static String CommandLineOnlyOneJarError;
		public static String CommandLineJarNotSpecified;
		public static String CommandLineIndexFileNotSpecified;
		public static String CaughtException;
		public static String CommandLineJarFileNotExist;

		static {
			NLS.initializeMessages(MESSAGES_NAME, Messages.class);
		}

		public static String bind(String message) {
			return bind(message, null);
		}

		public static String bind(String message, Object binding) {
			return bind(message, new Object[] { binding });
		}

		public static String bind(String message, Object binding1, Object binding2) {
			return bind(message, new Object[] { binding1, binding2 });
		}

		public static String bind(String message, Object[] bindings) {
			return MessageFormat.format(message, bindings);
		}
	}

	private String jarToIndex;
	private String indexFile;
	private boolean verbose = false;
	private static final String PDE_LAUNCH = "-pdelaunch"; //$NON-NLS-1$
	private static final String ARG_HELP = "-help"; //$NON-NLS-1$
	private static final String ARG_VERBOSE = "-verbose"; //$NON-NLS-1$
	private static final String ARG_OUTPUT = "-output"; //$NON-NLS-1$

	private void displayHelp() {
		System.out.println(Messages.bind(Messages.CommandLineUsage));
	}

	private void displayError(String message) {
		System.err.println(message);
		System.out.println();
		displayHelp();
	}

	private boolean processCommandLine(String[] argsArray) {
		ArrayList args = new ArrayList();
		for (int i = 0, max = argsArray.length; i < max; i++) {
			args.add(argsArray[i]);
		}
		int index = 0;
		final int argCount = argsArray.length;

		loop: while (index < argCount) {
			String currentArg = argsArray[index++];
			if (PDE_LAUNCH.equals(currentArg)) {
				continue loop;
			} else if (ARG_HELP.equals(currentArg)) {
				displayHelp();
				return false;
			} else if (ARG_VERBOSE.equals(currentArg)) {
				this.verbose = true;
				continue loop;
			} else if (ARG_OUTPUT.equals(currentArg)) {
				if (this.indexFile != null || index == argCount) {
					displayError(Messages.bind(Messages.CommandLineOnlyOutputError));
					return false;
				}
				this.indexFile = argsArray[index++];
			} else {
				if (this.jarToIndex != null) {
					displayError(Messages.bind(Messages.CommandLineOnlyOneJarError));
					return false;
				}
				this.jarToIndex = currentArg;
			}
		}
		return true;
	}

	public Object start(IApplicationContext context) throws Exception {
		boolean execute = processCommandLine((String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS));
		if (execute) {
			if (this.jarToIndex != null && this.indexFile != null) {
				File f = new File(this.jarToIndex);
				if (!f.exists()) {
					System.out.println(Messages.bind(Messages.CommandLineJarFileNotExist, this.jarToIndex));
				}
				if (this.verbose) {
					System.out.println(Messages.bind(Messages.CommandLineProcessing, this.jarToIndex, this.indexFile));
				}
				try {
					JavaIndexer.generateIndexForJar(this.jarToIndex, this.indexFile);
				} catch (IOException e) {
					System.out.println(Messages.bind(Messages.CaughtException, "IOException", e.getLocalizedMessage())); //$NON-NLS-1$
				}
			} else if (this.jarToIndex == null) {
				System.out.println(Messages.bind(Messages.CommandLineJarNotSpecified));
			} else if (this.indexFile == null) {
				System.out.println(Messages.bind(Messages.CommandLineIndexFileNotSpecified));
			}
		}
		return IApplication.EXIT_OK;
	}

	public void stop() {
		// do nothing
	}

}




###############################################################################
# Copyright (c) 2000, 2006 IBM Corporation 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:
#     IBM Corporation - initial API and implementation
###############################################################################
CommandLineUsage=Usage: eclipse -application org.eclipse.jdt.core.JavaCodeGenerateIndex [ OPTIONS ] -output <indexFile> <jarfile>\n\
\n\
\   -output <indexFile> The index file to be generated.\n\
\
\   <jarfile>   Jar file for which index needs to be generated.\n\
\
\n\
\ OPTIONS:\n\
\n\
\   -help                Display this message.\n\
\   -verbose             Be verbose about the job.
CommandLineProcessing=Generating index {1} for the jar {0}.
CommandLineOnlyOutputError=Only one output need to be specified.
CommandLineOnlyOneJarError=Only one jar file need to be specified.
CommandLineJarNotSpecified=No jar file is specified.
CommandLineIndexFileNotSpecified=No index file is specified.
CaughtException=Exception {0} - {1}.
CommandLineJarFileNotExist={0} does not exist.




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation 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

import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URL;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;

	private static final char JAR_SEPARATOR = IJavaSearchScope.JAR_FILE_ENTRY_SEPARATOR.charAt(0);
	IFile resource;
	Scanner scanner;
	private URL indexFile;

	public AddJarFileToIndex(IFile resource, URL indexFile, IndexManager manager) {
		super(resource.getFullPath(), manager);
		this.resource = resource;
		this.indexFile = indexFile;
	}
	public AddJarFileToIndex(IPath jarPath, URL indexFile, IndexManager manager) {
		// external JAR scenario - no resource
		super(jarPath, manager);
		this.indexFile = indexFile;
	}
	public boolean equals(Object o) {
		if (o instanceof AddJarFileToIndex) {


		if (this.isCancelled || progressMonitor != null && progressMonitor.isCanceled()) return true;

		if (this.indexFile != null) {
			//TODO SATYAM: Need to take care if the indexFile is in a jar.
			boolean added = this.manager.addIndex(this.containerPath, new Path(this.indexFile.getFile()));
			if (added) return true;	
		}

		try {
			// if index is already cached, then do not perform any check
			// MUST reset the IndexManager if a jar file is changed

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexAllProject.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 77-83 Link Here
77	if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY && entry.getPath().equals(projectPath)) {	77	if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY && entry.getPath().equals(projectPath)) {
78	// the project is also a library folder (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=89815)	78	// the project is also a library folder (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=89815)
79	// ensure a job exists to index it as a binary folder	79	// ensure a job exists to index it as a binary folder
80	this.manager.indexLibrary(projectPath, this.project);	80	this.manager.indexLibrary(projectPath, this.project, ((ClasspathEntry)entry).getLibraryIndexLocation());
81	return true;	81	return true;
82	}	82	}
83	}	83	}




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation 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

package org.eclipse.jdt.internal.core.search.indexing;

import java.io.*;
import java.net.URL;
import java.util.*;
import java.util.zip.CRC32;


	// key = indexLocation path, value = index state integer
	private SimpleLookupTable indexStates = null;
	private File savedIndexNamesFile = new File(getSavedIndexesDirectory(), "savedIndexNames.txt"); //$NON-NLS-1$
	private File indexNamesMapFile = new File(getSavedIndexesDirectory(), "indexNamesMap.txt"); //$NON-NLS-1$
	private File participantIndexNamesFile = new File(getSavedIndexesDirectory(), "participantsIndexNames.txt"); //$NON-NLS-1$
	private boolean javaLikeNamesChanged = true;
	public static final Integer SAVED_STATE = new Integer(0);
	public static final Integer UPDATING_STATE = new Integer(1);
	public static final Integer UNKNOWN_STATE = new Integer(2);
	public static final Integer REBUILDING_STATE = new Integer(3);
	public static final Integer REUSE_STATE = new Integer(4);
	
	// search participants who register indexes with the index manager
	private SimpleLookupTable participantsContainers = null;

					return index;
				} catch (IOException e) {
					// failed to read the existing file or its no longer compatible
					if (currentIndexState == REUSE_STATE) {
						// supposed to be in reuse state but error in the index file, so reindex.
						if (VERBOSE)
							Util.verbose("-> cannot reuse given index: "+indexLocationString+" path: "+containerPathString); //$NON-NLS-1$ //$NON-NLS-2$
						this.indexLocations.put(containerPath, null);
						indexLocation = computeIndexLocation(containerPath);
						rebuildIndex(indexLocation, containerPath);
						return null;
					}
					if (currentIndexState != REBUILDING_STATE) { // rebuild index if existing file is corrupt, unless the index is already being rebuilt
						if (VERBOSE)
							Util.verbose("-> cannot reuse existing index: "+indexLocationString+" path: "+containerPathString); //$NON-NLS-1$ //$NON-NLS-2$

				rebuildIndex(indexLocation, containerPath);
				return null;
			}
			//TODO SATYAM: should do something if in reuse state
		}
		// index wasn't found on disk, consider creating an empty new one
		if (createIfMissing) {

			IPath containerPath = (IPath) this.indexLocations.keyForValue(indexLocation);
			if (containerPath != null) {// sanity check
				index = getIndex(containerPath, indexLocation, true /*reuse index file*/, false /*do not create if none*/);
				if (index != null && this.javaLikeNamesChanged && !index.isIndexForJar()) { //TODO SATYAM: shouldn't delete the pre-index files
					// When a change in java like names extension has been detected, all
					// non jar files indexes (i.e. containing sources) need to be rebuilt.
					// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=286379

		this.javaLikeNamesChanged = false;
		deleteIndexFiles();
	}
	readIndexMap(indexesDirectoryPath.toOSString());
	return this.indexStates;
}
private IPath getParticipantsContainer(IPath indexLocation) {

		for (int i = 0; i < entries.length; i++) {
			IClasspathEntry entry= entries[i];
			if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY)
				indexLibrary(entry.getPath(), project, ((ClasspathEntry)entry).getLibraryIndexLocation());
		}
	} catch(JavaModelException e){ // cannot retrieve classpath info
	}

 * Trigger addition of a library to an index
 * Note: the actual operation is performed in background
 */
public void indexLibrary(IPath path, IProject requestingProject, URL indexFile) {
	// requestingProject is no longer used to cancel jobs but leave it here just in case
	if (JavaCore.getPlugin() == null) return;

	Object target = JavaModel.getTarget(path, true);
	IndexRequest request = null;
	Object target = JavaModel.getTarget(path, true);
	if (target instanceof IFile) {
		request = new AddJarFileToIndex((IFile) target, indexFile, this);
	} else if (target instanceof File) {
		request = new AddJarFileToIndex(path, indexFile, this);
	} else if (target instanceof IContainer) {
		request = new IndexBinaryFolder((IContainer) target, this);
	} else {

	if (!isJobWaiting(request))
		request(request);
}

synchronized boolean addIndex(IPath containerPath, IPath indexFile) {
	this.indexStates.put(indexFile, REUSE_STATE);
	this.indexLocations.put(containerPath, indexFile);
	Index index = getIndex(containerPath, indexFile, true, false);
	if (index == null) {
		this.indexLocations.put(containerPath, null);
		return false;
	}
	writeIndexMapFile();
	return true;
}

/**
 * Index the content of the given source folder.
 */

	} else if (target instanceof IFolder) {
		request = new IndexBinaryFolder((IFolder) target, this);
	} else if (target instanceof IFile) {
		request = new AddJarFileToIndex((IFile) target, null, this);
	} else if (target instanceof File) {
		request = new AddJarFileToIndex(containerPath, null, this);
	}
	if (request != null)
		request(request);

	}
	if (indexFile == null)
		indexFile = new File(indexLocation.toOSString()); // index is not cached yet, but still want to delete the file
	if (this.indexStates.get(indexLocation) == REUSE_STATE) {
		this.indexLocations.put(containerPath, null);
	} else if (indexFile.exists()) {
		if (DEBUG)
			Util.verbose("removing index file " + indexFile); //$NON-NLS-1$
		indexFile.delete();

				locations = new IPath[max];
			locations[count++] = indexLocation;
			File indexFile = index.getIndexFile();
			if (indexFile.exists() && this.indexStates.get(indexLocation) != REUSE_STATE) {
				if (DEBUG)
					Util.verbose("removing index file " + indexFile); //$NON-NLS-1$
				indexFile.delete();

	}
	return null;
}

private char[][] readIndexMap(String dirOSString) {
	try {
		char[] indexMaps = org.eclipse.jdt.internal.compiler.util.Util.getFileCharContent(this.indexNamesMapFile, null);
		if (indexMaps.length > 0) {
			char[][] names = CharOperation.splitOn('\n', indexMaps);
			if (names.length >= 3) {
				// First line is DiskIndex signature + saved plugin working location (see writeSavedIndexNamesFile())
				String savedSignature = DiskIndex.SIGNATURE + "+" + dirOSString; //$NON-NLS-1$ //TODO SATYAM Should dirOSString need to be stored
				if (savedSignature.equals(new String(names[0]))) {
					for (int i = 1, l = names.length-1 ; i < l ; i+=2) {
						IPath indexPath = new Path(new String(names[i]));
						this.indexLocations.put(new Path(new String(names[i+1])), indexPath );
						this.indexStates.put(indexPath, REUSE_STATE);
						//TODO SATYAM: Is this good enough
					}
				}
					
			}
		}
	} catch (IOException ignored) {
		if (VERBOSE)
			Util.verbose("Failed to read saved index file names"); //$NON-NLS-1$
	}
	return null;
}
private void readParticipantsIndexNamesFile() {
	SimpleLookupTable containers = new SimpleLookupTable(3);
	try {

	}

	writeSavedIndexNamesFile();
	writeIndexMapFile();

	if (VERBOSE) {
		if (indexState == null) {

		}
	}
}

private void writeIndexMapFile() {
	BufferedWriter writer = null;
	try {
		writer = new BufferedWriter(new FileWriter(this.indexNamesMapFile));
		writer.write(DiskIndex.SIGNATURE);
		writer.write('+');
		writer.write(getJavaPluginWorkingLocation().toOSString());
		writer.write('\n');
		Object[] keys = this.indexStates.keyTable;
		Object[] states = this.indexStates.valueTable;
		for (int i = 0, l = states.length; i < l; i++) {
			IPath key = (IPath) keys[i];
			if (key != null && !key.isEmpty() && states[i] == REUSE_STATE) {
				IPath value = (IPath)this.indexLocations.keyForValue(key);
				if (value != null) {
					writer.write(key.toOSString());
					writer.write('\n');
					writer.write(value.toOSString());
					writer.write('\n');
				}
			}
		}
	} catch (IOException ignored) {
		if (VERBOSE)
			Util.verbose("Failed to write saved index file names", System.err); //$NON-NLS-1$
	} finally {
		if (writer != null) {
			try {
				writer.close();
			} catch (IOException e) {
				// ignore
			}
		}
	}
}
}

Return to bug 356620

Lines 590-595 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java (-4 / +37 lines)
590	}	590	}
591	}	591	}
592	}	592	}
		593	private void checkIndexChange(IResourceDelta delta, IResource res) {
		594	IPath rootPath = (IPath)this.state.indexMap.get(externalPath(res));
		595	if (rootPath != null) {
		596	RootInfo rootInfo = rootInfo(rootPath, delta.getKind());
		597	if (rootInfo != null) {
		598	IJavaProject projectOfRoot = rootInfo.project;
		599	IPackageFragmentRoot root = null;
		600	try {
		601	// close the root so that source attachment cache is flushed
		602	root = projectOfRoot.findPackageFragmentRoot(rootPath);
		603	if (root != null) {
		604	root.close();
		605	}
		606	} catch (JavaModelException e) {
		607	// root doesn't exist: ignore
		608	}
		609	if (root == null) return;
		610	switch (delta.getKind()) {
		611	case IResourceDelta.ADDED:
		612	currentDelta().indexAttached(root);
		613	break;
		614	case IResourceDelta.CHANGED:
		615	currentDelta().indexDetached(root);
		616	currentDelta().indexAttached(root);
		617	break;
		618	case IResourceDelta.REMOVED:
		619	currentDelta().indexDetached(root);
		620	break;
		621	}
		622	}
		623	}
		624	}
593	/*	625	/*
594	* Closes the given element, which removes it from the cache of open elements.	626	* Closes the given element, which removes it from the cache of open elements.
595	*/	627	*/
Lines 996-1002 Link Here
996	// first remove the index so that it is forced to be re-indexed	1028	// first remove the index so that it is forced to be re-indexed
997	this.manager.indexManager.removeIndex(entryPath);	1029	this.manager.indexManager.removeIndex(entryPath);
998	// then index the jar	1030	// then index the jar
999	this.manager.indexManager.indexLibrary(entryPath, project.getProject());	1031	this.manager.indexManager.indexLibrary(entryPath, project.getProject(), ((ClasspathEntry)entries[j]).getLibraryIndexLocation());
1000	} else {	1032	} else {
1001	externalArchivesStatus.put(entryPath, EXTERNAL_JAR_UNCHANGED);	1033	externalArchivesStatus.put(entryPath, EXTERNAL_JAR_UNCHANGED);
1002	}	1034	}
Lines 1008-1014 Link Here
1008	this.state.getExternalLibTimeStamps().put(entryPath, new Long(newTimeStamp));	1040	this.state.getExternalLibTimeStamps().put(entryPath, new Long(newTimeStamp));
1009	// index the new jar	1041	// index the new jar
1010	this.manager.indexManager.removeIndex(entryPath);	1042	this.manager.indexManager.removeIndex(entryPath);
1011	this.manager.indexManager.indexLibrary(entryPath, project.getProject());	1043	this.manager.indexManager.indexLibrary(entryPath, project.getProject(), ((ClasspathEntry)entries[j]).getLibraryIndexLocation());
1012	}	1044	}
1013	}	1045	}
1014	} else { // internal JAR	1046	} else { // internal JAR
Lines 2239-2244 Link Here
2239		2271
2240	// check source attachment change	2272	// check source attachment change
2241	checkSourceAttachmentChange(child, childRes);	2273	checkSourceAttachmentChange(child, childRes);
		2274	checkIndexChange(child, childRes);
2242		2275
2243	// find out whether the child is a package fragment root of the current project	2276	// find out whether the child is a package fragment root of the current project
2244	IPath childPath = externalPath(childRes);	2277	IPath childPath = externalPath(childRes);
Lines 2628-2640 Link Here
2628	switch (delta.getKind()) {	2661	switch (delta.getKind()) {
2629	case IResourceDelta.ADDED:	2662	case IResourceDelta.ADDED:
2630	// index the new jar	2663	// index the new jar
2631	indexManager.indexLibrary(jarPath, root.getJavaProject().getProject());	2664	indexManager.indexLibrary(jarPath, root.getJavaProject().getProject(), root.getIndexPath() );
2632	break;	2665	break;
2633	case IResourceDelta.CHANGED:	2666	case IResourceDelta.CHANGED:
2634	// first remove the index so that it is forced to be re-indexed	2667	// first remove the index so that it is forced to be re-indexed
2635	indexManager.removeIndex(jarPath);	2668	indexManager.removeIndex(jarPath);
2636	// then index the jar	2669	// then index the jar
2637	indexManager.indexLibrary(jarPath, root.getJavaProject().getProject());	2670	indexManager.indexLibrary(jarPath, root.getJavaProject().getProject(), root.getIndexPath());
2638	break;	2671	break;
2639	case IResourceDelta.REMOVED:	2672	case IResourceDelta.REMOVED:
2640	// the jar was physically removed: remove the index	2673	// the jar was physically removed: remove the index

Added Link Here

(-)a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/JavaIndexer.java (+32 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.jdt.core.index;
12
13	import java.io.IOException;
14	import org.eclipse.jdt.internal.core.search.indexing.DefaultJavaIndexer;
15
16	/**
17	* TODO SATYAM: Write a proper javadoc
18	* @since 3.8
19	*/
20	public class JavaIndexer {
21
22	/**
23	* TODO SATYAM: Write a javadoc
24	* @param pathToJar
25	* @param pathToIndexFile
26	* @throws IOException
27	*/
28	public static void generateIndexForJar(String pathToJar, String pathToIndexFile) throws IOException {
29	new DefaultJavaIndexer().generateIndexForJar(pathToJar, pathToIndexFile);
30	}
31
32	}