diff options
| author | Tobias Oberlies | 2012-02-28 18:10:58 +0000 |
|---|---|---|
| committer | Tobias Oberlies | 2012-03-02 14:29:51 +0000 |
| commit | 67105df97422275a005e73abbd9f825615a11fc9 (patch) | |
| tree | b5a49589cafec10a996b713f345a2951cbaf6446 | |
| parent | 7b4e0d6bfa12a5ec6e4bb91ab725118f05b9fb65 (diff) | |
| download | rt.equinox.p2-67105df97422275a005e73abbd9f825615a11fc9.tar.gz rt.equinox.p2-67105df97422275a005e73abbd9f825615a11fc9.tar.xz rt.equinox.p2-67105df97422275a005e73abbd9f825615a11fc9.zip | |
372788 Let artifact repository create ArtifactDescriptor instances
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java index f2b01207c..6bda1aeea 100644 --- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java +++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java @@ -456,7 +456,7 @@ public class FeaturesAction extends AbstractPublisherAction { File[] files = descriptor.getFiles(); IArtifactKey artifactKey = iu.getArtifacts().iterator().next(); - ArtifactDescriptor artifactDescriptor = new ArtifactDescriptor(artifactKey); + IArtifactDescriptor artifactDescriptor = PublisherHelper.createArtifactDescriptor(info, artifactKey, null); IPathComputer computer = advice.getRootFileComputer(config); if (computer == null) computer = FileUtils.createDynamicPathComputer(1); diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java index 09aa21b7b..8fa15b253 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java @@ -182,8 +182,8 @@ public abstract class AbstractPublisherAction implements IPublisherAction { } protected IArtifactDescriptor createPack200ArtifactDescriptor(IArtifactKey key, File pathOnDisk, String installSize) { + ArtifactDescriptor result = (ArtifactDescriptor) PublisherHelper.createArtifactDescriptor(info, key, pathOnDisk); //TODO this size calculation is bogus - ArtifactDescriptor result = new ArtifactDescriptor(key); if (pathOnDisk != null) { result.setProperty(IArtifactDescriptor.ARTIFACT_SIZE, installSize); // TODO - this is wrong but I'm testing a work-around for bug 205842 |