Attachment #193481 for bug #337415

Lines 3530-3537 Link Here

(-)model/org/eclipse/jdt/core/JavaCore.java (-2 / +1 lines)
3530		3530
3531	// initialize all containers and variables	3531	// initialize all containers and variables
3532	JavaModelManager manager = JavaModelManager.getJavaModelManager();	3532	JavaModelManager manager = JavaModelManager.getJavaModelManager();
3533	ExternalFoldersManager externalFoldersManager = JavaModelManager.getExternalManager();
3534	externalFoldersManager.createExternalFoldersProject(monitor);
3535	SubProgressMonitor subMonitor = null;	3533	SubProgressMonitor subMonitor = null;
3536	try {	3534	try {
3537	if (monitor != null) {	3535	if (monitor != null) {
Lines 3569-3574 Link Here
3569	monitor.subTask(Messages.javamodel_resetting_source_attachment_properties);	3567	monitor.subTask(Messages.javamodel_resetting_source_attachment_properties);
3570	final IJavaProject[] projects = manager.getJavaModel().getJavaProjects();	3568	final IJavaProject[] projects = manager.getJavaModel().getJavaProjects();
3571	HashSet visitedPaths = new HashSet();	3569	HashSet visitedPaths = new HashSet();
		3570	ExternalFoldersManager externalFoldersManager = JavaModelManager.getExternalManager();
3572	for (int i = 0, length = projects.length; i < length; i++) {	3571	for (int i = 0, length = projects.length; i < length; i++) {
3573	JavaProject javaProject = (JavaProject) projects[i];	3572	JavaProject javaProject = (JavaProject) projects[i];
3574	IClasspathEntry[] classpath;	3573	IClasspathEntry[] classpath;





	public void createPendingFolders(IProgressMonitor monitor) throws JavaModelException{
		if (this.pendingFolders == null) return;
		try {
			createExternalFoldersProject(monitor);
			Iterator iterator = this.pendingFolders.iterator();
			while (iterator.hasNext()) {
				Object folderPath = iterator.next();
				createLinkFolder((IPath) folderPath, false, monitor);
			} catch (CoreException e) {
				throw new JavaModelException(e);
			}
		} catch (CoreException e) {
			throw new JavaModelException(e);
		}
		this.pendingFolders.clear();
	}

Return to bug 337415

Lines 151-164 Link Here

(-)model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java (-6 / +7 lines)
151		151
152	public void createPendingFolders(IProgressMonitor monitor) throws JavaModelException{	152	public void createPendingFolders(IProgressMonitor monitor) throws JavaModelException{
153	if (this.pendingFolders == null) return;	153	if (this.pendingFolders == null) return;
154	Iterator iterator = this.pendingFolders.iterator();	154	try {
155	while (iterator.hasNext()) {	155	createExternalFoldersProject(monitor);
156	Object folderPath = iterator.next();	156	Iterator iterator = this.pendingFolders.iterator();
157	try {	157	while (iterator.hasNext()) {
		158	Object folderPath = iterator.next();
158	createLinkFolder((IPath) folderPath, false, monitor);	159	createLinkFolder((IPath) folderPath, false, monitor);
159	} catch (CoreException e) {
160	throw new JavaModelException(e);
161	}	160	}
		161	} catch (CoreException e) {
		162	throw new JavaModelException(e);
162	}	163	}
163	this.pendingFolders.clear();	164	this.pendingFolders.clear();
164	}	165	}