Attachment 185125 Details for Bug 202384 – Patch v.0.1

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch v.0.1

patch202384.txt (text/plain), 2.75 KB, created by Szymon Ptaszkiewicz

on 2010-12-14 07:29:02 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Szymon Ptaszkiewicz

Created: 2010-12-14 07:29:02 EST

Size: 2.75 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.core.resources
>Index: src/org/eclipse/core/internal/resources/Project.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java,v
>retrieving revision 1.177
>diff -u -r1.177 Project.java
>--- src/org/eclipse/core/internal/resources/Project.java	29 Nov 2010 12:10:40 -0000	1.177
>+++ src/org/eclipse/core/internal/resources/Project.java	14 Dec 2010 12:08:57 -0000
>@@ -15,8 +15,6 @@
>  *******************************************************************************/
> package org.eclipse.core.internal.resources;
> 
>-import java.util.LinkedHashSet;
>-
> import java.net.URI;
> import java.util.*;
> import org.eclipse.core.filesystem.*;
>@@ -1169,6 +1167,7 @@
> 		} finally {
> 			monitor.done();
> 		}
>+		((ProjectPreferences) Platform.getPreferencesService().getRootNode().node(ProjectScope.SCOPE).node(getName())).initialize();
> 	}
> 
> 	/* (non-Javadoc)
>Index: src/org/eclipse/core/internal/resources/ProjectPreferences.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectPreferences.java,v
>retrieving revision 1.59
>diff -u -r1.59 ProjectPreferences.java
>--- src/org/eclipse/core/internal/resources/ProjectPreferences.java	3 Dec 2010 09:48:42 -0000	1.59
>+++ src/org/eclipse/core/internal/resources/ProjectPreferences.java	14 Dec 2010 12:08:58 -0000
>@@ -70,7 +70,6 @@
> 	 */
> 	protected static Set loadedNodes = Collections.synchronizedSet(new HashSet());
> 	private IFile file;
>-	private boolean initialized = false;
> 	/**
> 	 * Flag indicating that this node is currently reading values from disk,
> 	 * to avoid flushing during a read.
>@@ -341,21 +340,7 @@
> 		if (segmentCount > 2)
> 			qualifier = getSegment(path, 2);
> 
>-		if (segmentCount != 2)
>-			return;
>-
>-		// else segmentCount == 2 so we initialize the children
>-		if (initialized)
>-			return;
>-		try {
>-			synchronized (this) {
>-				String[] names = computeChildren();
>-				for (int i = 0; i < names.length; i++)
>-					addChild(names[i], null);
>-			}
>-		} finally {
>-			initialized = true;
>-		}
>+		initialize();
> 	}
> 
> 	/*
>@@ -440,6 +425,17 @@
> 		return new ProjectPreferences(nodeParent, nodeName);
> 	}
> 
>+	protected void initialize() {
>+		if (segmentCount == 2) {
>+			// segmentCount == 2 so we initialize the children
>+			synchronized (this) {
>+				String[] names = computeChildren();
>+				for (int i = 0; i < names.length; i++)
>+					addChild(names[i], null);
>+			}
>+		}
>+	}
>+
> 	protected boolean isAlreadyLoaded(IEclipsePreferences node) {
> 		return loadedNodes.contains(node.absolutePath());
> 	}

Actions: View | Diff

Attachments on bug 202384: 185125 | 185134 | 185139 | 185424 | 185543 | 185703 | 185720 | 186377