Attachment 101524 Details for Bug 233426 – patch

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

[patch] patch

swt-binary-import.patch (text/plain), 2.51 KB, created by Darin Wright

on 2008-05-22 11:12:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2008-05-22 11:12:02 EDT

Size: 2.51 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.api.tools
>Index: src/org/eclipse/pde/api/tools/internal/PluginProjectApiComponent.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/PluginProjectApiComponent.java,v
>retrieving revision 1.28
>diff -u -r1.28 PluginProjectApiComponent.java
>--- src/org/eclipse/pde/api/tools/internal/PluginProjectApiComponent.java	21 May 2008 23:40:22 -0000	1.28
>+++ src/org/eclipse/pde/api/tools/internal/PluginProjectApiComponent.java	22 May 2008 15:09:13 -0000
>@@ -109,6 +109,13 @@
> 	protected boolean isBinaryBundle() {
> 		return false;
> 	}
>+	
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.pde.api.tools.internal.BundleApiComponent#isApiEnabled()
>+	 */
>+	protected boolean isApiEnabled() {
>+		return Util.isApiProject(fProject);
>+	}
> 
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.pde.api.tools.internal.descriptors.AbstractApiComponent#dispose()
>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.23
>diff -u -r1.23 BundleApiComponent.java
>--- src/org/eclipse/pde/api/tools/internal/BundleApiComponent.java	21 May 2008 23:40:22 -0000	1.23
>+++ src/org/eclipse/pde/api/tools/internal/BundleApiComponent.java	22 May 2008 15:09:13 -0000
>@@ -353,7 +353,12 @@
> 			List all = new ArrayList();
> 			// build the classpath from bundle and all fragments
> 			all.add(this);
>-			if (isBinaryBundle() || !"org.eclipse.swt".equals(getId())) { //$NON-NLS-1$
>+			boolean considerFragments = true;
>+			if ("org.eclipse.swt".equals(getId())) { //$NON-NLS-1$
>+				// if SWT is a project to be built/analyzed don't consider its fragments
>+				considerFragments = !isApiEnabled();
>+			}
>+			if (considerFragments) { 
> 				BundleDescription[] fragments = fBundleDescription.getFragments();
> 				for (int i = 0; i < fragments.length; i++) {
> 					BundleDescription fragment = fragments[i];
>@@ -405,6 +410,15 @@
> 	}
> 	
> 	/**
>+	 * Returns whether this API component is enabled for API analysis by the API builder.
>+	 * 
>+	 * @return whether this API component is enabled for API analysis by the API builder.
>+	 */
>+	protected boolean isApiEnabled() {
>+		return false;
>+	}
>+	
>+	/**
> 	 * Returns classpath entries defined in the given manifest.
> 	 * 
> 	 * @param manifest

Actions: View | Diff

Attachments on bug 233426: 101524