Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSusan Franklin2008-10-29 18:02:53 +0000
committerSusan Franklin2008-10-29 18:02:53 +0000
commita2465418f2635b03bb4564e7f2ee9f857b0f47e4 (patch)
tree337f0ae4f233cf01ee76d975280a3303f27c6c7c
parentcffbb17052c687cf56f267cee36d9dd904387033 (diff)
downloadrt.equinox.p2-a2465418f2635b03bb4564e7f2ee9f857b0f47e4.tar.gz
rt.equinox.p2-a2465418f2635b03bb4564e7f2ee9f857b0f47e4.tar.xz
rt.equinox.p2-a2465418f2635b03bb4564e7f2ee9f857b0f47e4.zip
Bug 247906 - [ui] install wizard is empty
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdater.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/ProfileModificationAction.java8
2 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdater.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdater.java
index 5ef8ab4eb..bc9468043 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdater.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdater.java
@@ -66,10 +66,10 @@ public class AutomaticUpdater implements IUpdateListener {
}
}
- protected ProvisioningPlan getProvisioningPlan() {
+ protected ProvisioningPlan getProvisioningPlan(IInstallableUnit[] ius) {
if (currentPlan != null)
return currentPlan;
- return super.getProvisioningPlan();
+ return super.getProvisioningPlan(ius);
}
protected IPlanValidator getPlanValidator() {
@@ -456,7 +456,7 @@ public class AutomaticUpdater implements IUpdateListener {
else {
createUpdateAction();
updateAction.initializePlan();
- setUpdateAffordanceState(updateAction.getProvisioningPlan().getStatus().isOK());
+ setUpdateAffordanceState(updateAction.getProvisioningPlan(iusWithUpdates).getStatus().isOK());
}
return Status.OK_STATUS;
}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/ProfileModificationAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/ProfileModificationAction.java
index 8bc179ab2..9e64ce6a9 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/ProfileModificationAction.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/ProfileModificationAction.java
@@ -47,14 +47,13 @@ public abstract class ProfileModificationAction extends ProvisioningAction {
init();
}
- protected ProvisioningPlan getProvisioningPlan() {
+ protected ProvisioningPlan getProvisioningPlan(final IInstallableUnit[] ius) {
final String id = getProfileId(true);
// We could not figure out a profile to operate on, so return
if (id == null) {
return null;
}
- final IInstallableUnit[] ius = getSelectedIUs();
final ProvisioningPlan[] plan = new ProvisioningPlan[1];
IRunnableWithProgress runnable = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) {
@@ -76,9 +75,10 @@ public abstract class ProfileModificationAction extends ProvisioningAction {
}
public void run() {
- ProvisioningPlan plan = getProvisioningPlan();
+ IInstallableUnit[] ius = getSelectedIUs();
+ ProvisioningPlan plan = getProvisioningPlan(ius);
if (validatePlan(plan))
- result = performOperation(getSelectedIUs(), getProfileId(true), plan);
+ result = performOperation(ius, getProfileId(true), plan);
else
result = Window.CANCEL;
userChosenProfileId = null;

Back to the top