Attachment 113471 Details for Bug 248466 – fix to jdt.launching

[patch] fix to jdt.launching

rel-classpath.patch (text/plain), 1.93 KB, created by Darin Wright

on 2008-09-25 11:38:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2008-09-25 11:38:23 EDT

Size: 1.93 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.launching
>Index: launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java,v
>retrieving revision 1.22
>diff -u -r1.22 DefaultProjectClasspathEntry.java
>--- launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java	8 May 2006 20:39:12 -0000	1.22
>+++ launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java	25 Sep 2008 15:37:22 -0000
>@@ -25,6 +25,7 @@
> import org.eclipse.jdt.core.IClasspathContainer;
> import org.eclipse.jdt.core.IClasspathEntry;
> import org.eclipse.jdt.core.IJavaProject;
>+import org.eclipse.jdt.core.IPackageFragmentRoot;
> import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
> import org.eclipse.jdt.launching.IRuntimeContainerComparator;
>@@ -289,7 +290,21 @@
> 						// fall through if not the special JRELIB variable
> 					default:
> 						if (!expandedPath.contains(entry)) {
>-							expandedPath.add(entry);
>+							// resolve project relative paths - @see bug 57732 & bug 248466
>+							if (entry.getEntryKind() != IClasspathEntry.CPE_SOURCE) {
>+								IPackageFragmentRoot[] roots = project.findPackageFragmentRoots(entry);
>+								for (int i = 0; i < roots.length; i++) {
>+									IPackageFragmentRoot root = roots[i];
>+									IRuntimeClasspathEntry r = JavaRuntime.newArchiveRuntimeClasspathEntry(root.getPath());
>+									r.setSourceAttachmentPath(entry.getSourceAttachmentPath());
>+									r.setSourceAttachmentRootPath(entry.getSourceAttachmentRootPath());
>+									if (!expandedPath.contains(r)) {
>+										expandedPath.add(r);
>+									}
>+								}
>+							} else {
>+								expandedPath.add(entry);
>+							}
> 						}
> 						break;
> 				}

Actions: View | Diff

Attachments on bug 248466: 113471 | 113472