summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2013-04-27 22:32:33 (EDT)
committerPascal Rapicault2013-04-27 22:32:33 (EDT)
commit5538c3889c0aede5def96ae815e7b655ecd511af (patch)
treedfaa526a37f4fe7d17d62cdb496c8de03ce3035f
parent8851e2cc4b34e7324233c360650c802e90c8a747 (diff)
downloadrt.equinox.p2-5538c3889c0aede5def96ae815e7b655ecd511af.zip
rt.equinox.p2-5538c3889c0aede5def96ae815e7b655ecd511af.tar.gz
rt.equinox.p2-5538c3889c0aede5def96ae815e7b655ecd511af.tar.bz2
Refactor
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java10
1 files changed, 9 insertions, 1 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 6d25fbb..56535b4 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
@@ -286,7 +286,7 @@ public abstract class ProvisioningOperationWizard extends Wizard {
operation.resolveModal(monitor);
if (withRemediation) {
IStatus status = operation.getResolutionResult();
- if (remediationPage != null && (status == null || (status.getSeverity() == IStatus.ERROR && status.getCode() != 10053))) {
+ if (remediationPage != null && shouldRemediate(status)) {
computeRemediationOperation(operation, ui, monitor);
}
}
@@ -302,6 +302,14 @@ public abstract class ProvisioningOperationWizard extends Wizard {
planChanged();
}
+ boolean shouldRemediate(IStatus status) {
+ if (status == null)
+ return true;
+ if (status.getSeverity() != IStatus.ERROR)
+ return false;
+ return true;
+ }
+
/*
* Get the selections that drive the provisioning operation.
*/