Attachment #32533 for bug #118823




	public void searchAllSecondaryTypeNames(
			IPackageFragmentRoot[] sourceFolders,
			final IRestrictedAccessTypeRequestor nameRequestor,
			boolean waitForIndexes,
			IProgressMonitor progressMonitor)  throws JavaModelException {

		if (VERBOSE) {
			Util.verbose("BasicSearchEngine.searchAllSecondaryTypeNames(IPackageFragmentRoot[], IRestrictedAccessTypeRequestor, boolean, IProgressMonitor)"); //$NON-NLS-1$
			StringBuffer buffer = new StringBuffer("	- source folders: "); //$NON-NLS-1$
			int length = sourceFolders.length;
			for (int i=0; i<length; i++) {
				if (i==0) {

				}
				buffer.append(sourceFolders[i].getElementName());
			}
			buffer.append("]\n	- waitForIndexes: "); //$NON-NLS-1$
			buffer.append(waitForIndexes);
			Util.verbose(buffer.toString());
		}


		if (progressMonitor != null) {
			progressMonitor.beginTask(Messages.engine_searching, 100); 
		}
		try {
			indexManager.performConcurrentJob(
				new PatternSearchJob(
					pattern, 
					getDefaultSearchParticipant(), // Java search only
					createJavaSearchScope(sourceFolders), 
					searchRequestor),
				waitForIndexes
					? IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH
					: IJavaSearchConstants.FORCE_IMMEDIATE_SEARCH,
				progressMonitor == null ? null : new SubProgressMonitor(progressMonitor, 100));
		}
		catch (OperationCanceledException oce) {
			// do nothing
		}
	}

	/**

Lines 30-37 Link Here

(-)search/org/eclipse/jdt/internal/core/search/indexing/InternalSearchDocument.java (-2 / +1 lines)
30	if (length > 1 && key[length-2] == IIndexConstants.SEPARATOR && key[length-1] == IIndexConstants.SECONDARY_SUFFIX ) {	30	if (length > 1 && key[length-2] == IIndexConstants.SEPARATOR && key[length-1] == IIndexConstants.SECONDARY_SUFFIX ) {
31	// This is a key of a secondary type => reset java model manager secondary types cache for document path project	31	// This is a key of a secondary type => reset java model manager secondary types cache for document path project
32	JavaModelManager manager = JavaModelManager.getJavaModelManager();	32	JavaModelManager manager = JavaModelManager.getJavaModelManager();
33	manager.resetSecondaryTypesCache(getPath());	33	manager.secondaryTypeAdding(getPath(), key);
34	// manager.addSecondaryType(getPath(), key);
35	}	34	}
36	}	35	}
37	}	36	}




			Util.verbose("NameLookup FIND SECONDARY TYPES:"); //$NON-NLS-1$
			Util.verbose(" -> pkg name: " + packageName);  //$NON-NLS-1$
			Util.verbose(" -> type name: " + typeName);  //$NON-NLS-1$
			Util.verbose(" -> project: "+project.getElementName()); //$NON-NLS-1$
		}
		JavaModelManager manager = JavaModelManager.getJavaModelManager();
		try {
			IJavaProject javaProject = project;
			Map secondaryTypePaths = manager.secondaryTypes(javaProject, waitForIndexes, monitor);
			if (secondaryTypePaths.size() > 0) {
				Map types = (Map) secondaryTypePaths.get(packageName==null?"":packageName); //$NON-NLS-1$
				if (types != null && types.size() > 0) {
					IType type = (IType) types.get(typeName);
					if (type != null) {

		// Try to find type in package fragments list
		IType type = null;
		int length= packages.length;
		HashSet projects = null;
		for (int i= 0; i < length; i++) {
			type = findType(typeName, packages[i], partialMatch, acceptFlags);
			if (type != null) {
				return type;
			}
			if (considerSecondaryTypes) {
				if (projects == null) projects = new HashSet(3);
				projects.add(packages[i].getJavaProject());
			}
		}

		// If type was not found, try to find it as secondary in source folders
		if (considerSecondaryTypes && projects != null) {
			Iterator allProjects = projects.iterator();
			while (type == null && allProjects.hasNext()) {
				type = findSecondaryType(packageName, typeName, (IJavaProject) allProjects.next(), waitForIndexes, monitor);
			}
		}
		return type;
	}




	
	private static final String ENABLE_NEW_FORMATTER = JavaCore.PLUGIN_ID + "/formatter/enable_new" ; //$NON-NLS-1$

	private final static String INDEXED_SECONDARY_TYPES = "#@*_indexing secondary cache_*@#"; //$NON-NLS-1$
	private final static HashMap NO_SECONDARY_TYPES = new HashMap(0);

	public static boolean PERF_VARIABLE_INITIALIZER = false;
	public static boolean PERF_CONTAINER_INITIALIZER = false;

		
		public IEclipsePreferences preferences;
		public Hashtable options;
		public Hashtable secondaryTypes;
		public LRUCache javadocCache;
		
		public PerProjectInfo(IProject project) {

	}

	/**
	 * Get all secondary types for a project and store result in per project info cache.
	 * 
	 * @param project Project we want get secondary types from
	 * @return HashMap Table of secondary type names->path for given project
	 */
	public HashMap getSecondaryTypes(IJavaProject project, boolean waitForIndexes, IProgressMonitor monitor) throws JavaModelException {
		if (VERBOSE) {
			StringBuffer buffer = new StringBuffer("JavaModelManager.getSecondaryTypesPaths("); //$NON-NLS-1$
			buffer.append(project.getElementName());
			buffer.append(')');
			Util.verbose(buffer.toString());
		}

		// Wait the end of indexing if requested
		final PerProjectInfo projectInfo = getPerProjectInfoCheckExistence(project.getProject());
		IndexManager manager = getIndexManager();
		boolean indexing = manager.awaitingJobsCount() > 0;
		if (indexing && waitForIndexes) {
			while (manager.awaitingJobsCount() > 0) {
				if (monitor != null && monitor.isCanceled()) {
					if (projectInfo.secondaryTypes == null) return NO_SECONDARY_TYPES;
					return projectInfo.secondaryTypes;
				}
				try {
					Thread.sleep(10);
				} catch (InterruptedException e) {
					if (projectInfo.secondaryTypes == null) return NO_SECONDARY_TYPES;
					return projectInfo.secondaryTypes;
				}
			}
		}

		// Return cache if not empty and not dirty
		if (projectInfo.secondaryTypes != null && projectInfo.secondaryTypes.get(DIRTY_CACHE) == null) {
			return projectInfo.secondaryTypes;
		}
		
		// Return cache if not waiting for indexing
		if (indexing && !waitForIndexes) {
			if (projectInfo.secondaryTypes == null) {
				return NO_SECONDARY_TYPES; // cache is not initialized return empty one
			}
			return projectInfo.secondaryTypes; // cache is dirty => return current one...
		}

		// Init variables for search
		final HashMap secondaryTypes = new HashMap(3);
		IRestrictedAccessTypeRequestor nameRequestor = new IRestrictedAccessTypeRequestor() {
			public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path, AccessRestriction access) {
				String key = packageName==null ? "" : new String(packageName); //$NON-NLS-1$
				HashMap types = (HashMap) secondaryTypes.get(key);
				if (types == null) types = new HashMap(3);
				types.put(new String(simpleTypeName), path);
				secondaryTypes.put(key, types);
			}
		};

		// Build scope using prereq projects but only source folders
		IPackageFragmentRoot[] allRoots = project.getAllPackageFragmentRoots();
		int length = allRoots.length, size = 0;
		IPackageFragmentRoot[] allSourceFolders = new IPackageFragmentRoot[length];
		for (int i=0; i<length; i++) {
			if (allRoots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
				allSourceFolders[size++] = allRoots[i];
			}
		}
		if (size < length) {
			System.arraycopy(allSourceFolders, 0, allSourceFolders = new IPackageFragmentRoot[size], 0, size);
		}

		// Search all secondary types on scope
		new BasicSearchEngine().searchAllSecondaryTypeNames(allSourceFolders, nameRequestor, monitor);
		if (VERBOSE) {
			System.out.print(Thread.currentThread() + "	-> secondary paths: ");  //$NON-NLS-1$
			System.out.println();
			Iterator keys = secondaryTypes.keySet().iterator();
			while (keys.hasNext()) {
				String qualifiedName = (String) keys.next();
				Util.verbose("		- "+qualifiedName+'-'+secondaryTypes.get(qualifiedName) ); //$NON-NLS-1$
			}
		}

		// Build types from paths
		Iterator packages = secondaryTypes.keySet().iterator();
		while (packages.hasNext()) {
			String packName = (String) packages.next();
			HashMap types = (HashMap) secondaryTypes.get(packName);
			Iterator names = types.keySet().iterator();
			while (names.hasNext()) {
				String typeName = (String) names.next();
				String path = (String) types.get(typeName);
				if (org.eclipse.jdt.internal.core.util.Util.isJavaLikeFileName(path)) {
					IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(path));
					ICompilationUnit unit = JavaModelManager.createCompilationUnitFrom(file, null);
					IType type = unit.getType(typeName);
					types.put(typeName, type); // replace stored path with type itself
				}
			}
		}

		// Store result in per project info cache if still null or dirty (may have been set by another thread...)
		if (projectInfo.secondaryTypes == null || projectInfo.secondaryTypes.get(DIRTY_CACHE) != null) {
			projectInfo.secondaryTypes = secondaryTypes;
		}
		return projectInfo.secondaryTypes;
	}

	/**
	 * Returns the temporary cache for newly opened elements for the current thread.
	 * Creates it if not already created.
	 */

		MANAGER = new JavaModelManager();
	}

	/**
	 * Remove a file from its project secondary types cache.
	 * 
	 * @param file File to remove
	 */
	public void removeFromSecondaryTypesCache(IFile file) {
		if (VERBOSE) {
			StringBuffer buffer = new StringBuffer("JavaModelManager.removeSecondaryTypePaths("); //$NON-NLS-1$
			buffer.append(file.getName());
			buffer.append(')');
			Util.verbose(buffer.toString());
		}
		if (file != null) {
			PerProjectInfo projectInfo = getPerProjectInfo(file.getProject(), false);
			if (projectInfo != null && projectInfo.secondaryTypes != null) {
				if (VERBOSE) {
					Util.verbose("-> remove file from cache of project: "+file.getProject().getName()); //$NON-NLS-1$
				}
				Iterator packages = projectInfo.secondaryTypes.keySet().iterator();
				while (packages.hasNext()) {
					String packName = (String) packages.next();
					Object object = projectInfo.secondaryTypes.get(packName);
					if (object instanceof HashMap) {
						HashMap types = (HashMap) object;
						Iterator names = types.keySet().iterator();
						while (names.hasNext()) {
							String typeName = (String) names.next();
							IType type = (IType) types.get(typeName);
							if (file.equals(type.getResource())) {
								types.remove(typeName);
								if (types.size() == 0) {
									projectInfo.secondaryTypes.remove(packName);
								}
								return;
							}
						}
					}
				}
			}
		}
	}

	/**
	 * Reset secondary types cache for a project got from given path.
	 * If secondary types cache already exist, do not reset it now to avoid
	 * cache desynchronization (this reset is done in indexing thread...).
	 * Instead flag the cache as dirty to store the fact that current cache
	 * should be recomputed when indexing will be ended.
	 * 
	 * @param path Path of file containing a secondary type
	 */
	public void resetSecondaryTypesCache(String path) {
		if (VERBOSE) {
			StringBuffer buffer = new StringBuffer("JavaModelManager.resetSecondaryTypePaths("); //$NON-NLS-1$
			buffer.append(path);
			buffer.append(')');
			Util.verbose(buffer.toString());
		}
		IWorkspaceRoot wRoot = ResourcesPlugin.getWorkspace().getRoot();
		IResource resource = wRoot.findMember(path);
		if (resource != null) {
			PerProjectInfo projectInfo = getPerProjectInfo(resource.getProject(), false);
			if (projectInfo != null) {
				if (VERBOSE) {
					Util.verbose("-> reset cache for project: "+resource.getProject().getName()); //$NON-NLS-1$
				}
				if (projectInfo.secondaryTypes != null) {
					Object dirty = projectInfo.secondaryTypes.get(DIRTY_CACHE);
					if (dirty == null) {
						projectInfo.secondaryTypes.put(DIRTY_CACHE, resource);
					} else {
						HashSet resources = (dirty instanceof HashSet) ? (HashSet) dirty : new HashSet(3);
						resources.add(resource);
						projectInfo.secondaryTypes.put(DIRTY_CACHE, resource);
					}
				}
			}
		}
	}

	/*
	 * Resets the temporary cache for newly created elements to null.
	 */

	}

	/**
	 * Add a secondary type in temporary indexing cache for a project got from given path.
	 * 
	 * Current secondary types cache is not modified as we want to wait that indexing
	 * was finished before taking new secondary types into account.
	 * 
	 * Indexing cache is a specific entry in secondary types cache which key is
	 * {@link #INDEXED_SECONDARY_TYPES } and value a map with same structure than
	 * secondary types cache itself.
	 * 
	 * @see #secondaryTypes(IJavaProject, boolean, IProgressMonitor)
	 */
	public void secondaryTypeAdding(String path, char[] key) {
		if (VERBOSE) {
			StringBuffer buffer = new StringBuffer("JavaModelManager.addSecondaryType("); //$NON-NLS-1$
			buffer.append(path);
			buffer.append(',');
			buffer.append('[');
			buffer.append(new String(key));
			buffer.append(']');
			buffer.append(')');
			Util.verbose(buffer.toString());
		}
		IWorkspaceRoot wRoot = ResourcesPlugin.getWorkspace().getRoot();
		IResource resource = wRoot.findMember(path);
		if (resource != null) {
			if (org.eclipse.jdt.internal.core.util.Util.isJavaLikeFileName(path) && resource.getType() == IResource.FILE) {
				IProject project = resource.getProject();
				try {
					PerProjectInfo projectInfo = getPerProjectInfoCheckExistence(project);
					// Get or create map to cache secondary types while indexing (can be not synchronized as indexing insure a non-concurrent usage)
					HashMap indexedSecondaryTypes = null;
					if (projectInfo.secondaryTypes == null) {
						projectInfo.secondaryTypes = new Hashtable(3);
						indexedSecondaryTypes = new HashMap(3);
						projectInfo.secondaryTypes.put(INDEXED_SECONDARY_TYPES, indexedSecondaryTypes);
					} else {
						indexedSecondaryTypes = (HashMap) projectInfo.secondaryTypes.get(INDEXED_SECONDARY_TYPES);
						if (indexedSecondaryTypes == null) {
							indexedSecondaryTypes = new HashMap(3);
							projectInfo.secondaryTypes.put(INDEXED_SECONDARY_TYPES, indexedSecondaryTypes);
						}
					}
					// Store the secondary type in temporary cache (these are just handles => no problem to create it now...)
					HashMap allTypes = (HashMap) indexedSecondaryTypes.get(resource);
					if (allTypes == null) {
						allTypes = new HashMap(3);
						indexedSecondaryTypes.put(resource, allTypes);
					}
					ICompilationUnit unit = JavaModelManager.createCompilationUnitFrom((IFile)resource, null);
					if (unit != null) {
						char[][] names = CharOperation.splitOn('/', key);
						String typeName = new String(names[0]);
						String packName = new String(names[1]);
						HashMap packageTypes = (HashMap) allTypes.get(packName);
						if (packageTypes == null) {
							packageTypes = new HashMap(3);
							allTypes.put(packName, packageTypes);
						}
						packageTypes.put(typeName, unit.getType(typeName));
					}
					if (VERBOSE) {
						Util.verbose("	- indexing cache:"); //$NON-NLS-1$
						Iterator keys = indexedSecondaryTypes.keySet().iterator();
						while (keys.hasNext()) {
							IFile file = (IFile) keys.next();
							Util.verbose("		+ "+file.getFullPath()+':'+indexedSecondaryTypes.get(file) ); //$NON-NLS-1$
						}
					}
				}
				catch (JavaModelException jme) {
					// do nothing
				}
			}
		}
	}

	/**
	 * Get all secondary types for a project and store result in per project info cache.
	 * 
	 * This cache is an Hashtable<String, HashMap<String, IType>>:
	 * 	- key: package name
	 * 	- value:
	 * 		+ key: type name
	 * 		+ value: java model handle for the secondary type
	 * Hashtable was used to protect callers from possible concurrent access.
	 * 
	 * Note that this map may have a specific entry which key is {@link #INDEXED_SECONDARY_TYPES }
	 * and value is a map containing all secondary types created during indexing.
	 * When this key is in cache and indexing is finished, returned map is merged
	 * with the value of this special key. If indexing is not finished and caller does
	 * not wait for the end of indexing, returned map is the current secondary
	 * types cache content which may be invalid...
	 * 
	 * @param project Project we want get secondary types from
	 * @return HashMap Table of secondary type names->path for given project
	 */
	public Map secondaryTypes(IJavaProject project, boolean waitForIndexes, IProgressMonitor monitor) throws JavaModelException {
		if (VERBOSE) {
			StringBuffer buffer = new StringBuffer("JavaModelManager.secondaryTypes("); //$NON-NLS-1$
			buffer.append(project.getElementName());
			buffer.append(',');
			buffer.append(waitForIndexes);
			buffer.append(')');
			Util.verbose(buffer.toString());
		}

		// Return cache if not empty and there's no new secondary types created during indexing
		final PerProjectInfo projectInfo = getPerProjectInfoCheckExistence(project.getProject());
		Map indexingSecondaryCache = projectInfo.secondaryTypes == null ? null : (Map) projectInfo.secondaryTypes.get(INDEXED_SECONDARY_TYPES);
		if (projectInfo.secondaryTypes != null && indexingSecondaryCache == null) {
			return projectInfo.secondaryTypes;
		}

		// Perform search request only if secondary types cache is not initialized yet (this will happen only once!)
		if (projectInfo.secondaryTypes == null) {
			return secondaryTypesSearching(project, waitForIndexes, monitor, projectInfo);
		}

		// New secondary types have been created while indexing secondary types cache
		// => need to know whether the indexing is finished or not
		boolean indexing = this.indexManager.awaitingJobsCount() > 0;
		if (indexing) {
			if (!waitForIndexes)  {
				// Indexing is running but caller cannot wait => return current cache
				return projectInfo.secondaryTypes;
			}

			// Wait for the end of indexing or a cancel
			while (this.indexManager.awaitingJobsCount() > 0) {
				if (monitor != null && monitor.isCanceled()) {
					return projectInfo.secondaryTypes;
				}
				try {
					Thread.sleep(10);
				} catch (InterruptedException e) {
					return projectInfo.secondaryTypes;
				}
			}
		}

		// Indexing is finished => merge caches and return result
		return secondaryTypesMerging(projectInfo.secondaryTypes);
	}
	
	/*
	 * Return secondary types cache merged with new secondary types created while indexing
	 * Note that merge result is directly stored in given parameter map.
	 */
	private Hashtable secondaryTypesMerging(Hashtable secondaryTypes) {
		if (VERBOSE) {
			Util.verbose("JavaModelManager.getSecondaryTypesMerged()"); //$NON-NLS-1$
			Util.verbose("	- current cache to merge:"); //$NON-NLS-1$
			Iterator keys = secondaryTypes.keySet().iterator();
			while (keys.hasNext()) {
				String packName = (String) keys.next();
				Util.verbose("		+ "+packName+':'+secondaryTypes.get(packName) ); //$NON-NLS-1$
			}
		}

		// Return current cache if there's no indexing cache (double check, this should not happen)
		HashMap indexedSecondaryTypes = (HashMap) secondaryTypes.remove(INDEXED_SECONDARY_TYPES);
		if (indexedSecondaryTypes == null) {
			return secondaryTypes;
		}

		// Merge indexing cache in secondary types one
		Iterator files = indexedSecondaryTypes.keySet().iterator();
		while (files.hasNext()) {
			IFile file = (IFile) files.next();
	
			// Remove all secondary types of indexed file from cache
			secondaryTypesRemoving(secondaryTypes, file);
			
			// Add all indexing file secondary types in given secondary types cache
			HashMap fileSecondaryTypes = (HashMap) indexedSecondaryTypes.get(file);
			Iterator packages = fileSecondaryTypes.keySet().iterator();
			while (packages.hasNext()) {
				String packageName = (String) packages.next();
				HashMap cachedTypes = (HashMap) secondaryTypes.get(packageName);
				if (cachedTypes == null) {
					secondaryTypes.put(packageName, fileSecondaryTypes.get(packageName));
				} else {
					HashMap types = (HashMap) fileSecondaryTypes.get(packageName);
					Iterator typeNames = types.keySet().iterator();
					while (typeNames.hasNext()) {
						String typeName = (String) typeNames.next();
						cachedTypes.put(typeName, types.get(typeName));
					}
				}
			}
		}
		if (VERBOSE) {
			Util.verbose("	- secondary types cache merged:"); //$NON-NLS-1$
			Iterator keys = secondaryTypes.keySet().iterator();
			while (keys.hasNext()) {
				String packName = (String) keys.next();
				Util.verbose("		+ "+packName+':'+secondaryTypes.get(packName) ); //$NON-NLS-1$
			}
		}
		return secondaryTypes;
	}

	/*
	 * Perform search request to get all secondary types of a given project.
	 * If not waiting for indexes and indexing is running, will return types found in current built indexes...
	 */
	private Map secondaryTypesSearching(IJavaProject project, boolean waitForIndexes, IProgressMonitor monitor, final PerProjectInfo projectInfo) throws JavaModelException {
		if (VERBOSE || BasicSearchEngine.VERBOSE) {
			StringBuffer buffer = new StringBuffer("JavaModelManager.secondaryTypesSearch("); //$NON-NLS-1$
			buffer.append(project.getElementName());
			buffer.append(',');
			buffer.append(waitForIndexes);
			buffer.append(')');
			Util.verbose(buffer.toString());
		}

		final Hashtable secondaryTypes = new Hashtable(3);
		IRestrictedAccessTypeRequestor nameRequestor = new IRestrictedAccessTypeRequestor() {
			public void acceptType(int modifiers, char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path, AccessRestriction access) {
				String key = packageName==null ? "" : new String(packageName); //$NON-NLS-1$
				HashMap types = (HashMap) secondaryTypes.get(key);
				if (types == null) types = new HashMap(3);
				types.put(new String(simpleTypeName), path);
				secondaryTypes.put(key, types);
			}
		};

		// Build scope using prereq projects but only source folders
		IPackageFragmentRoot[] allRoots = project.getAllPackageFragmentRoots();
		int length = allRoots.length, size = 0;
		IPackageFragmentRoot[] allSourceFolders = new IPackageFragmentRoot[length];
		for (int i=0; i<length; i++) {
			if (allRoots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
				allSourceFolders[size++] = allRoots[i];
			}
		}
		if (size < length) {
			System.arraycopy(allSourceFolders, 0, allSourceFolders = new IPackageFragmentRoot[size], 0, size);
		}

		// Search all secondary types on scope
		new BasicSearchEngine().searchAllSecondaryTypeNames(allSourceFolders, nameRequestor, waitForIndexes, monitor);

		// Build types from paths
		Iterator packages = secondaryTypes.keySet().iterator();
		while (packages.hasNext()) {
			String packName = (String) packages.next();
			HashMap types = (HashMap) secondaryTypes.get(packName);
			Iterator names = types.keySet().iterator();
			while (names.hasNext()) {
				String typeName = (String) names.next();
				String path = (String) types.get(typeName);
				if (org.eclipse.jdt.internal.core.util.Util.isJavaLikeFileName(path)) {
					IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(path));
					ICompilationUnit unit = JavaModelManager.createCompilationUnitFrom(file, null);
					IType type = unit.getType(typeName);
					types.put(typeName, type); // replace stored path with type itself
				}
			}
		}

		// Store result in per project info cache if still null or there's still an indexing cache (may have been set by another thread...)
		if (projectInfo.secondaryTypes == null || projectInfo.secondaryTypes.get(INDEXED_SECONDARY_TYPES) != null) {
			projectInfo.secondaryTypes = secondaryTypes;
			if (VERBOSE || BasicSearchEngine.VERBOSE) {
				System.out.print(Thread.currentThread() + "	-> secondary paths stored in cache: ");  //$NON-NLS-1$
				System.out.println();
				Iterator keys = secondaryTypes.keySet().iterator();
				while (keys.hasNext()) {
					String qualifiedName = (String) keys.next();
					Util.verbose("		- "+qualifiedName+'-'+secondaryTypes.get(qualifiedName) ); //$NON-NLS-1$
				}
			}
		}
		return projectInfo.secondaryTypes;
	}

	/**
	 * Remove from secondary types cache all types belonging to a given file.
	 * Clean secondary types cache built while indexing if requested.
	 * 
	 * Project's secondary types cache is found using file location.
	 * 
	 * @param file File to remove
	 */
	public void secondaryTypesRemoving(IFile file, boolean cleanIndexCache) {
		if (VERBOSE) {
			StringBuffer buffer = new StringBuffer("JavaModelManager.removeFromSecondaryTypesCache("); //$NON-NLS-1$
			buffer.append(file.getName());
			buffer.append(')');
			Util.verbose(buffer.toString());
		}
		if (file != null) {
			PerProjectInfo projectInfo = getPerProjectInfo(file.getProject(), false);
			if (projectInfo != null && projectInfo.secondaryTypes != null) {
				if (VERBOSE) {
					Util.verbose("-> remove file from cache of project: "+file.getProject().getName()); //$NON-NLS-1$
				}

				// Clean current cache
				secondaryTypesRemoving(projectInfo.secondaryTypes, file);
				
				// Clean indexing cache if necessary
				if (!cleanIndexCache) return;
				HashMap indexingCache = (HashMap) projectInfo.secondaryTypes.get(INDEXED_SECONDARY_TYPES);
				if (indexingCache != null) {
					Set keys = indexingCache.keySet();
					int filesSize = keys.size(), filesCount = 0;
					IFile[] removed = null;
					Iterator cachedFiles = keys.iterator();
					while (cachedFiles.hasNext()) {
						IFile cachedFile = (IFile) cachedFiles.next();
						if (file.equals(cachedFile)) {
							if (removed == null) removed = new IFile[filesSize];
							filesSize--;
							removed[filesCount++] = cachedFile;
						}
					}
					for (int i=0; i<filesCount; i++) {
						indexingCache.remove(removed[i]);
					}
				}
			}
		}
	}

	/*
	 * Remove from a given cache map all secondary types belonging to a given file.
	 * Note that there can have several secondary types per file...
	 */
	private void secondaryTypesRemoving(Hashtable secondaryTypesMap, IFile file) {
		if (VERBOSE) {
			StringBuffer buffer = new StringBuffer("JavaModelManager.removeSecondaryTypesFromMap("); //$NON-NLS-1$
			Iterator keys = secondaryTypesMap.keySet().iterator();
			while (keys.hasNext()) {
				String qualifiedName = (String) keys.next();
				buffer.append(qualifiedName+':'+secondaryTypesMap.get(qualifiedName));
			}
			buffer.append(',');
			buffer.append(file.getFullPath());
			buffer.append(')');
			Util.verbose(buffer.toString());
		}
		Set packageKeys = secondaryTypesMap.keySet();
		int packagesSize = packageKeys.size(), removedPackagesCount = 0;
		String[] removedPackages = null;
		Iterator packages = packageKeys.iterator();
		while (packages.hasNext()) {
			String packName = (String) packages.next();
			if (packName != INDEXED_SECONDARY_TYPES) { // skip indexing cache entry if present (!= is intentional)
				HashMap types = (HashMap) secondaryTypesMap.get(packName);
				Set nameKeys = types.keySet();
				int namesSize = nameKeys.size(), removedNamesCount = 0;
				String[] removedNames = null;
				Iterator names = nameKeys.iterator();
				while (names.hasNext()) {
					String typeName = (String) names.next();
					IType type = (IType) types.get(typeName);
					if (file.equals(type.getResource())) {
						if (removedNames == null) removedNames = new String[namesSize];
						namesSize--;
						removedNames[removedNamesCount++] = typeName;
					}
				}
				for (int i=0; i<removedNamesCount; i++) {
					types.remove(removedNames[i]);
				}
				if (types.size() == 0) {
					if (removedPackages == null) removedPackages = new String[packagesSize];
					packagesSize--;
					removedPackages[removedPackagesCount++] = packName;
				}
			}
		}
		for (int i=0; i<removedPackagesCount; i++) {
			secondaryTypesMap.remove(removedPackages[i]);
		}
		if (VERBOSE) {
			Util.verbose("	- new secondary types map:"); //$NON-NLS-1$
			Iterator keys = secondaryTypesMap.keySet().iterator();
			while (keys.hasNext()) {
				String qualifiedName = (String) keys.next();
				Util.verbose("		+ "+qualifiedName+':'+secondaryTypesMap.get(qualifiedName) ); //$NON-NLS-1$
			}
		}
	}

	/**
	 * Record the order in which to build the java projects (batch build). This order is based
	 * on the projects classpath settings.
	 */

Lines 2398-2407 Link Here

(-)model/org/eclipse/jdt/internal/core/DeltaProcessor.java (-1 / +4 lines)
2398	break;	2398	break;
2399	case IResourceDelta.ADDED :	2399	case IResourceDelta.ADDED :
2400	indexManager.addSource(file, file.getProject().getFullPath());	2400	indexManager.addSource(file, file.getProject().getFullPath());
		2401	// Clean file from secondary types cache but do not update indexing secondary type cache as it will be updated through indexing itself
		2402	this.manager.secondaryTypesRemoving(file, false);
2401	break;	2403	break;
2402	case IResourceDelta.REMOVED :	2404	case IResourceDelta.REMOVED :
2403	indexManager.remove(Util.relativePath(file.getFullPath(), 1/remove project segment/), file.getProject().getFullPath());	2405	indexManager.remove(Util.relativePath(file.getFullPath(), 1/remove project segment/), file.getProject().getFullPath());
2404	this.manager.removeFromSecondaryTypesCache(file);	2406	// Clean file from secondary types cache and update indexing secondary type cache as indexing cannot remove secondary types from cache
		2407	this.manager.secondaryTypesRemoving(file, true);
2405	break;	2408	break;
2406	}	2409	}
2407	}	2410	}

Lines 11-20 Link Here

(-)src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java (-10 / +211 lines)
11	package org.eclipse.jdt.core.tests.model;	11	package org.eclipse.jdt.core.tests.model;
12		12
13		13
		14	import java.io.File;
14	import java.io.IOException;	15	import java.io.IOException;
15		16
16	import junit.framework.Test;	17	import junit.framework.Test;
17		18
		19	import org.eclipse.core.resources.IFile;
		20	import org.eclipse.core.resources.IResource;
18	import org.eclipse.core.resources.IWorkspaceRunnable;	21	import org.eclipse.core.resources.IWorkspaceRunnable;
19	import org.eclipse.core.runtime.CoreException;	22	import org.eclipse.core.runtime.CoreException;
20	import org.eclipse.core.runtime.IProgressMonitor;	23	import org.eclipse.core.runtime.IProgressMonitor;
Lines 92-100 Link Here
92	// Use this static initializer to specify subset for tests	95	// Use this static initializer to specify subset for tests
93	// All specified tests which do not belong to the class are skipped...	96	// All specified tests which do not belong to the class are skipped...
94	static {	97	static {
		98	// JavaModelManager.VERBOSE = true;
		99	// org.eclipse.jdt.internal.core.search.BasicSearchEngine.VERBOSE = true;
95	// TESTS_PREFIX = "testBug36032";	100	// TESTS_PREFIX = "testBug36032";
96	// TESTS_NAMES = new String[] { "testTypeWithDollarName" };	101	// TESTS_NAMES = new String[] { "testBug118823b" };
97	// TESTS_NUMBERS = new int[] { 114338 };	102	// TESTS_NUMBERS = new int[] { 118823 };
98	// TESTS_RANGE = new int[] { 16, -1 };	103	// TESTS_RANGE = new int[] { 16, -1 };
99	}	104	}
100	public static Test suite() {	105	public static Test suite() {
Lines 104-110 Link Here
104	assertProblems(message, expected, this.problemRequestor);	109	assertProblems(message, expected, this.problemRequestor);
105	}	110	}
106	// Expect no error as soon as indexing is finished	111	// Expect no error as soon as indexing is finished
107	protected void assertNoProblem(char[] source) throws InterruptedException, JavaModelException {	112	protected void assertNoProblem(char[] source, ICompilationUnit unit) throws InterruptedException, JavaModelException {
108	IndexManager indexManager = JavaModelManager.getJavaModelManager().getIndexManager();	113	IndexManager indexManager = JavaModelManager.getJavaModelManager().getIndexManager();
109	if (this.problemRequestor.problemCount > 0) {	114	if (this.problemRequestor.problemCount > 0) {
110	// If errors then wait for indexes to finish	115	// If errors then wait for indexes to finish
Lines 113-119 Link Here
113	}	118	}
114	// Reconcile again to see if error goes away	119	// Reconcile again to see if error goes away
115	this.problemRequestor.initialize(source);	120	this.problemRequestor.initialize(source);
116	this.workingCopy.reconcile(AST.JLS3, true, null, null);	121	unit.reconcile(AST.JLS3, true, null, null);
117	if (this.problemRequestor.problemCount > 0) {	122	if (this.problemRequestor.problemCount > 0) {
118	assertEquals("Working copy should NOT have any problem!", "", this.problemRequestor.problems.toString());	123	assertEquals("Working copy should NOT have any problem!", "", this.problemRequestor.problems.toString());
119	}	124	}
Lines 2489-2495 Link Here
2489	/**	2494	/**
2490	* Bug 36032:[plan] JavaProject.findType() fails to find second type in source file	2495	* Bug 36032:[plan] JavaProject.findType() fails to find second type in source file
2491	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=36032"	2496	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=36032"
2492	*
2493	*/	2497	*/
2494	public void testBug36032a() throws CoreException, InterruptedException {	2498	public void testBug36032a() throws CoreException, InterruptedException {
2495	try {	2499	try {
Lines 2516-2522 Link Here
2516	this.workingCopy = getCompilationUnit("/P/Test.java").getWorkingCopy(new WorkingCopyOwner() {}, problemRequestor, null);	2520	this.workingCopy = getCompilationUnit("/P/Test.java").getWorkingCopy(new WorkingCopyOwner() {}, problemRequestor, null);
2517	this.workingCopy.getBuffer().setContents(source);	2521	this.workingCopy.getBuffer().setContents(source);
2518	this.workingCopy.reconcile(AST.JLS3, true, null, null);	2522	this.workingCopy.reconcile(AST.JLS3, true, null, null);
2519	assertNoProblem(sourceChars);	2523	assertNoProblem(sourceChars, this.workingCopy);
2520		2524
2521	// Add new secondary type	2525	// Add new secondary type
2522	this.createFile(	2526	this.createFile(
Lines 2536-2542 Link Here
2536	this.problemRequestor.initialize(sourceChars);	2540	this.problemRequestor.initialize(sourceChars);
2537	this.workingCopy.getBuffer().setContents(source);	2541	this.workingCopy.getBuffer().setContents(source);
2538	this.workingCopy.reconcile(AST.JLS3, true, null, null);	2542	this.workingCopy.reconcile(AST.JLS3, true, null, null);
2539	assertNoProblem(sourceChars);	2543	assertNoProblem(sourceChars, this.workingCopy);
2540	} finally {	2544	} finally {
2541	deleteProject("P");	2545	deleteProject("P");
2542	}	2546	}
Lines 2571-2577 Link Here
2571	this.workingCopy = getCompilationUnit("/P/Test.java").getWorkingCopy(new WorkingCopyOwner() {}, this.problemRequestor, null);	2575	this.workingCopy = getCompilationUnit("/P/Test.java").getWorkingCopy(new WorkingCopyOwner() {}, this.problemRequestor, null);
2572	this.workingCopy.getBuffer().setContents(source);	2576	this.workingCopy.getBuffer().setContents(source);
2573	this.workingCopy.reconcile(AST.JLS3, true, null, null);	2577	this.workingCopy.reconcile(AST.JLS3, true, null, null);
2574	assertNoProblem(sourceChars);	2578	assertNoProblem(sourceChars, this.workingCopy);
2575		2579
2576	// Delete secondary type => should get a problem	2580	// Delete secondary type => should get a problem
2577	waitUntilIndexesReady();	2581	waitUntilIndexesReady();
Lines 2599-2605 Link Here
2599	this.problemRequestor.initialize(sourceChars);	2603	this.problemRequestor.initialize(sourceChars);
2600	this.workingCopy.getBuffer().setContents(source);	2604	this.workingCopy.getBuffer().setContents(source);
2601	this.workingCopy.reconcile(AST.JLS3, true, null, null);	2605	this.workingCopy.reconcile(AST.JLS3, true, null, null);
2602	assertNoProblem(sourceChars);	2606	assertNoProblem(sourceChars, this.workingCopy);
2603	} finally {	2607	} finally {
2604	deleteProject("P");	2608	deleteProject("P");
2605	}	2609	}
Lines 2646-2652 Link Here
2646	this.workingCopy = getCompilationUnit("/P2/test/Test2.java").getWorkingCopy(new WorkingCopyOwner() {}, this.problemRequestor, null);	2650	this.workingCopy = getCompilationUnit("/P2/test/Test2.java").getWorkingCopy(new WorkingCopyOwner() {}, this.problemRequestor, null);
2647	this.workingCopy.getBuffer().setContents(source);	2651	this.workingCopy.getBuffer().setContents(source);
2648	this.workingCopy.reconcile(AST.JLS3, true, null, null);	2652	this.workingCopy.reconcile(AST.JLS3, true, null, null);
2649	assertNoProblem(sourceChars);	2653	assertNoProblem(sourceChars, this.workingCopy);
		2654	} finally {
		2655	deleteProject("P1");
		2656	deleteProject("P2");
		2657	}
		2658	}
		2659	/**
		2660	* Bug 118823: [model] Secondary types cache not reset while removing _all_ secondary types from CU
		2661	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=118823"
		2662	*/
		2663	public void testBug118823() throws CoreException, InterruptedException, IOException {
		2664	try {
		2665	// Resources creation
		2666	IJavaProject project = createJavaProject("P1", new String[] {""}, new String[] {"JCL_LIB"}, "bin");
		2667	String source1 = "class Test {}\n";
		2668	IFile file = createFile(
		2669	"/P1/Test.java",
		2670	source1
		2671	);
		2672	createJavaProject("P2", new String[] {""}, new String[] {"JCL_LIB"}, new String[] { "/P1" }, "bin");
		2673	String source2 =
		2674	"class A {\n" +
		2675	" Secondary s;\n" +
		2676	"}\n";
		2677	createFile(
		2678	"/P2/A.java",
		2679	source2
		2680	);
		2681	waitUntilIndexesReady();
		2682
		2683	// Get working copies and reconcile
		2684	this.workingCopies = new ICompilationUnit[2];
		2685	this.wcOwner = new WorkingCopyOwner() {};
		2686	this.workingCopies[0] = getCompilationUnit("/P1/Test.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null);
		2687	char[] sourceChars = source1.toCharArray();
		2688	this.problemRequestor.initialize(sourceChars);
		2689	this.workingCopies[0].getBuffer().setContents(source1);
		2690	this.workingCopies[0].reconcile(AST.JLS3, true, null, null);
		2691	assertNoProblem(sourceChars, this.workingCopies[0]);
		2692	this.workingCopies[1] = getCompilationUnit("/P2/A.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null);
		2693	this.problemRequestor.initialize(source2.toCharArray());
		2694	this.workingCopies[1].getBuffer().setContents(source2);
		2695	this.workingCopies[1].reconcile(AST.JLS3, true, null, null);
		2696	assertEquals("Working copy should not find secondary type 'Secondary'!", 1, this.problemRequestor.problemCount);
		2697	assertProblems("Working copy should have problem!",
		2698	"----------\n" +
		2699	"1. ERROR in /P2/A.java (at line 2)\n" +
		2700	" Secondary s;\n" +
		2701	" ^^^^^^^^^\n" +
		2702	"Secondary cannot be resolved to a type\n" +
		2703	"----------\n"
		2704	);
		2705
		2706	// Delete file and recreate it with secondary outside eclipse
		2707	File ioFile = file.getLocation().toFile();
		2708	ioFile.delete();
		2709	source1 =
		2710	"public class Test {}\n" +
		2711	"class Secondary{}\n";
		2712	Util.createFile(ioFile.getAbsolutePath(), source1);
		2713	project.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
		2714	sourceChars = source1.toCharArray();
		2715	this.problemRequestor.initialize(sourceChars);
		2716	this.workingCopies[0].getBuffer().setContents(source1);
		2717	this.workingCopies[0].reconcile(AST.JLS3, true, null, null);
2718	assertNoProblem(sourceChars, this.workingCopies[0]);
2719	sourceChars = source2.toCharArray();
2720	this.problemRequestor.initialize(sourceChars);
2721	this.workingCopies[1].reconcile(AST.JLS3, true, null, null);
2722	assertNoProblem(sourceChars, this.workingCopies[1]);
2723	} finally {
2724	deleteProject("P1");
2725	deleteProject("P2");
2726	}
2727	}
2728	public void testBug118823b() throws CoreException, InterruptedException {
2729	try {
2730	// Resources creation
2731	createJavaProject("P1", new String[] {""}, new String[] {"JCL_LIB"}, "bin");
2732	String source1 = "class Test {}\n";
2733	createFile(
2734	"/P1/Test.java",
2735	source1
2736	);
2737	createJavaProject("P2", new String[] {""}, new String[] {"JCL_LIB"}, new String[] { "/P1" }, "bin");
2738	String source2 =
2739	"class A {\n" +
2740	" Secondary s;\n" +
2741	"}\n";
2742	createFile(
2743	"/P2/A.java",
2744	source2
2745	);
2746	waitUntilIndexesReady();
2747
2748	// Get working copies and reconcile
2749	this.workingCopies = new ICompilationUnit[2];
2750	this.wcOwner = new WorkingCopyOwner() {};
2751	this.workingCopies[0] = getCompilationUnit("/P1/Test.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null);
2752	char[] sourceChars = source1.toCharArray();
2753	this.problemRequestor.initialize(sourceChars);
2754	this.workingCopies[0].getBuffer().setContents(source1);
2755	this.workingCopies[0].reconcile(AST.JLS3, true, null, null);
2756	assertNoProblem(sourceChars, this.workingCopies[0]);
2757	this.workingCopies[1] = getCompilationUnit("/P2/A.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null);
2758	this.problemRequestor.initialize(source2.toCharArray());
2759	this.workingCopies[1].getBuffer().setContents(source2);
2760	this.workingCopies[1].reconcile(AST.JLS3, true, null, null);
2761	assertEquals("Working copy should not find secondary type 'Secondary'!", 1, this.problemRequestor.problemCount);
2762	assertProblems("Working copy should have problem!",
2763	"----------\n" +
2764	"1. ERROR in /P2/A.java (at line 2)\n" +
2765	" Secondary s;\n" +
2766	" ^^^^^^^^^\n" +
2767	"Secondary cannot be resolved to a type\n" +
2768	"----------\n"
2769	);
2770
2771	// Add secondary and verify that there's no longer any error
2772	source1 =
2773	"public class Test {}\n" +
2774	"class Secondary{}\n";
2775	sourceChars = source1.toCharArray();
2776	this.problemRequestor.initialize(sourceChars);
2777	this.workingCopies[0].getBuffer().setContents(source1);
2778	this.workingCopies[0].reconcile(AST.JLS3, true, null, null);
2779	this.workingCopies[0].commitWorkingCopy(true, null);
2780	assertNoProblem(sourceChars, this.workingCopies[0]);
2781	sourceChars = source2.toCharArray();
2782	this.problemRequestor.initialize(sourceChars);
2783	this.workingCopies[1].reconcile(AST.JLS3, true, null, null);
2784	assertNoProblem(sourceChars, this.workingCopies[1]);
2785	} finally {
2786	deleteProject("P1");
2787	deleteProject("P2");
2788	}
2789	}
2790	public void testBug118823c() throws CoreException, InterruptedException {
2791	try {
2792	// Resources creation
2793	createJavaProject("P1", new String[] {""}, new String[] {"JCL_LIB"}, "bin");
2794	String source1 = "class Test {}\n";
2795	createFile(
2796	"/P1/Test.java",
2797	source1
2798	);
2799	createJavaProject("P2", new String[] {""}, new String[] {"JCL_LIB"}, new String[] { "/P1" }, "bin");
2800	String source2 =
2801	"class A {\n" +
2802	" Secondary s;\n" +
2803	"}\n";
2804	createFile(
2805	"/P2/A.java",
2806	source2
2807	);
2808	waitUntilIndexesReady();
2809
2810	// Get working copies and reconcile
2811	this.workingCopies = new ICompilationUnit[2];
2812	this.wcOwner = new WorkingCopyOwner() {};
2813	this.workingCopies[0] = getCompilationUnit("/P1/Test.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null);
2814	char[] sourceChars = source1.toCharArray();
2815	this.problemRequestor.initialize(sourceChars);
2816	this.workingCopies[0].getBuffer().setContents(source1);
2817	this.workingCopies[0].reconcile(AST.JLS3, true, null, null);
2818	assertNoProblem(sourceChars, this.workingCopies[0]);
2819	this.workingCopies[1] = getCompilationUnit("/P2/A.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null);
2820	this.problemRequestor.initialize(source2.toCharArray());
2821	this.workingCopies[1].getBuffer().setContents(source2);
2822	this.workingCopies[1].reconcile(AST.JLS3, true, null, null);
2823	assertEquals("Working copy should not find secondary type 'Secondary'!", 1, this.problemRequestor.problemCount);
2824	assertProblems("Working copy should have problem!",
2825	"----------\n" +
2826	"1. ERROR in /P2/A.java (at line 2)\n" +
2827	" Secondary s;\n" +
2828	" ^^^^^^^^^\n" +
2829	"Secondary cannot be resolved to a type\n" +
2830	"----------\n"
2831	);
2832
2833	// Delete file and recreate it with secondary
2834	deleteFile("/P1/Test.java");
2835	source1 =
2836	"public class Test {}\n" +
2837	"class Secondary{}\n";
2838	createFile(
2839	"/P1/Test.java",
2840	source1
2841	);
2842	sourceChars = source1.toCharArray();
2843	this.problemRequestor.initialize(sourceChars);
2844	this.workingCopies[0].getBuffer().setContents(source1);
2845	this.workingCopies[0].reconcile(AST.JLS3, true, null, null);
2846	assertNoProblem(sourceChars, this.workingCopies[0]);
2847	sourceChars = source2.toCharArray();
2848	this.problemRequestor.initialize(sourceChars);
2849	this.workingCopies[1].reconcile(AST.JLS3, true, null, null);
2850	assertNoProblem(sourceChars, this.workingCopies[1]);
2650	} finally {	2851	} finally {
2651	deleteProject("P1");	2852	deleteProject("P1");
2652	deleteProject("P2");	2853	deleteProject("P2");

Return to bug 118823

Lines 723-733 Link Here

(-)search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java (-11 / +20 lines)
723	public void searchAllSecondaryTypeNames(	723	public void searchAllSecondaryTypeNames(
724	IPackageFragmentRoot[] sourceFolders,	724	IPackageFragmentRoot[] sourceFolders,
725	final IRestrictedAccessTypeRequestor nameRequestor,	725	final IRestrictedAccessTypeRequestor nameRequestor,
		726	boolean waitForIndexes,
726	IProgressMonitor progressMonitor) throws JavaModelException {	727	IProgressMonitor progressMonitor) throws JavaModelException {
727		728
728	if (VERBOSE) {	729	if (VERBOSE) {
729	Util.verbose("BasicSearchEngine.searchAllSecondaryTypeNames(char[], char[], int, int, IJavaSearchScope, IRestrictedAccessTypeRequestor, int, IProgressMonitor)"); //$NON-NLS-1$	730	Util.verbose("BasicSearchEngine.searchAllSecondaryTypeNames(IPackageFragmentRoot[], IRestrictedAccessTypeRequestor, boolean, IProgressMonitor)"); //$NON-NLS-1$
730	StringBuffer buffer = new StringBuffer(" -> source folders: "); //$NON-NLS-1$	731	StringBuffer buffer = new StringBuffer(" - source folders: "); //$NON-NLS-1$
731	int length = sourceFolders.length;	732	int length = sourceFolders.length;
732	for (int i=0; i<length; i++) {	733	for (int i=0; i<length; i++) {
733	if (i==0) {	734	if (i==0) {
Lines 737-743 Link Here
737	}	738	}
738	buffer.append(sourceFolders[i].getElementName());	739	buffer.append(sourceFolders[i].getElementName());
739	}	740	}
740	buffer.append(']');	741	buffer.append("]\n - waitForIndexes: "); //$NON-NLS-1$
		742	buffer.append(waitForIndexes);
741	Util.verbose(buffer.toString());	743	Util.verbose(buffer.toString());
742	}	744	}
743		745
Lines 792-805 Link Here
792	if (progressMonitor != null) {	794	if (progressMonitor != null) {
793	progressMonitor.beginTask(Messages.engine_searching, 100);	795	progressMonitor.beginTask(Messages.engine_searching, 100);
794	}	796	}
795	indexManager.performConcurrentJob(	797	try {
796	new PatternSearchJob(	798	indexManager.performConcurrentJob(
797	pattern,	799	new PatternSearchJob(
798	getDefaultSearchParticipant(), // Java search only	800	pattern,
799	createJavaSearchScope(sourceFolders),	801	getDefaultSearchParticipant(), // Java search only
800	searchRequestor),	802	createJavaSearchScope(sourceFolders),
801	IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,	803	searchRequestor),
802	progressMonitor == null ? null : new SubProgressMonitor(progressMonitor, 100));	804	waitForIndexes
		805	? IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH
		806	: IJavaSearchConstants.FORCE_IMMEDIATE_SEARCH,
		807	progressMonitor == null ? null : new SubProgressMonitor(progressMonitor, 100));
		808	}
		809	catch (OperationCanceledException oce) {
		810	// do nothing
		811	}
803	}	812	}
804		813
805	/**	814	/**

Lines 509-522 Link Here

(-)model/org/eclipse/jdt/internal/core/NameLookup.java (-8 / +12 lines)
509	Util.verbose("NameLookup FIND SECONDARY TYPES:"); //$NON-NLS-1$	509	Util.verbose("NameLookup FIND SECONDARY TYPES:"); //$NON-NLS-1$
510	Util.verbose(" -> pkg name: " + packageName); //$NON-NLS-1$	510	Util.verbose(" -> pkg name: " + packageName); //$NON-NLS-1$
511	Util.verbose(" -> type name: " + typeName); //$NON-NLS-1$	511	Util.verbose(" -> type name: " + typeName); //$NON-NLS-1$
512	Util.verbose(" -> projects: "+project.getElementName()); //$NON-NLS-1$	512	Util.verbose(" -> project: "+project.getElementName()); //$NON-NLS-1$
513	}	513	}
514	JavaModelManager manager = JavaModelManager.getJavaModelManager();	514	JavaModelManager manager = JavaModelManager.getJavaModelManager();
515	try {	515	try {
516	IJavaProject javaProject = project;	516	IJavaProject javaProject = project;
517	HashMap secondaryTypePaths = manager.getSecondaryTypes(javaProject, waitForIndexes, monitor);	517	Map secondaryTypePaths = manager.secondaryTypes(javaProject, waitForIndexes, monitor);
518	if (secondaryTypePaths.size() > 0) {	518	if (secondaryTypePaths.size() > 0) {
519	HashMap types = (HashMap) secondaryTypePaths.get(packageName==null?"":packageName); //$NON-NLS-1$	519	Map types = (Map) secondaryTypePaths.get(packageName==null?"":packageName); //$NON-NLS-1$
520	if (types != null && types.size() > 0) {	520	if (types != null && types.size() > 0) {
521	IType type = (IType) types.get(typeName);	521	IType type = (IType) types.get(typeName);
522	if (type != null) {	522	if (type != null) {
Lines 568-587 Link Here
568	// Try to find type in package fragments list	568	// Try to find type in package fragments list
569	IType type = null;	569	IType type = null;
570	int length= packages.length;	570	int length= packages.length;
571	IJavaProject project = null;	571	HashSet projects = null;
572	for (int i= 0; i < length; i++) {	572	for (int i= 0; i < length; i++) {
573	type = findType(typeName, packages[i], partialMatch, acceptFlags);	573	type = findType(typeName, packages[i], partialMatch, acceptFlags);
574	if (type != null) {	574	if (type != null) {
575	return type;	575	return type;
576	}	576	}
577	if (considerSecondaryTypes && project == null) {	577	if (considerSecondaryTypes) {
578	project = packages[i].getJavaProject();	578	if (projects == null) projects = new HashSet(3);
		579	projects.add(packages[i].getJavaProject());
579	}	580	}
580	}	581	}
581		582
582	// If type was not found, try to find it as secondary in source folders	583	// If type was not found, try to find it as secondary in source folders
583	if (considerSecondaryTypes && project != null) {	584	if (considerSecondaryTypes && projects != null) {
584	type = findSecondaryType(packageName, typeName, project, waitForIndexes, monitor);	585	Iterator allProjects = projects.iterator();
		586	while (type == null && allProjects.hasNext()) {
		587	type = findSecondaryType(packageName, typeName, (IJavaProject) allProjects.next(), waitForIndexes, monitor);
		588	}
585	}	589	}
586	return type;	590	return type;
587	}	591	}