diff options
author | irbull | 2011-10-24 21:07:50 +0000 |
---|---|---|
committer | irbull | 2011-10-24 21:07:50 +0000 |
commit | 731f393d15896534bb3fe264129641304c36b7f1 (patch) | |
tree | f575332ab051e6a83d29a163d94eab759199a5db | |
parent | d5e4446016f201e94d6da78b5fa55732190f2f6f (diff) | |
download | rt.equinox.p2-731f393d15896534bb3fe264129641304c36b7f1.tar.gz rt.equinox.p2-731f393d15896534bb3fe264129641304c36b7f1.tar.xz rt.equinox.p2-731f393d15896534bb3fe264129641304c36b7f1.zip |
bug 361853 -- Renamed the provisioning UI helper methodv20111024-2107
2 files changed, 2 insertions, 3 deletions
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 78e62e440..22dbb000c 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 @@ -192,7 +192,6 @@ public abstract class ProvisioningOperationWizard extends Wizard { return new ProvisioningContext(ui.getSession().getProvisioningAgent()); } - public void recomputePlanWithRelaxedConstraints(IRunnableContext runnableContext) { couldNotResolveStatus = Status.OK_STATUS; provisioningContext = getProvisioningContext(); @@ -201,7 +200,7 @@ public abstract class ProvisioningOperationWizard extends Wizard { operation = null; couldNotResolve(ProvUIMessages.ResolutionWizardPage_NoSelections); } else { - operation = ui.getLuckyOperation(provisioningContext); + operation = ui.getRelaxedUpdateOperation(provisioningContext); operation.setProvisioningContext(provisioningContext); try { runnableContext.run(true, true, new IRunnableWithProgress() { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java index 3f7388e49..bccd352c8 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java @@ -135,7 +135,7 @@ public class ProvisioningUI { /** * @since 2.2 */ - public RelaxedUpdateInstallOperation getLuckyOperation(ProvisioningContext context) { + public RelaxedUpdateInstallOperation getRelaxedUpdateOperation(ProvisioningContext context) { RelaxedUpdateInstallOperation luckyOperation = new RelaxedUpdateInstallOperation(getSession()); luckyOperation.setProfileId(getProfileId()); luckyOperation.setProvisioningContext(context); |