Attachment 20529 Details for Bug 93061 – patch to jdtcore with container/variable changes

[patch] patch to jdtcore with container/variable changes

userlib-vars-jdtcore.patch (text/plain), 4.67 KB, created by Matthew Conway

on 2005-04-29 16:59:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Conway

Created: 2005-04-29 16:59:34 EDT

Size: 4.67 KB

patch

obsolete

>Index: model/org/eclipse/jdt/internal/core/ClasspathEntry.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java,v
>retrieving revision 1.74
>diff -u -r1.74 ClasspathEntry.java
>--- model/org/eclipse/jdt/internal/core/ClasspathEntry.java	17 Apr 2005 17:04:27 -0000	1.74
>+++ model/org/eclipse/jdt/internal/core/ClasspathEntry.java	29 Apr 2005 20:51:53 -0000
>@@ -1370,7 +1370,6 @@
> 								int kind = containerEntry == null ? 0 : containerEntry.getEntryKind();
> 								if (containerEntry == null
> 									|| kind == IClasspathEntry.CPE_SOURCE
>-									|| kind == IClasspathEntry.CPE_VARIABLE
> 									|| kind == IClasspathEntry.CPE_CONTAINER){
> 										String description = container.getDescription();
> 										if (description == null) description = path.makeRelative().toString();
>Index: model/org/eclipse/jdt/internal/core/JavaProject.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java,v
>retrieving revision 1.341
>diff -u -r1.341 JavaProject.java
>--- model/org/eclipse/jdt/internal/core/JavaProject.java	22 Apr 2005 08:06:08 -0000	1.341
>+++ model/org/eclipse/jdt/internal/core/JavaProject.java	29 Apr 2005 20:51:54 -0000
>@@ -2067,7 +2067,13 @@
> 
> 					IClasspathEntry[] containerEntries = container.getClasspathEntries();
> 					if (containerEntries == null) break;
>-
>+                    
>+                    containerEntries = getResolvedClasspath(containerEntries,
>+                                                            projectOutputLocation,
>+                                                            ignoreUnresolvedEntry,
>+                                                            generateMarkerOnError,
>+                                                            rawReverseMap);
>+                    
> 					// container was bound
> 					for (int j = 0, containerLength = containerEntries.length; j < containerLength; j++){
> 						ClasspathEntry cEntry = (ClasspathEntry) containerEntries[j];
>Index: model/org/eclipse/jdt/internal/core/UserLibrary.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/UserLibrary.java,v
>retrieving revision 1.4
>diff -u -r1.4 UserLibrary.java
>--- model/org/eclipse/jdt/internal/core/UserLibrary.java	8 Apr 2005 20:30:28 -0000	1.4
>+++ model/org/eclipse/jdt/internal/core/UserLibrary.java	29 Apr 2005 20:51:54 -0000
>@@ -41,7 +41,9 @@
> 	private static final String TAG_USERLIBRARY= "userlibrary"; //$NON-NLS-1$
> 	private static final String TAG_SOURCEATTACHMENT= "sourceattachment"; //$NON-NLS-1$
> 	private static final String TAG_SOURCEATTACHMENTROOT= "sourceattachmentroot"; //$NON-NLS-1$
>-	private static final String TAG_PATH= "path"; //$NON-NLS-1$
>+    private static final String TAG_PATH= "path"; //$NON-NLS-1$
>+    private static final String TAG_TYPE= "type"; //$NON-NLS-1$
>+    private static final String TAG_TYPE_VAR= "var"; //$NON-NLS-1$
> 	private static final String TAG_ARCHIVE= "archive"; //$NON-NLS-1$
> 	private static final String TAG_SYSTEMLIBRARY= "systemlibrary"; //$NON-NLS-1$
> 	
>@@ -108,6 +110,8 @@
> 			IClasspathEntry curr= this.entries[i];
> 			
> 			HashMap archive = new HashMap();
>+            if (curr.getEntryKind() == IClasspathEntry.CPE_VARIABLE)
>+                archive.put(TAG_TYPE, TAG_TYPE_VAR);
> 			archive.put(TAG_PATH, curr.getPath().toString());
> 			IPath sourceAttach= curr.getSourceAttachmentPath();
> 			if (sourceAttach != null)
>@@ -154,10 +158,18 @@
> 			if (node.getNodeType() == Node.ELEMENT_NODE) {
> 				Element element= (Element) node;
> 				if (element.getNodeName().equals(TAG_ARCHIVE)) {
>-					String path = element.getAttribute(TAG_PATH);
>+                    String type = element.getAttribute(TAG_TYPE);
>+                    String path = element.getAttribute(TAG_PATH);
> 					IPath sourceAttach= element.hasAttribute(TAG_SOURCEATTACHMENT) ? new Path(element.getAttribute(TAG_SOURCEATTACHMENT)) : null;
> 					IPath sourceAttachRoot= element.hasAttribute(TAG_SOURCEATTACHMENTROOT) ? new Path(element.getAttribute(TAG_SOURCEATTACHMENTROOT)) : null;
>-					res.add(JavaCore.newLibraryEntry(new Path(path), sourceAttach, sourceAttachRoot));
>+                    if (TAG_TYPE_VAR.equals(type))
>+                    {
>+                        res.add(JavaCore.newVariableEntry(new Path(path), sourceAttach, sourceAttachRoot));
>+                    }
>+                    else
>+                    {
>+                        res.add(JavaCore.newLibraryEntry(new Path(path), sourceAttach, sourceAttachRoot));
>+                    }
> 				}
> 			}
> 		}

Actions: View | Diff

Attachments on bug 93061: 20434 | 20435 | 20529 | 20530