summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorirbull2011-10-24 17:07:50 (EDT)
committerirbull2011-10-24 17:07:50 (EDT)
commit731f393d15896534bb3fe264129641304c36b7f1 (patch)
treef575332ab051e6a83d29a163d94eab759199a5db
parentd5e4446016f201e94d6da78b5fa55732190f2f6f (diff)
downloadrt.equinox.p2-731f393d15896534bb3fe264129641304c36b7f1.zip
rt.equinox.p2-731f393d15896534bb3fe264129641304c36b7f1.tar.gz
rt.equinox.p2-731f393d15896534bb3fe264129641304c36b7f1.tar.bz2
bug 361853 -- Renamed the provisioning UI helper methodv20111024-2107
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUI.java2
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 78e62e4..22dbb00 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 3f7388e..bccd352 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);