Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 32533 Details for
Bug 118823
[model] Secondary types cache not reset while removing _all_ secondary types from CU
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
[patch]
New patch to fix this issue
v03.txt (text/plain), 45.43 KB, created by
Frederic Fusier
on 2006-01-05 13:37:10 EST
(
hide
)
Description:
New patch to fix this issue
Filename:
MIME Type:
Creator:
Frederic Fusier
Created:
2006-01-05 13:37:10 EST
Size:
45.43 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.jdt.core >Index: search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java,v >retrieving revision 1.26 >diff -u -r1.26 BasicSearchEngine.java >--- search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java 5 Dec 2005 15:52:20 -0000 1.26 >+++ search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java 5 Jan 2006 17:06:21 -0000 >@@ -723,11 +723,12 @@ > public void searchAllSecondaryTypeNames( > IPackageFragmentRoot[] sourceFolders, > final IRestrictedAccessTypeRequestor nameRequestor, >+ boolean waitForIndexes, > IProgressMonitor progressMonitor) throws JavaModelException { > > if (VERBOSE) { >- Util.verbose("BasicSearchEngine.searchAllSecondaryTypeNames(char[], char[], int, int, IJavaSearchScope, IRestrictedAccessTypeRequestor, int, IProgressMonitor)"); //$NON-NLS-1$ >- StringBuffer buffer = new StringBuffer(" -> source folders: "); //$NON-NLS-1$ >+ 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) { >@@ -737,7 +738,8 @@ > } > buffer.append(sourceFolders[i].getElementName()); > } >- buffer.append(']'); >+ buffer.append("]\n - waitForIndexes: "); //$NON-NLS-1$ >+ buffer.append(waitForIndexes); > Util.verbose(buffer.toString()); > } > >@@ -792,14 +794,21 @@ > if (progressMonitor != null) { > progressMonitor.beginTask(Messages.engine_searching, 100); > } >- indexManager.performConcurrentJob( >- new PatternSearchJob( >- pattern, >- getDefaultSearchParticipant(), // Java search only >- createJavaSearchScope(sourceFolders), >- searchRequestor), >- IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, >- progressMonitor == null ? null : new SubProgressMonitor(progressMonitor, 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 >+ } > } > > /** >Index: search/org/eclipse/jdt/internal/core/search/indexing/InternalSearchDocument.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/InternalSearchDocument.java,v >retrieving revision 1.5 >diff -u -r1.5 InternalSearchDocument.java >--- search/org/eclipse/jdt/internal/core/search/indexing/InternalSearchDocument.java 5 Dec 2005 15:52:20 -0000 1.5 >+++ search/org/eclipse/jdt/internal/core/search/indexing/InternalSearchDocument.java 5 Jan 2006 17:06:22 -0000 >@@ -30,8 +30,7 @@ > if (length > 1 && key[length-2] == IIndexConstants.SEPARATOR && key[length-1] == IIndexConstants.SECONDARY_SUFFIX ) { > // This is a key of a secondary type => reset java model manager secondary types cache for document path project > JavaModelManager manager = JavaModelManager.getJavaModelManager(); >- manager.resetSecondaryTypesCache(getPath()); >-// manager.addSecondaryType(getPath(), key); >+ manager.secondaryTypeAdding(getPath(), key); > } > } > } >Index: model/org/eclipse/jdt/internal/core/NameLookup.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NameLookup.java,v >retrieving revision 1.98 >diff -u -r1.98 NameLookup.java >--- model/org/eclipse/jdt/internal/core/NameLookup.java 5 Jan 2006 14:02:44 -0000 1.98 >+++ model/org/eclipse/jdt/internal/core/NameLookup.java 5 Jan 2006 17:06:21 -0000 >@@ -509,14 +509,14 @@ > 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(" -> projects: "+project.getElementName()); //$NON-NLS-1$ >+ Util.verbose(" -> project: "+project.getElementName()); //$NON-NLS-1$ > } > JavaModelManager manager = JavaModelManager.getJavaModelManager(); > try { > IJavaProject javaProject = project; >- HashMap secondaryTypePaths = manager.getSecondaryTypes(javaProject, waitForIndexes, monitor); >+ Map secondaryTypePaths = manager.secondaryTypes(javaProject, waitForIndexes, monitor); > if (secondaryTypePaths.size() > 0) { >- HashMap types = (HashMap) secondaryTypePaths.get(packageName==null?"":packageName); //$NON-NLS-1$ >+ 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) { >@@ -568,20 +568,24 @@ > // Try to find type in package fragments list > IType type = null; > int length= packages.length; >- IJavaProject project = null; >+ HashSet projects = null; > for (int i= 0; i < length; i++) { > type = findType(typeName, packages[i], partialMatch, acceptFlags); > if (type != null) { > return type; > } >- if (considerSecondaryTypes && project == null) { >- project = packages[i].getJavaProject(); >+ 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 && project != null) { >- type = findSecondaryType(packageName, typeName, project, waitForIndexes, monitor); >+ if (considerSecondaryTypes && projects != null) { >+ Iterator allProjects = projects.iterator(); >+ while (type == null && allProjects.hasNext()) { >+ type = findSecondaryType(packageName, typeName, (IJavaProject) allProjects.next(), waitForIndexes, monitor); >+ } > } > return type; > } >Index: model/org/eclipse/jdt/internal/core/JavaModelManager.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java,v >retrieving revision 1.312 >diff -u -r1.312 JavaModelManager.java >--- model/org/eclipse/jdt/internal/core/JavaModelManager.java 5 Jan 2006 16:24:48 -0000 1.312 >+++ model/org/eclipse/jdt/internal/core/JavaModelManager.java 5 Jan 2006 17:06:20 -0000 >@@ -172,8 +172,7 @@ > > private static final String ENABLE_NEW_FORMATTER = JavaCore.PLUGIN_ID + "/formatter/enable_new" ; //$NON-NLS-1$ > >- private final static String DIRTY_CACHE = "***dirty***"; //$NON-NLS-1$ >- private final static HashMap NO_SECONDARY_TYPES = new HashMap(0); >+ private final static String INDEXED_SECONDARY_TYPES = "#@*_indexing secondary cache_*@#"; //$NON-NLS-1$ > > public static boolean PERF_VARIABLE_INITIALIZER = false; > public static boolean PERF_CONTAINER_INITIALIZER = false; >@@ -820,7 +819,7 @@ > > public IEclipsePreferences preferences; > public Hashtable options; >- public HashMap secondaryTypes; >+ public Hashtable secondaryTypes; > public LRUCache javadocCache; > > public PerProjectInfo(IProject project) { >@@ -1435,114 +1434,6 @@ > } > > /** >- * 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. > */ >@@ -2400,86 +2291,6 @@ > 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. > */ >@@ -2694,6 +2505,394 @@ > } > > /** >+ * 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. > */ >Index: model/org/eclipse/jdt/internal/core/DeltaProcessor.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java,v >retrieving revision 1.271 >diff -u -r1.271 DeltaProcessor.java >--- model/org/eclipse/jdt/internal/core/DeltaProcessor.java 25 Nov 2005 16:44:45 -0000 1.271 >+++ model/org/eclipse/jdt/internal/core/DeltaProcessor.java 5 Jan 2006 17:06:18 -0000 >@@ -2398,10 +2398,13 @@ > break; > case IResourceDelta.ADDED : > indexManager.addSource(file, file.getProject().getFullPath()); >+ // Clean file from secondary types cache but do not update indexing secondary type cache as it will be updated through indexing itself >+ this.manager.secondaryTypesRemoving(file, false); > break; > case IResourceDelta.REMOVED : > indexManager.remove(Util.relativePath(file.getFullPath(), 1/*remove project segment*/), file.getProject().getFullPath()); >- this.manager.removeFromSecondaryTypesCache(file); >+ // Clean file from secondary types cache and update indexing secondary type cache as indexing cannot remove secondary types from cache >+ this.manager.secondaryTypesRemoving(file, true); > break; > } > } >#P org.eclipse.jdt.core.tests.model >Index: src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java,v >retrieving revision 1.76 >diff -u -r1.76 ReconcilerTests.java >--- src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java 4 Jan 2006 13:31:45 -0000 1.76 >+++ src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java 5 Jan 2006 17:06:27 -0000 >@@ -11,10 +11,13 @@ > package org.eclipse.jdt.core.tests.model; > > >+import java.io.File; > import java.io.IOException; > > import junit.framework.Test; > >+import org.eclipse.core.resources.IFile; >+import org.eclipse.core.resources.IResource; > import org.eclipse.core.resources.IWorkspaceRunnable; > import org.eclipse.core.runtime.CoreException; > import org.eclipse.core.runtime.IProgressMonitor; >@@ -92,9 +95,11 @@ > // Use this static initializer to specify subset for tests > // All specified tests which do not belong to the class are skipped... > static { >+// JavaModelManager.VERBOSE = true; >+// org.eclipse.jdt.internal.core.search.BasicSearchEngine.VERBOSE = true; > // TESTS_PREFIX = "testBug36032"; >-// TESTS_NAMES = new String[] { "testTypeWithDollarName" }; >-// TESTS_NUMBERS = new int[] { 114338 }; >+// TESTS_NAMES = new String[] { "testBug118823b" }; >+// TESTS_NUMBERS = new int[] { 118823 }; > // TESTS_RANGE = new int[] { 16, -1 }; > } > public static Test suite() { >@@ -104,7 +109,7 @@ > assertProblems(message, expected, this.problemRequestor); > } > // Expect no error as soon as indexing is finished >-protected void assertNoProblem(char[] source) throws InterruptedException, JavaModelException { >+protected void assertNoProblem(char[] source, ICompilationUnit unit) throws InterruptedException, JavaModelException { > IndexManager indexManager = JavaModelManager.getJavaModelManager().getIndexManager(); > if (this.problemRequestor.problemCount > 0) { > // If errors then wait for indexes to finish >@@ -113,7 +118,7 @@ > } > // Reconcile again to see if error goes away > this.problemRequestor.initialize(source); >- this.workingCopy.reconcile(AST.JLS3, true, null, null); >+ unit.reconcile(AST.JLS3, true, null, null); > if (this.problemRequestor.problemCount > 0) { > assertEquals("Working copy should NOT have any problem!", "", this.problemRequestor.problems.toString()); > } >@@ -2489,7 +2494,6 @@ > /** > * Bug 36032:[plan] JavaProject.findType() fails to find second type in source file > * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=36032" >- * > */ > public void testBug36032a() throws CoreException, InterruptedException { > try { >@@ -2516,7 +2520,7 @@ > this.workingCopy = getCompilationUnit("/P/Test.java").getWorkingCopy(new WorkingCopyOwner() {}, problemRequestor, null); > this.workingCopy.getBuffer().setContents(source); > this.workingCopy.reconcile(AST.JLS3, true, null, null); >- assertNoProblem(sourceChars); >+ assertNoProblem(sourceChars, this.workingCopy); > > // Add new secondary type > this.createFile( >@@ -2536,7 +2540,7 @@ > this.problemRequestor.initialize(sourceChars); > this.workingCopy.getBuffer().setContents(source); > this.workingCopy.reconcile(AST.JLS3, true, null, null); >- assertNoProblem(sourceChars); >+ assertNoProblem(sourceChars, this.workingCopy); > } finally { > deleteProject("P"); > } >@@ -2571,7 +2575,7 @@ > this.workingCopy = getCompilationUnit("/P/Test.java").getWorkingCopy(new WorkingCopyOwner() {}, this.problemRequestor, null); > this.workingCopy.getBuffer().setContents(source); > this.workingCopy.reconcile(AST.JLS3, true, null, null); >- assertNoProblem(sourceChars); >+ assertNoProblem(sourceChars, this.workingCopy); > > // Delete secondary type => should get a problem > waitUntilIndexesReady(); >@@ -2599,7 +2603,7 @@ > this.problemRequestor.initialize(sourceChars); > this.workingCopy.getBuffer().setContents(source); > this.workingCopy.reconcile(AST.JLS3, true, null, null); >- assertNoProblem(sourceChars); >+ assertNoProblem(sourceChars, this.workingCopy); > } finally { > deleteProject("P"); > } >@@ -2646,7 +2650,204 @@ > this.workingCopy = getCompilationUnit("/P2/test/Test2.java").getWorkingCopy(new WorkingCopyOwner() {}, this.problemRequestor, null); > this.workingCopy.getBuffer().setContents(source); > this.workingCopy.reconcile(AST.JLS3, true, null, null); >- assertNoProblem(sourceChars); >+ assertNoProblem(sourceChars, this.workingCopy); >+ } finally { >+ deleteProject("P1"); >+ deleteProject("P2"); >+ } >+} >+/** >+ * Bug 118823: [model] Secondary types cache not reset while removing _all_ secondary types from CU >+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=118823" >+ */ >+public void testBug118823() throws CoreException, InterruptedException, IOException { >+ try { >+ // Resources creation >+ IJavaProject project = createJavaProject("P1", new String[] {""}, new String[] {"JCL_LIB"}, "bin"); >+ String source1 = "class Test {}\n"; >+ IFile file = createFile( >+ "/P1/Test.java", >+ source1 >+ ); >+ createJavaProject("P2", new String[] {""}, new String[] {"JCL_LIB"}, new String[] { "/P1" }, "bin"); >+ String source2 = >+ "class A {\n" + >+ " Secondary s;\n" + >+ "}\n"; >+ createFile( >+ "/P2/A.java", >+ source2 >+ ); >+ waitUntilIndexesReady(); >+ >+ // Get working copies and reconcile >+ this.workingCopies = new ICompilationUnit[2]; >+ this.wcOwner = new WorkingCopyOwner() {}; >+ this.workingCopies[0] = getCompilationUnit("/P1/Test.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null); >+ char[] sourceChars = source1.toCharArray(); >+ this.problemRequestor.initialize(sourceChars); >+ this.workingCopies[0].getBuffer().setContents(source1); >+ this.workingCopies[0].reconcile(AST.JLS3, true, null, null); >+ assertNoProblem(sourceChars, this.workingCopies[0]); >+ this.workingCopies[1] = getCompilationUnit("/P2/A.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null); >+ this.problemRequestor.initialize(source2.toCharArray()); >+ this.workingCopies[1].getBuffer().setContents(source2); >+ this.workingCopies[1].reconcile(AST.JLS3, true, null, null); >+ assertEquals("Working copy should not find secondary type 'Secondary'!", 1, this.problemRequestor.problemCount); >+ assertProblems("Working copy should have problem!", >+ "----------\n" + >+ "1. ERROR in /P2/A.java (at line 2)\n" + >+ " Secondary s;\n" + >+ " ^^^^^^^^^\n" + >+ "Secondary cannot be resolved to a type\n" + >+ "----------\n" >+ ); >+ >+ // Delete file and recreate it with secondary outside eclipse >+ File ioFile = file.getLocation().toFile(); >+ ioFile.delete(); >+ source1 = >+ "public class Test {}\n" + >+ "class Secondary{}\n"; >+ Util.createFile(ioFile.getAbsolutePath(), source1); >+ project.getProject().refreshLocal(IResource.DEPTH_INFINITE, null); >+ sourceChars = source1.toCharArray(); >+ this.problemRequestor.initialize(sourceChars); >+ this.workingCopies[0].getBuffer().setContents(source1); >+ this.workingCopies[0].reconcile(AST.JLS3, true, null, null); >+ assertNoProblem(sourceChars, this.workingCopies[0]); >+ sourceChars = source2.toCharArray(); >+ this.problemRequestor.initialize(sourceChars); >+ this.workingCopies[1].reconcile(AST.JLS3, true, null, null); >+ assertNoProblem(sourceChars, this.workingCopies[1]); >+ } finally { >+ deleteProject("P1"); >+ deleteProject("P2"); >+ } >+} >+public void testBug118823b() throws CoreException, InterruptedException { >+ try { >+ // Resources creation >+ createJavaProject("P1", new String[] {""}, new String[] {"JCL_LIB"}, "bin"); >+ String source1 = "class Test {}\n"; >+ createFile( >+ "/P1/Test.java", >+ source1 >+ ); >+ createJavaProject("P2", new String[] {""}, new String[] {"JCL_LIB"}, new String[] { "/P1" }, "bin"); >+ String source2 = >+ "class A {\n" + >+ " Secondary s;\n" + >+ "}\n"; >+ createFile( >+ "/P2/A.java", >+ source2 >+ ); >+ waitUntilIndexesReady(); >+ >+ // Get working copies and reconcile >+ this.workingCopies = new ICompilationUnit[2]; >+ this.wcOwner = new WorkingCopyOwner() {}; >+ this.workingCopies[0] = getCompilationUnit("/P1/Test.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null); >+ char[] sourceChars = source1.toCharArray(); >+ this.problemRequestor.initialize(sourceChars); >+ this.workingCopies[0].getBuffer().setContents(source1); >+ this.workingCopies[0].reconcile(AST.JLS3, true, null, null); >+ assertNoProblem(sourceChars, this.workingCopies[0]); >+ this.workingCopies[1] = getCompilationUnit("/P2/A.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null); >+ this.problemRequestor.initialize(source2.toCharArray()); >+ this.workingCopies[1].getBuffer().setContents(source2); >+ this.workingCopies[1].reconcile(AST.JLS3, true, null, null); >+ assertEquals("Working copy should not find secondary type 'Secondary'!", 1, this.problemRequestor.problemCount); >+ assertProblems("Working copy should have problem!", >+ "----------\n" + >+ "1. ERROR in /P2/A.java (at line 2)\n" + >+ " Secondary s;\n" + >+ " ^^^^^^^^^\n" + >+ "Secondary cannot be resolved to a type\n" + >+ "----------\n" >+ ); >+ >+ // Add secondary and verify that there's no longer any error >+ source1 = >+ "public class Test {}\n" + >+ "class Secondary{}\n"; >+ sourceChars = source1.toCharArray(); >+ this.problemRequestor.initialize(sourceChars); >+ this.workingCopies[0].getBuffer().setContents(source1); >+ this.workingCopies[0].reconcile(AST.JLS3, true, null, null); >+ this.workingCopies[0].commitWorkingCopy(true, null); >+ assertNoProblem(sourceChars, this.workingCopies[0]); >+ sourceChars = source2.toCharArray(); >+ this.problemRequestor.initialize(sourceChars); >+ this.workingCopies[1].reconcile(AST.JLS3, true, null, null); >+ assertNoProblem(sourceChars, this.workingCopies[1]); >+ } finally { >+ deleteProject("P1"); >+ deleteProject("P2"); >+ } >+} >+public void testBug118823c() throws CoreException, InterruptedException { >+ try { >+ // Resources creation >+ createJavaProject("P1", new String[] {""}, new String[] {"JCL_LIB"}, "bin"); >+ String source1 = "class Test {}\n"; >+ createFile( >+ "/P1/Test.java", >+ source1 >+ ); >+ createJavaProject("P2", new String[] {""}, new String[] {"JCL_LIB"}, new String[] { "/P1" }, "bin"); >+ String source2 = >+ "class A {\n" + >+ " Secondary s;\n" + >+ "}\n"; >+ createFile( >+ "/P2/A.java", >+ source2 >+ ); >+ waitUntilIndexesReady(); >+ >+ // Get working copies and reconcile >+ this.workingCopies = new ICompilationUnit[2]; >+ this.wcOwner = new WorkingCopyOwner() {}; >+ this.workingCopies[0] = getCompilationUnit("/P1/Test.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null); >+ char[] sourceChars = source1.toCharArray(); >+ this.problemRequestor.initialize(sourceChars); >+ this.workingCopies[0].getBuffer().setContents(source1); >+ this.workingCopies[0].reconcile(AST.JLS3, true, null, null); >+ assertNoProblem(sourceChars, this.workingCopies[0]); >+ this.workingCopies[1] = getCompilationUnit("/P2/A.java").getWorkingCopy(this.wcOwner, this.problemRequestor, null); >+ this.problemRequestor.initialize(source2.toCharArray()); >+ this.workingCopies[1].getBuffer().setContents(source2); >+ this.workingCopies[1].reconcile(AST.JLS3, true, null, null); >+ assertEquals("Working copy should not find secondary type 'Secondary'!", 1, this.problemRequestor.problemCount); >+ assertProblems("Working copy should have problem!", >+ "----------\n" + >+ "1. ERROR in /P2/A.java (at line 2)\n" + >+ " Secondary s;\n" + >+ " ^^^^^^^^^\n" + >+ "Secondary cannot be resolved to a type\n" + >+ "----------\n" >+ ); >+ >+ // Delete file and recreate it with secondary >+ deleteFile("/P1/Test.java"); >+ source1 = >+ "public class Test {}\n" + >+ "class Secondary{}\n"; >+ createFile( >+ "/P1/Test.java", >+ source1 >+ ); >+ sourceChars = source1.toCharArray(); >+ this.problemRequestor.initialize(sourceChars); >+ this.workingCopies[0].getBuffer().setContents(source1); >+ this.workingCopies[0].reconcile(AST.JLS3, true, null, null); >+ assertNoProblem(sourceChars, this.workingCopies[0]); >+ sourceChars = source2.toCharArray(); >+ this.problemRequestor.initialize(sourceChars); >+ this.workingCopies[1].reconcile(AST.JLS3, true, null, null); >+ assertNoProblem(sourceChars, this.workingCopies[1]); > } finally { > deleteProject("P1"); > deleteProject("P2");
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=32533">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 118823
:
31320
| 32533
