Attachment 158583 Details for Bug 302152 – Path to prevent WORKSPACE_PARENT_LOC to be used consistently when creating relative paths.

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

Path to prevent WORKSPACE_PARENT_LOC to be used consistently when creating relative paths.

patch.txt (text/plain), 2.76 KB, created by Serge Beauchamp

on 2010-02-09 07:56:52 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Serge Beauchamp

Created: 2010-02-09 07:56:52 EST

Size: 2.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.core.resources
>Index: src/org/eclipse/core/internal/resources/PathVariableUtil.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/PathVariableUtil.java,v
>retrieving revision 1.5
>diff -u -r1.5 PathVariableUtil.java
>--- src/org/eclipse/core/internal/resources/PathVariableUtil.java	26 Jan 2010 10:32:42 -0000	1.5
>+++ src/org/eclipse/core/internal/resources/PathVariableUtil.java	9 Feb 2010 12:56:06 -0000
>@@ -10,6 +10,8 @@
>  *******************************************************************************/
> package org.eclipse.core.internal.resources;
> 
>+import org.eclipse.core.internal.resources.projectvariables.WorkspaceParentLocationVariableResolver;
>+
> import java.net.URI;
> import java.util.ArrayList;
> import java.util.LinkedList;
>@@ -90,6 +92,8 @@
> 				if (variable.equals(WorkspaceLocationVariableResolver.NAME))
> 					continue; 
> 			}
>+			if (variable.equals(WorkspaceParentLocationVariableResolver.NAME))
>+				continue;
> 			if (variable.equals(ParentVariableResolver.NAME))
> 				continue;
> 			// find closest path to the original path
>@@ -119,6 +123,8 @@
> 						if (variable.equals(WorkspaceLocationVariableResolver.NAME))
> 							continue;
> 					}
>+					if (variable.equals(WorkspaceParentLocationVariableResolver.NAME))
>+						continue;
> 					if (variable.equals(ParentVariableResolver.NAME))
> 						continue;
> 					IPath value = URIUtil.toPath(pathVariableManager.getValue(variable, resource));
>Index: src/org/eclipse/core/internal/resources/Workspace.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java,v
>retrieving revision 1.229
>diff -u -r1.229 Workspace.java
>--- src/org/eclipse/core/internal/resources/Workspace.java	26 Jan 2010 10:32:42 -0000	1.229
>+++ src/org/eclipse/core/internal/resources/Workspace.java	9 Feb 2010 12:56:07 -0000
>@@ -13,6 +13,8 @@
>  *******************************************************************************/
> package org.eclipse.core.internal.resources;
> 
>+import org.eclipse.core.internal.resources.projectvariables.WorkspaceParentLocationVariableResolver;
>+
> import java.io.IOException;
> import java.io.InputStream;
> import java.net.URI;
>@@ -877,6 +879,8 @@
> 		for (int i = 0; i < variables.length; i++) {
> 			if (variables[i].equals(WorkspaceLocationVariableResolver.NAME))
> 				continue;
>+			if (variables[i].equals(WorkspaceParentLocationVariableResolver.NAME))
>+				continue;
> 			if (variables[i].equals(ParentVariableResolver.NAME))
> 				continue;
> 			IPath resolveDestVariable = URIUtil.toPath(destPathVariableManager

Actions: View

Attachments on bug 302152: 158583 | 158766 | 158773