Bug 561865: Also stay on FeatureSelectionWizardPage on error even if
there already is a ProfileChangeOperation.
Change-Id: I73676c4ef61b542b2a05bfe45c2f91c688a8685b
Signed-off-by: Leif Geiger <leif.geiger@yatta.de>
diff --git a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceWizard.java b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceWizard.java
index 86644ec..669c02e 100644
--- a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceWizard.java
+++ b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceWizard.java
@@ -459,8 +459,7 @@
updateProfileChangeOperation();
operationUpdated = true;
}
- if (profileChangeOperation == null || !profileChangeOperation.getResolutionResult().isOK()
- || (currentJREPlan != null && !currentJREPlan.getStatus().isOK())) {
+ if (profileChangeOperation == null) {
// can't compute a change operation, so there must be some kind of error
// we show these on the the feature selection wizard page
nextPage = featureSelectionWizardPage;
@@ -472,6 +471,10 @@
nextPage = featureSelectionWizardPage;
}
}
+ if (nextPage == null && (!profileChangeOperation.getResolutionResult().isOK()
+ || (currentJREPlan != null && !currentJREPlan.getStatus().isOK()))) {
+ nextPage = featureSelectionWizardPage;
+ }
if (nextPage == null && nextpressed && profileChangeOperation instanceof RemediationOperation
&& !featureSelectionWizardPage.isInRemediationMode()) {
featureSelectionWizardPage.flipToRemediationComposite();
