View | Details | Raw Unified | Return to bug 210638
Collapse All | Expand All

(-)model/org/eclipse/jdt/core/JavaCore.java (-1 / +1 lines)
Lines 1653-1659 Link Here
1653 
	 * @since 2.1
 1653 
	 * @since 2.1
1654 
	 */
 1654 
	 */
1655 
	public static ClasspathContainerInitializer getClasspathContainerInitializer(String containerID) {
 1655 
	public static ClasspathContainerInitializer getClasspathContainerInitializer(String containerID) {
1656 
		HashMap containerInitializersCache = JavaModelManager.getJavaModelManager().containerInitializersCache;
 1656 
		Hashtable containerInitializersCache = JavaModelManager.getJavaModelManager().containerInitializersCache;
1657 
		ClasspathContainerInitializer initializer = (ClasspathContainerInitializer) containerInitializersCache.get(containerID);
 1657 
		ClasspathContainerInitializer initializer = (ClasspathContainerInitializer) containerInitializersCache.get(containerID);
1658 
		if (initializer == null) {
 1658 
		if (initializer == null) {
1659 
			initializer = computeClasspathContainerInitializer(containerID);
 1659 
			initializer = computeClasspathContainerInitializer(containerID);
(-)model/org/eclipse/jdt/internal/core/JavaModelManager.java (-9 / +11 lines)
Lines 108-114 Link Here
108 
	public int batchContainerInitializations = NO_BATCH_INITIALIZATION;
 108 
	public int batchContainerInitializations = NO_BATCH_INITIALIZATION;
109
109
110 
	public BatchInitializationMonitor batchContainerInitializationsProgress = new BatchInitializationMonitor();
 110 
	public BatchInitializationMonitor batchContainerInitializationsProgress = new BatchInitializationMonitor();
111 
	public HashMap containerInitializersCache = new HashMap(5);
 111 
	public Hashtable containerInitializersCache = new Hashtable(5);
112
112
113 
	/*
 113 
	/*
114 
	 * A HashSet that contains the IJavaProject whose classpath is being resolved.
 114 
	 * A HashSet that contains the IJavaProject whose classpath is being resolved.
Lines 2188-2201 Link Here
2188 
			*/
 2188 
			*/
2189 
		}
 2189 
		}
2190 
		// TODO (frederic) remove following block when JDT/UI dummy project will be thrown away...
 2190 
		// TODO (frederic) remove following block when JDT/UI dummy project will be thrown away...
2191 
		HashSet containerPaths = (HashSet) allContainerPaths.get(javaProjectToInit);
 2191 
		if (javaProjectToInit != null) {
2192 
		if (containerPaths == null) {
 2192 
			HashSet containerPaths = (HashSet) allContainerPaths.get(javaProjectToInit);
2193 
			containerPaths = new HashSet();
 2193 
			if (containerPaths == null) {
2194 
			allContainerPaths.put(javaProjectToInit, containerPaths);
 2194 
				containerPaths = new HashSet();
2195 
		}
 2195 
				allContainerPaths.put(javaProjectToInit, containerPaths);
2196 
		containerPaths.add(containerToInit);
 2196 
			}
2197 
		// mark container as being initialized
 2197 
			containerPaths.add(containerToInit);
2198 
		containerAddInitializationInProgress(javaProjectToInit, containerToInit);
 2198 
			// mark container as being initialized
2199 
			containerAddInitializationInProgress(javaProjectToInit, containerToInit);
2200 
		}
2199 
		// end block
 2201 
		// end block
2200
2202
2201 
		// initialize all containers
 2203 
		// initialize all containers

Return to bug 210638