Attachment 118873 Details for Bug 138184 – Patch for Eclipse 3.2.2

[patch] Patch for Eclipse 3.2.2

patch_138184_Eclipse3_2_2.txt (text/plain), 1.59 KB, created by Jakub Jurkiewicz

on 2008-11-27 04:13:51 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jurkiewicz

Created: 2008-11-27 04:13:51 EST

Size: 1.59 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: search/org/eclipse/jdt/internal/core/search/matching/InternalSearchPattern.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/Attic/InternalSearchPattern.java,v
>retrieving revision 1.11
>diff -u -r1.11 InternalSearchPattern.java
>--- search/org/eclipse/jdt/internal/core/search/matching/InternalSearchPattern.java	12 Apr 2005 20:40:24 -0000	1.11
>+++ search/org/eclipse/jdt/internal/core/search/matching/InternalSearchPattern.java	27 Nov 2008 09:05:52 -0000
>@@ -12,6 +12,7 @@
> 
> import java.io.IOException;
> 
>+import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.*;
> import org.eclipse.jdt.core.IJavaElement;
> import org.eclipse.jdt.core.search.*;
>@@ -57,7 +58,13 @@
> 		return (SearchPattern) this;
> 	}
> 	String documentPath(String containerPath, String relativePath) {
>-		String separator = Util.isArchiveFileName(containerPath) ? IJavaSearchScope.JAR_FILE_ENTRY_SEPARATOR : "/"; //$NON-NLS-1$
>+		String separator;
>+		if (!Util.isArchiveFileName(containerPath) || (new Path(containerPath).segmentCount() == 1 && ResourcesPlugin.getWorkspace().getRoot().getProject(containerPath) != null)) {
>+			separator = "/"; //$NON-NLS-1$
>+		} else {
>+			separator = IJavaSearchScope.JAR_FILE_ENTRY_SEPARATOR;
>+		}
>+		
> 		StringBuffer buffer = new StringBuffer(containerPath.length() + separator.length() + relativePath.length());
> 		buffer.append(containerPath);
> 		buffer.append(separator);

Actions: View | Diff

Attachments on bug 138184: 39273 | 75775 | 75822 | 118873 | 120216 | 120225