Attachment 122791 Details for Bug 258820 – patch p1

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

[patch] patch p1

clipboard.txt (text/plain), 5.56 KB, created by Markus Kuppe

on 2009-01-16 06:49:08 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kuppe

Created: 2009-01-16 06:49:08 EST

Size: 5.56 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.buckminster.core
>Index: src/java/org/eclipse/buckminster/core/cspec/builder/CSpecBuilder.java
>===================================================================
>--- src/java/org/eclipse/buckminster/core/cspec/builder/CSpecBuilder.java	(revision 9863)
>+++ src/java/org/eclipse/buckminster/core/cspec/builder/CSpecBuilder.java	(working copy)
>@@ -55,6 +55,8 @@
> 
> 	private Filter m_filter;
> 
>+	private boolean m_unpack = false;
>+
> 	public ActionBuilder addAction(String actionName, boolean publ, String actorName, boolean always)
> 			throws AttributeAlreadyDefinedException
> 	{
>@@ -395,6 +397,11 @@
> 			m_generators = null;
> 	}
> 
>+	public boolean isUnpack()
>+	{
>+		return m_unpack;
>+	}
>+
> 	public void removeAttribute(String name)
> 	{
> 		if(m_attributes != null)
>@@ -443,6 +450,11 @@
> 		m_shortDesc = shortDesc;
> 	}
> 
>+	public void setUnpack(boolean unpack)
>+	{
>+		m_unpack = unpack;
>+	}
>+
> 	public void setVersion(IVersion version)
> 	{
> 		m_version = version;
>Index: src/java/org/eclipse/buckminster/core/cspec/AbstractResolutionBuilder.java
>===================================================================
>--- src/java/org/eclipse/buckminster/core/cspec/AbstractResolutionBuilder.java	(revision 9863)
>+++ src/java/org/eclipse/buckminster/core/cspec/AbstractResolutionBuilder.java	(working copy)
>@@ -153,6 +153,7 @@
> 		resBld.setVersionMatch(providerMatch.getVersionMatch());
> 		resBld.setMaterializable(reader.canMaterialize());
> 		resBld.setRepository(providerMatch.getRepositoryURI());
>+		resBld.setUnpack(cspecBuilder.isUnpack());
> 		if(reader instanceof IFileReader)
> 			resBld.setFileInfo(((IFileReader)reader).getFileInfo());
> 		return new Resolution(resBld);
>#P org.eclipse.buckminster.pde
>Index: src/java/org/eclipse/buckminster/pde/internal/EclipsePlatformReaderType.java
>===================================================================
>--- src/java/org/eclipse/buckminster/pde/internal/EclipsePlatformReaderType.java	(revision 9863)
>+++ src/java/org/eclipse/buckminster/pde/internal/EclipsePlatformReaderType.java	(working copy)
>@@ -292,7 +292,7 @@
> 			plugin.setModel(generatedFeatureModel);
> 			plugin.setId(id);
> 			plugin.setVersion(vStr);
>-			plugin.setUnpack(false);
>+			plugin.setUnpack(res.isUnpack());
> 			generatedFeature.addPlugins(new IFeaturePlugin[] { plugin });
> 		}
> 
>Index: src/java/org/eclipse/buckminster/pde/cspecgen/bundle/CSpecFromBinary.java
>===================================================================
>--- src/java/org/eclipse/buckminster/pde/cspecgen/bundle/CSpecFromBinary.java	(revision 9865)
>+++ src/java/org/eclipse/buckminster/pde/cspecgen/bundle/CSpecFromBinary.java	(working copy)
>@@ -30,6 +30,7 @@
> import org.eclipse.buckminster.core.query.model.ComponentQuery;
> import org.eclipse.buckminster.core.reader.ICatalogReader;
> import org.eclipse.buckminster.pde.cspecgen.CSpecGenerator;
>+import org.eclipse.buckminster.pde.internal.EclipseImportReader;
> import org.eclipse.buckminster.pde.internal.model.ExternalBundleModel;
> import org.eclipse.buckminster.runtime.IOUtils;
> import org.eclipse.buckminster.runtime.MonitorUtils;
>@@ -205,6 +206,13 @@
> 					bundleExport.getPrerequisitesBuilder().addLocalPrerequisite(importedJar);
> 				}
> 			}
>+			ICatalogReader reader = getReader();
>+			if(reader instanceof EclipseImportReader)
>+			{
>+				EclipseImportReader eclipseImportReader = (EclipseImportReader)reader;
>+				cspec.setUnpack(eclipseImportReader.isUnpack());
>+			}
>+
> 			bundleExport.setProductAlias(ALIAS_OUTPUT);
> 			bundleExport.setProductBase(OUTPUT_DIR);
> 			bundleExport.setPrerequisitesAlias(ALIAS_REQUIREMENTS);
>Index: src/java/org/eclipse/buckminster/pde/internal/EclipseImportReaderType.java
>===================================================================
>--- src/java/org/eclipse/buckminster/pde/internal/EclipseImportReaderType.java	(revision 9863)
>+++ src/java/org/eclipse/buckminster/pde/internal/EclipseImportReaderType.java	(working copy)
>@@ -767,6 +767,7 @@
> 					}
> 					jarFile.delete();
> 				}
>+				base.setUnpack(unpack);
> 
> 				// Cache this using the remote key also so that the next time someone asks for it, the local
> 				// version is returned
>Index: src/java/org/eclipse/buckminster/pde/internal/EclipseImportBase.java
>===================================================================
>--- src/java/org/eclipse/buckminster/pde/internal/EclipseImportBase.java	(revision 9863)
>+++ src/java/org/eclipse/buckminster/pde/internal/EclipseImportBase.java	(working copy)
>@@ -101,6 +101,8 @@
> 
> 	private final URL m_remoteLocation;
> 
>+	private boolean m_unpack = false;
>+
> 	private static final UUID CACHE_IMPORT_BASE_CACHE = UUID.randomUUID();
> 
> 	public static EclipseImportBase obtain(NodeQuery query, String repositoryURI) throws CoreException
>@@ -285,4 +287,24 @@
> 	{
> 		return m_remoteLocation == null;
> 	}
>+
>+	/**
>+	 * Should this bundle be unpacked (set in the enclosing feature.xml)
>+	 * 
>+	 * @return true if supposed to be unpacked
>+	 */
>+	boolean isUnpack()
>+	{
>+		return m_unpack;
>+	}
>+
>+	/**
>+	 * Should this bundle be unpacked (set in the enclosing feature.xml)
>+	 * 
>+	 * @param unpack
>+	 */
>+	void setUnpack(boolean unpack)
>+	{
>+		m_unpack = unpack;
>+	}
> }
>Index: src/java/org/eclipse/buckminster/pde/internal/EclipseImportReader.java
>===================================================================
>--- src/java/org/eclipse/buckminster/pde/internal/EclipseImportReader.java	(revision 9865)
>+++ src/java/org/eclipse/buckminster/pde/internal/EclipseImportReader.java	(working copy)
>@@ -243,4 +243,9 @@
> 					.getComponentName()));
> 		monitor.done();
> 	}
>+
>+	public boolean isUnpack()
>+	{
>+		return m_base.isUnpack();
>+	}
> }

Actions: View | Diff

Attachments on bug 258820: 120471 | 122791 | 122792 | 122794 | 122795 | 122799 | 122800