Attachment 237032 Details for Bug 418825 – Code patch after review comments

[patch] Code patch after review comments

Bug-418825--new.patch (text/plain), 1.67 KB, created by ANIRBAN CHAKRABORTY

on 2013-10-29 13:17:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: ANIRBAN CHAKRABORTY

Created: 2013-10-29 13:17:02 EDT

Size: 1.67 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
>index a448c97..2793f65 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
>@@ -4597,24 +4597,26 @@
> 
> 		// Build types from paths
> 		Iterator packages = secondaryTypes.values().iterator();
> 		while (packages.hasNext()) {
> 			HashMap types = (HashMap) packages.next();
>+			HashMap tempTypes = new HashMap(types.size());
> 			Iterator names = types.entrySet().iterator();
> 			while (names.hasNext()) {
> 				Map.Entry entry = (Map.Entry) names.next();
> 				String typeName = (String) entry.getKey();
> 				String path = (String) entry.getValue();
>+				names.remove();
> 				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
>-				} else {
>-					names.remove();
>+					tempTypes.put(typeName, type); // replace stored path with type itself
> 				}
> 			}
>+			types.putAll(tempTypes);
>+			tempTypes.clear();
> 		}
> 
> 		// 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;

Flags:

anchakrk: review?

Actions: View | Diff

Attachments on bug 418825: 236178 | 236179 | 236180 | 236995 | 237032