Attachment 107666 Details for Bug 240914 – Proposed fix

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

[patch] Proposed fix

patch_240914.txt (text/plain), 4.01 KB, created by Olivier Thomann

on 2008-07-16 15:34:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2008-07-16 15:34:44 EDT

Size: 4.01 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.api.tools
>Index: src/org/eclipse/pde/api/tools/internal/CompositeClassFileContainer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/CompositeClassFileContainer.java,v
>retrieving revision 1.4
>diff -u -r1.4 CompositeClassFileContainer.java
>--- src/org/eclipse/pde/api/tools/internal/CompositeClassFileContainer.java	11 Feb 2008 20:25:54 -0000	1.4
>+++ src/org/eclipse/pde/api/tools/internal/CompositeClassFileContainer.java	16 Jul 2008 19:33:08 -0000
>@@ -13,6 +13,8 @@
> import java.util.List;
> 
> import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.pde.api.tools.internal.provisional.IClassFile;
>+import org.eclipse.pde.api.tools.internal.provisional.IClassFileContainer;
> 
> /**
>  * A collection of class file containers.
>@@ -44,5 +46,25 @@
> 	public String getOrigin() {
> 		return this.fOrigin;
> 	}
>-
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.pde.api.tools.internal.provisional.IClassFileContainer#findClassFile(java.lang.String, java.lang.String)
>+	 */
>+	public IClassFile findClassFile(String qualifiedName, String id) throws CoreException {
>+		IClassFileContainer[] containers = getClassFileContainers();
>+		String origin = this.getOrigin();
>+		for (int i = 0; i < containers.length; i++) {
>+			if (origin == null) {
>+				IClassFile file = containers[i].findClassFile(qualifiedName);
>+				if (file != null) {
>+					return file;
>+				}
>+			} else if (origin.equals(id)) {
>+				IClassFile file = containers[i].findClassFile(qualifiedName, id);
>+				if (file != null) {
>+					return file;
>+				}
>+			}
>+		}
>+		return null;
>+	}
> }
>Index: src/org/eclipse/pde/api/tools/internal/BundleApiComponent.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleApiComponent.java,v
>retrieving revision 1.25
>diff -u -r1.25 BundleApiComponent.java
>--- src/org/eclipse/pde/api/tools/internal/BundleApiComponent.java	18 Jun 2008 19:06:46 -0000	1.25
>+++ src/org/eclipse/pde/api/tools/internal/BundleApiComponent.java	16 Jul 2008 19:33:08 -0000
>@@ -48,6 +48,7 @@
> import org.eclipse.osgi.util.ManifestElement;
> import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
> import org.eclipse.pde.api.tools.internal.provisional.Factory;
>+import org.eclipse.pde.api.tools.internal.provisional.IApiComponent;
> import org.eclipse.pde.api.tools.internal.provisional.IApiDescription;
> import org.eclipse.pde.api.tools.internal.provisional.IApiFilterStore;
> import org.eclipse.pde.api.tools.internal.provisional.IApiProfile;
>@@ -397,6 +398,31 @@
> 						}
> 					}
> 				}
>+				IRequiredComponentDescription[] requiredComponents = component.getRequiredComponents();
>+				int length = requiredComponents.length;
>+				if (length != 0) {
>+					IApiProfile profile = this.getProfile();
>+					if (profile != null) {
>+						for (int i = 0; i < length; i++) {
>+							IRequiredComponentDescription description = requiredComponents[i];
>+							if (description.isExported()) {
>+								String id = description.getId();
>+								IApiComponent requiredApiComponent = profile.getApiComponent(id);
>+								if (requiredApiComponent != null) {
>+									IClassFileContainer[] classFileContainers = requiredApiComponent.getClassFileContainers();
>+									int classFileContainersLength = classFileContainers == null ? 0 : classFileContainers.length;
>+									if (classFileContainersLength != 0) {
>+										List innerContainers = new ArrayList(classFileContainersLength);
>+										for (int j = 0; j< classFileContainersLength; j++) {
>+											innerContainers.add(classFileContainers[j]);
>+										}
>+										containers.add(new CompositeClassFileContainer(innerContainers, this.getId()));
>+									}
>+								}
>+							}
>+						}
>+					}
>+				}
> 			}
> 		} catch (BundleException e) {
> 			abort("Unable to parse bundle classpath", e); //$NON-NLS-1$

Actions: View | Diff

Attachments on bug 240914: 107666 | 120515 | 120519 | 120525 | 120569