Attachment 193481 Details for Bug 337415 – Patch

[patch] Patch

bug_337415a.txt (text/plain), 2.55 KB, created by Jay Arthanareeswaran

on 2011-04-18 07:56:46 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jay Arthanareeswaran

Created: 2011-04-18 07:56:46 EDT

Size: 2.55 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/core/JavaCore.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v
>retrieving revision 1.661
>diff -u -r1.661 JavaCore.java
>--- model/org/eclipse/jdt/core/JavaCore.java	18 Apr 2011 10:09:25 -0000	1.661
>+++ model/org/eclipse/jdt/core/JavaCore.java	18 Apr 2011 11:53:10 -0000
>@@ -3530,8 +3530,6 @@
> 
> 			// initialize all containers and variables
> 			JavaModelManager manager = JavaModelManager.getJavaModelManager();
>-			ExternalFoldersManager externalFoldersManager = JavaModelManager.getExternalManager();
>-			externalFoldersManager.createExternalFoldersProject(monitor);
> 			SubProgressMonitor subMonitor = null;
> 			try {
> 				if (monitor != null) {
>@@ -3569,6 +3567,7 @@
> 				monitor.subTask(Messages.javamodel_resetting_source_attachment_properties);
> 			final IJavaProject[] projects = manager.getJavaModel().getJavaProjects();
> 			HashSet visitedPaths = new HashSet();
>+			ExternalFoldersManager externalFoldersManager = JavaModelManager.getExternalManager();
> 			for (int i = 0, length = projects.length; i < length; i++) {
> 				JavaProject javaProject = (JavaProject) projects[i];
> 				IClasspathEntry[] classpath;
>Index: model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java,v
>retrieving revision 1.22
>diff -u -r1.22 ExternalFoldersManager.java
>--- model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java	18 Apr 2011 09:57:07 -0000	1.22
>+++ model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java	18 Apr 2011 11:53:10 -0000
>@@ -151,14 +151,15 @@
> 
> 	public void createPendingFolders(IProgressMonitor monitor) throws JavaModelException{
> 		if (this.pendingFolders == null) return;
>-		Iterator iterator = this.pendingFolders.iterator();
>-		while (iterator.hasNext()) {
>-			Object folderPath = iterator.next();
>-			try {
>+		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();
> 	}

Actions: View | Diff

Attachments on bug 337415: 189164 | 193147 | 193327 | 193372 | 193380 | 193481 | 193554 | 193555