Attachment 122799 Details for Bug 258820 – patch p3

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

[patch] patch p3

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

on 2009-01-16 07:50:59 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kuppe

Created: 2009-01-16 07:50:59 EST

Size: 6.52 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.buckminster.core
>Index: src/java/org/eclipse/buckminster/core/cspec/AbstractResolutionBuilder.java
>===================================================================
>--- src/java/org/eclipse/buckminster/core/cspec/AbstractResolutionBuilder.java	(revision 9865)
>+++ src/java/org/eclipse/buckminster/core/cspec/AbstractResolutionBuilder.java	(working copy)
>@@ -138,8 +138,13 @@
> 		return new ResolvedNode(reader.getNodeQuery(), createResolution(reader, cspecBuilder, opmlBuilder));
> 	}
> 
>-	protected Resolution createResolution(IComponentReader reader, CSpecBuilder cspecBuilder, OPMLBuilder opmlBuilder)
>-			throws CoreException
>+	protected Resolution createResolution(IComponentReader reader, CSpecBuilder	cspecBuilder, OPMLBuilder opmlBuilder) throws CoreException
>+			{
>+			  return createResolution(reader, cspecBuilder, opmlBuilder, false);
>+			}
>+
>+	protected Resolution createResolution(IComponentReader reader, CSpecBuilder cspecBuilder, OPMLBuilder opmlBuilder,
>+			boolean unpack) throws CoreException
> 	{
> 		ResolutionBuilder resBld = new ResolutionBuilder(cspecBuilder, opmlBuilder);
> 
>@@ -153,6 +158,7 @@
> 		resBld.setVersionMatch(providerMatch.getVersionMatch());
> 		resBld.setMaterializable(reader.canMaterialize());
> 		resBld.setRepository(providerMatch.getRepositoryURI());
>+		resBld.setUnpack(unpack);
> 		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/BundleBuilder.java
>===================================================================
>--- src/java/org/eclipse/buckminster/pde/cspecgen/bundle/BundleBuilder.java	(revision 9865)
>+++ src/java/org/eclipse/buckminster/pde/cspecgen/bundle/BundleBuilder.java	(working copy)
>@@ -18,13 +18,21 @@
> import org.eclipse.buckminster.core.ctype.IComponentType;
> import org.eclipse.buckminster.core.ctype.MissingCSpecSourceException;
> import org.eclipse.buckminster.core.helpers.AccessibleByteArrayOutputStream;
>+import org.eclipse.buckminster.core.metadata.builder.ResolutionBuilder;
>+import org.eclipse.buckminster.core.metadata.model.Resolution;
> import org.eclipse.buckminster.core.reader.ICatalogReader;
> import org.eclipse.buckminster.core.reader.IComponentReader;
>+import org.eclipse.buckminster.core.reader.IFileReader;
> import org.eclipse.buckminster.core.reader.IStreamConsumer;
>+import org.eclipse.buckminster.core.resolver.NodeQuery;
>+import org.eclipse.buckminster.core.rmap.model.Provider;
> import org.eclipse.buckminster.core.version.IVersionType;
>+import org.eclipse.buckminster.core.version.ProviderMatch;
>+import org.eclipse.buckminster.opml.builder.OPMLBuilder;
> import org.eclipse.buckminster.pde.Messages;
> import org.eclipse.buckminster.pde.cspecgen.CSpecGenerator;
> import org.eclipse.buckminster.pde.cspecgen.PDEBuilder;
>+import org.eclipse.buckminster.pde.internal.EclipseImportReader;
> import org.eclipse.buckminster.pde.internal.EclipsePlatformReader;
> import org.eclipse.buckminster.pde.internal.model.ExternalBuildModel;
> import org.eclipse.buckminster.pde.internal.model.ExternalBundleModel;
>@@ -237,4 +245,19 @@
> 			monitor.done();
> 		}
> 	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.buckminster.core.cspec.AbstractResolutionBuilder#createResolution(org.eclipse.buckminster.core.reader.IComponentReader, org.eclipse.buckminster.core.cspec.builder.CSpecBuilder, org.eclipse.buckminster.opml.builder.OPMLBuilder)
>+	 */
>+	@Override
>+	protected Resolution createResolution(IComponentReader reader, CSpecBuilder cspecBuilder, OPMLBuilder opmlBuilder)
>+			throws CoreException
>+	{
>+		if(reader instanceof EclipseImportReader)
>+		{
>+			EclipseImportReader eclipseImportReader = (EclipseImportReader)reader;
>+			return super.createResolution(reader, cspecBuilder, opmlBuilder, eclipseImportReader.isUnpack());
>+		}
>+		return super.createResolution(reader, cspecBuilder, opmlBuilder);
>+	}
> }
>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();
>+	}
> }

Flags:

thomas: iplog+

Actions: View | Diff

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