Attachment 193380 Details for Bug 337415 – Updated patch

[patch] Updated patch

bug_337415.txt (text/plain), 4.47 KB, created by Jay Arthanareeswaran

on 2011-04-15 10:38:46 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jay Arthanareeswaran

Created: 2011-04-15 10:38:46 EDT

Size: 4.47 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.659
>diff -u -r1.659 JavaCore.java
>--- model/org/eclipse/jdt/core/JavaCore.java	16 Jan 2011 22:43:21 -0000	1.659
>+++ model/org/eclipse/jdt/core/JavaCore.java	15 Apr 2011 14:36:07 -0000
>@@ -3530,6 +3530,8 @@
> 
> 			// initialize all containers and variables
> 			JavaModelManager manager = JavaModelManager.getJavaModelManager();
>+			ExternalFoldersManager externalFoldersManager = JavaModelManager.getExternalManager();
>+			externalFoldersManager.createExternalFoldersProject(monitor);
> 			SubProgressMonitor subMonitor = null;
> 			try {
> 				if (monitor != null) {
>@@ -3565,7 +3567,6 @@
> 			// and recreate links for external folders if needed
> 			if (monitor != null)
> 				monitor.subTask(Messages.javamodel_resetting_source_attachment_properties);
>-			ExternalFoldersManager externalFoldersManager = JavaModelManager.getExternalManager();
> 			final IJavaProject[] projects = manager.getJavaModel().getJavaProjects();
> 			HashSet visitedPaths = new HashSet();
> 			for (int i = 0, length = projects.length; i < length; i++) {
>@@ -3578,7 +3579,6 @@
> 					continue;
> 				}
> 				if (classpath != null) {
>-					boolean needExternalFolderCreation = false;
> 					for (int j = 0, length2 = classpath.length; j < length2; j++) {
> 						IClasspathEntry entry = classpath[j];
> 						if (entry.getSourceAttachmentPath() != null) {
>@@ -3588,18 +3588,16 @@
> 							}
> 						}
> 						// else source might have been attached by IPackageFragmentRoot#attachSource(...), we keep it
>-						if (!needExternalFolderCreation && entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
>+						if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
> 							IPath entryPath = entry.getPath();
> 							if (ExternalFoldersManager.isExternalFolderPath(entryPath) && externalFoldersManager.getFolder(entryPath) == null) {
>-								needExternalFolderCreation = true;
>+								externalFoldersManager.addFolder(entryPath, true);
> 							}
> 						}
> 					}
>-					if (needExternalFolderCreation)
>-						manager.deltaState.addExternalFolderChange(javaProject, null/*act as if all external folders were new*/);
> 				}
> 			}
>-
>+			externalFoldersManager.createPendingFolders(monitor);
> 			// initialize delta state
> 			if (monitor != null)
> 				monitor.subTask(Messages.javamodel_initializing_delta_state);
>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.21
>diff -u -r1.21 ExternalFoldersManager.java
>--- model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java	3 Sep 2010 05:13:44 -0000	1.21
>+++ model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java	15 Apr 2011 14:36:07 -0000
>@@ -38,6 +38,7 @@
> import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.jdt.core.IClasspathEntry;
> import org.eclipse.jdt.core.JavaCore;
>+import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.internal.core.util.Messages;
> import org.eclipse.jdt.internal.core.util.Util;
> 
>@@ -148,6 +149,20 @@
> 		return result;
> 	}
> 
>+	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 {
>+				createLinkFolder((IPath) folderPath, false, monitor);
>+			} catch (CoreException e) {
>+				throw new JavaModelException(e);
>+			}
>+		}
>+		this.pendingFolders.clear();
>+	}
>+	
> 	public void cleanUp(IProgressMonitor monitor) throws CoreException {
> 		ArrayList toDelete = getFoldersToCleanUp(monitor);
> 		if (toDelete == null)
>@@ -193,7 +208,7 @@
> 	public IProject getExternalFoldersProject() {
> 		return ResourcesPlugin.getWorkspace().getRoot().getProject(EXTERNAL_PROJECT_NAME);
> 	}
>-	private IProject createExternalFoldersProject(IProgressMonitor monitor) throws CoreException {
>+	public IProject createExternalFoldersProject(IProgressMonitor monitor) throws CoreException {
> 		IProject project = getExternalFoldersProject();
> 		if (!project.isAccessible()) {
> 			if (!project.exists()) {

Actions: View | Diff

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