Attachment 182240 Details for Bug 329287 – Updated patch

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

[patch] Updated patch

patch_329287.txt (text/plain), 5.99 KB, created by Olivier Thomann

on 2010-11-02 15:27:48 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2010-11-02 15:27:48 EDT

Size: 5.99 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.api.tools
>Index: src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java,v
>retrieving revision 1.118
>diff -u -r1.118 ApiAnalysisBuilder.java
>--- src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java	2 Mar 2010 15:41:46 -0000	1.118
>+++ src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java	2 Nov 2010 19:26:26 -0000
>@@ -76,6 +76,11 @@
> 	static final IPath SETTINGS_PATH = new Path(".settings"); //$NON-NLS-1$
> 	
> 	/**
>+	 * Project relative path to the build.properties file
>+	 */
>+	static final IPath BUILD_PROPERTIES_PATH = new Path("build.properties"); //$NON-NLS-1$
>+
>+	/**
> 	 * Project relative path to the manifest file.
> 	 */
> 	static final IPath MANIFEST_PATH = new Path(JarFile.MANIFEST_NAME);
>@@ -272,6 +277,7 @@
> 						}
> 						else {	
> 							IResourceDelta manifest = null;
>+							IResourceDelta buildProperties = null;
> 							IResourceDelta filters = null;
> 							boolean filterbuild = false;
> 							for (int i = 0; i < deltas.length; i++) {
>@@ -279,6 +285,10 @@
> 								if(manifest != null) {
> 									break;
> 								}
>+								buildProperties = deltas[i].findMember(BUILD_PROPERTIES_PATH);
>+								if(buildProperties != null) {
>+									break;
>+								}
> 								filters = deltas[i].findMember(FILTER_PATH);
> 								if(filters != null){
> 									switch(filters.getKind()) {
>@@ -297,7 +307,7 @@
> 									}
> 								}
> 							}
>-							if (manifest != null || filterbuild) {
>+							if (manifest != null || buildProperties != null || filterbuild) {
> 								if (DEBUG) {
> 									System.out.println("Performing full build since MANIFEST.MF or .api_filters was modified"); //$NON-NLS-1$
> 		 						}
>Index: src/org/eclipse/pde/api/tools/internal/model/ProjectComponent.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ProjectComponent.java,v
>retrieving revision 1.8
>diff -u -r1.8 ProjectComponent.java
>--- src/org/eclipse/pde/api/tools/internal/model/ProjectComponent.java	13 Aug 2010 18:51:22 -0000	1.8
>+++ src/org/eclipse/pde/api/tools/internal/model/ProjectComponent.java	2 Nov 2010 19:26:26 -0000
>@@ -265,33 +265,11 @@
> 						int length = entries.length;
> 						for (int i = 0; i < length; i++) {
> 							IBuildEntry buildEntry = entries[i];
>-							if (buildEntry.getName().startsWith(IBuildEntry.JAR_PREFIX)) {
>-								String jar = buildEntry.getName().substring(IBuildEntry.JAR_PREFIX.length());
>-								String[] tokens = buildEntry.getTokens();
>-								if (tokens.length == 1) {
>-									IApiTypeContainer container = getApiTypeContainer(tokens[0], this);
>-									if (container != null) {
>-										fPathToOutputContainers.put(jar, container);
>-									}
>-								} else {
>-									List containers = new ArrayList();
>-									for (int j = 0; j < tokens.length; j++) {
>-										String currentToken = tokens[j];
>-										IApiTypeContainer container = getApiTypeContainer(currentToken, this);
>-										if (container != null && !containers.contains(container)) {
>-											containers.add(container);
>-										}
>-									}
>-									if (!containers.isEmpty()) {
>-										IApiTypeContainer cfc = null;
>-										if (containers.size() == 1) {
>-											cfc = (IApiTypeContainer) containers.get(0);
>-										} else {
>-											cfc = new CompositeApiTypeContainer(this, containers);
>-										}
>-										fPathToOutputContainers.put(jar, cfc);
>-									}
>-								}
>+							String name = buildEntry.getName();
>+							if (name.startsWith(IBuildEntry.JAR_PREFIX)) {
>+								retrieveContainers(name, IBuildEntry.JAR_PREFIX, buildEntry);
>+							} else if (name.startsWith("extra.")) { //$NON-NLS-1$
>+								retrieveContainers(name, "extra.", buildEntry); //$NON-NLS-1$
> 							}
> 						}
> 					}
>@@ -301,7 +279,49 @@
> 		}
> 		return Collections.EMPTY_LIST;
> 	}
>-	
>+	private void retrieveContainers(String name, String prefix, IBuildEntry buildEntry) throws CoreException {
>+		String jar = name.substring(prefix.length());
>+		String[] tokens = buildEntry.getTokens();
>+		if (tokens.length == 1) {
>+			IApiTypeContainer container = getApiTypeContainer(tokens[0], this);
>+			if (container != null) {
>+				IApiTypeContainer existingContainer = (IApiTypeContainer) this.fPathToOutputContainers.get(jar);
>+				if (existingContainer != null) {
>+					// concat both containers
>+					List allContainers = new ArrayList();
>+					allContainers.add(existingContainer);
>+					allContainers.add(container);
>+					IApiTypeContainer apiTypeContainer = new CompositeApiTypeContainer(this, allContainers);
>+					fPathToOutputContainers.put(jar, apiTypeContainer);
>+				} else {
>+					fPathToOutputContainers.put(jar, container);
>+				}
>+			}
>+		} else {
>+			List containers = new ArrayList();
>+			for (int j = 0; j < tokens.length; j++) {
>+				String currentToken = tokens[j];
>+				IApiTypeContainer container = getApiTypeContainer(currentToken, this);
>+				if (container != null && !containers.contains(container)) {
>+					containers.add(container);
>+				}
>+			}
>+			if (!containers.isEmpty()) {
>+				IApiTypeContainer existingContainer = (IApiTypeContainer) this.fPathToOutputContainers.get(jar);
>+				if (existingContainer != null) {
>+					// concat both containers
>+					containers.add(existingContainer);
>+				}
>+				IApiTypeContainer cfc = null;
>+				if (containers.size() == 1) {
>+					cfc = (IApiTypeContainer) containers.get(0);
>+				} else {
>+					cfc = new CompositeApiTypeContainer(this, containers);
>+				}
>+				fPathToOutputContainers.put(jar, cfc);
>+			}
>+		}
>+	}
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.pde.api.tools.internal.BundleApiComponent#createClassFileContainer(java.lang.String)
> 	 */

Actions: View | Diff

Attachments on bug 329287: 182235 | 182240