diff options
author | Andrew Niefer | 2009-04-14 21:18:39 +0000 |
---|---|---|
committer | Andrew Niefer | 2009-04-14 21:18:39 +0000 |
commit | 764243cfd5e4c3bfe362aa39c618681d764ff6ad (patch) | |
tree | cd14a1ec5e92e15ebc7f563c135eff79ff3d99c2 /bundles/org.eclipse.equinox.p2.updatesite | |
parent | 84862ed961f90667f5faf03f5c229cf2a179dafd (diff) | |
download | rt.equinox.p2-764243cfd5e4c3bfe362aa39c618681d764ff6ad.tar.gz rt.equinox.p2-764243cfd5e4c3bfe362aa39c618681d764ff6ad.tar.xz rt.equinox.p2-764243cfd5e4c3bfe362aa39c618681d764ff6ad.zip |
bug 259792 - reuse IUs
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.updatesite')
-rw-r--r-- | bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/RemoteFeaturesAction.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/RemoteFeaturesAction.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/RemoteFeaturesAction.java index 0bde7bc46..64e568e61 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/RemoteFeaturesAction.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/RemoteFeaturesAction.java @@ -34,10 +34,11 @@ public class RemoteFeaturesAction extends FeaturesAction { throw new IllegalArgumentException(); } - public IStatus perform(IPublisherInfo info, IPublisherResult results, IProgressMonitor monitor) { + public IStatus perform(IPublisherInfo publisherInfo, IPublisherResult results, IProgressMonitor monitor) { try { + this.info = publisherInfo; features = updateSite.loadFeatures(monitor); - return super.perform(info, results, monitor); + return super.perform(publisherInfo, results, monitor); } catch (ProvisionException e) { return new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.Error_Generation, updateSite), e); } catch (OperationCanceledException e) { @@ -46,11 +47,11 @@ public class RemoteFeaturesAction extends FeaturesAction { } - protected void generateFeatureIUs(Feature[] features, IPublisherResult result, IPublisherInfo info) { + protected void generateFeatureIUs(Feature[] featureList, IPublisherResult result) { Properties extraProperties = new Properties(); extraProperties.put(IInstallableUnit.PROP_PARTIAL_IU, Boolean.TRUE.toString()); - for (int i = 0; i < features.length; i++) { - Feature feature = features[i]; + for (int i = 0; i < featureList.length; i++) { + Feature feature = featureList[i]; FeatureEntry[] featureEntries = feature.getEntries(); for (int j = 0; j < featureEntries.length; j++) { FeatureEntry entry = featureEntries[j]; |