Attachment 170077 Details for Bug 314550 – patch

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

[patch] patch

314550.txt (text/plain), 1.69 KB, created by Andrew Niefer

on 2010-05-26 15:19:36 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2010-05-26 15:19:36 EDT

Size: 1.69 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: src/org/eclipse/pde/internal/build/packager/PackageConfigScriptGenerator.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/PackageConfigScriptGenerator.java,v
>retrieving revision 1.33
>diff -u -r1.33 PackageConfigScriptGenerator.java
>--- src/org/eclipse/pde/internal/build/packager/PackageConfigScriptGenerator.java	11 May 2010 21:44:04 -0000	1.33
>+++ src/org/eclipse/pde/internal/build/packager/PackageConfigScriptGenerator.java	26 May 2010 19:19:21 -0000
>@@ -29,12 +29,14 @@
> 	public void initialize(String directoryName, String feature, Config configurationInformation, Collection elementList, Collection featureList, Collection allFeaturesList, Collection rootProviders) throws CoreException {
> 		/* package scripts require the root file providers for creating the file archive, but don't want them for other rootfile
> 		 * stuff done by the assembly scripts, so keep them separate here */
>-		super.initialize(directoryName, feature, configurationInformation, elementList, featureList, allFeaturesList, Collections.EMPTY_SET);
>+		super.initialize(directoryName, feature, configurationInformation, elementList, featureList, allFeaturesList, new ArrayList(0));
> 		archiveRootProviders = rootProviders != null ? rootProviders : Collections.EMPTY_LIST;
> 	}
> 
> 	protected Collection getArchiveRootFileProviders() {
>-		return archiveRootProviders;
>+		if (archiveRootProviders.size() > 0)
>+			return archiveRootProviders;
>+		return super.getArchiveRootFileProviders();
> 	}
> 
> 	private String getFinalName(BundleDescription bundle, String shape) {

Actions: View | Diff

Attachments on bug 314550: 170077