Attachment 23616 Details for Bug 100807 – replacement patch

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

[patch] replacement patch

CSC.patch (text/plain), 3.47 KB, created by Darin Wright

on 2005-06-21 09:48:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2005-06-21 09:48:05 EDT

Size: 3.47 KB

patch

obsolete

>Index: ContainerSourceContainer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ContainerSourceContainer.java,v
>retrieving revision 1.18
>diff -u -r1.18 ContainerSourceContainer.java
>--- ContainerSourceContainer.java	20 Jun 2005 16:55:01 -0000	1.18
>+++ ContainerSourceContainer.java	21 Jun 2005 13:47:38 -0000
>@@ -95,38 +95,43 @@
> 		// To prevent the interruption of the search procedure we check 
> 		// if the path is valid before passing it to "getFile".		
> 		if ( validateFile(name) ) {
>-			File osFile = new File(fRootFile, name);
>-			if (osFile.exists()) {
>-				try {
>-					// See bug 82627 and bug 95679 - we have to append the container path in the case
>-					// that Eclipse thinks it is, with the file system case of the file in order to
>-					// be successful when finding the IFile for a location.
>-					// See bug 98090 - we need to handle relative path names
>-					Path canonicalPath = new Path(osFile.getCanonicalPath());
>-					String[] canonicalSegments = canonicalPath.segments();
>-					IPath workspacePath = new Path(""); //$NON-NLS-1$
>-					workspacePath = workspacePath.setDevice(canonicalPath.getDevice());
>-					for (int i = 0; i < canonicalSegments.length; i++) {
>-						String segment = canonicalSegments[i];
>-						if (i < fRootSegments.length) {
>-							if (fRootSegments[i].equalsIgnoreCase(segment)) {
>-								workspacePath = workspacePath.append(fRootSegments[i]);
>+			IFile file = fContainer.getFile(new Path(name));
>+			if (file.exists()) {
>+				sources.add(file);
>+			} else {
>+				File osFile = new File(fRootFile, name);
>+				if (osFile.exists()) {
>+					try {
>+						// See bug 82627 and bug 95679 - we have to append the container path in the case
>+						// that Eclipse thinks it is, with the file system case of the file in order to
>+						// be successful when finding the IFile for a location.
>+						// See bug 98090 - we need to handle relative path names
>+						Path canonicalPath = new Path(osFile.getCanonicalPath());
>+						String[] canonicalSegments = canonicalPath.segments();
>+						IPath workspacePath = new Path(""); //$NON-NLS-1$
>+						workspacePath = workspacePath.setDevice(canonicalPath.getDevice());
>+						for (int i = 0; i < canonicalSegments.length; i++) {
>+							String segment = canonicalSegments[i];
>+							if (i < fRootSegments.length) {
>+								if (fRootSegments[i].equalsIgnoreCase(segment)) {
>+									workspacePath = workspacePath.append(fRootSegments[i]);
>+								} else {
>+									workspacePath = workspacePath.append(segment);
>+								}
> 							} else {
> 								workspacePath = workspacePath.append(segment);
> 							}
>-						} else {
>-							workspacePath = workspacePath.append(segment);
> 						}
>+						IFile[] files = fRoot.findFilesForLocation(workspacePath);
>+						if (isFindDuplicates() && files.length > 1) {
>+							for (int i = 0; i < files.length; i++) {
>+								sources.add(files[i]);
>+							}
>+						} else if (files.length > 0) {
>+							sources.add(files[0]);
>+						}					
>+					} catch (IOException e) {
> 					}
>-					IFile[] files = fRoot.findFilesForLocation(workspacePath);
>-					if (isFindDuplicates() && files.length > 1) {
>-						for (int i = 0; i < files.length; i++) {
>-							sources.add(files[i]);
>-						}
>-					} else if (files.length > 0) {
>-						sources.add(files[0]);
>-					}					
>-				} catch (IOException e) {
> 				}
> 			}
> 		}

Actions: View | Diff

Attachments on bug 100807: 23540 | 23573 | 23616