summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Piggott2011-08-15 00:05:56 (EDT)
committerMatthew Piggott2011-08-15 11:21:19 (EDT)
commitf6dd1d8234e5641a3d37faea2e23f007f6c47546 (patch)
tree588415852dd8c73a97de9c19f5f83ce9ca1caba8
parent6ed8bdde3cac00722dd9189c15b94154e16c6e0d (diff)
downloadrt.equinox.p2-f6dd1d8234e5641a3d37faea2e23f007f6c47546.zip
rt.equinox.p2-f6dd1d8234e5641a3d37faea2e23f007f6c47546.tar.gz
rt.equinox.p2-f6dd1d8234e5641a3d37faea2e23f007f6c47546.tar.bz2
bug 348660 - [ui] PreselectedIUInstallWizard does not present license infov20110815-1521
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java2
2 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java
index a3366da..aa77d00 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java
@@ -63,6 +63,9 @@ public class PreselectedIUInstallWizard extends WizardWithLicenses {
}
root.setChildren(list.toArray());
planSelections = selected.toArray();
+ if (licensePage != null) {
+ licensePage.update(ElementUtils.elementsToIUs(planSelections).toArray(new IInstallableUnit[0]), operation);
+ }
}
/* (non-Javadoc)
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java
index 10e05ff..e1d12f6 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java
@@ -55,8 +55,8 @@ public abstract class ProvisioningOperationWizard extends Wizard {
public ProvisioningOperationWizard(ProvisioningUI ui, ProfileChangeOperation operation, Object[] initialSelections, LoadMetadataRepositoryJob job) {
super();
this.ui = ui;
- initializeResolutionModelElements(initialSelections);
this.operation = operation;
+ initializeResolutionModelElements(initialSelections);
this.repoPreloadJob = job;
setForcePreviousAndNextButtons(true);
setNeedsProgressMonitor(true);