Bug 261928 : Adds a Relaxed Constraint Optionv20111026-0642

Fixed the UI so that the option is only enabled if the
original provisioning operation fails.  

4 files changed, 38 insertions, 1 deletions

diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RelaxedUpdateInstallOperation.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RelaxedUpdateInstallOperation.java
index bcf61ac1d..8605f0f83 100644
--- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RelaxedUpdateInstallOperation.java
+++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RelaxedUpdateInstallOperation.java
@@ -96,7 +96,7 @@ public class RelaxedUpdateInstallOperation extends ProfileChangeOperation {
 				}
 			}
 		}
-		//return planner.getProvisioningPlan(finalChangeRequest, context, null);
+		request = (ProfileChangeRequest) finalChangeRequest;
 	}
 
 	@Override
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 22dbb000c..efe2f3f75 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
@@ -386,4 +386,8 @@ public abstract class ProvisioningOperationWizard extends Wizard {
 	public void setRelaxedResolution(boolean value) {
 		this.resolveWithRelaxedConstraints = value;
 	}
+
+	public boolean getRelaxedResoltion() {
+		return this.resolveWithRelaxedConstraints;
+	}
 }
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java
index cb51fa00a..d0ffad923 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java
@@ -164,10 +164,19 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage {
 		}
 	}
 
+	@Override
+	public void updateStatus(IUElementListRoot newRoot, ProfileChangeOperation op) {
+		super.updateStatus(newRoot, op);
+		IStatus currentStatus = getProvisioningWizard().getCurrentStatus();
+		if (relaxConstraints != null)
+			relaxConstraints.setEnabled(currentStatus != null && !currentStatus.isOK());
+	}
+
 	private void createViewControlsArea(Composite controlsComposite) {
 		relaxConstraints = new Button(controlsComposite, SWT.CHECK);
 		relaxConstraints.setText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraints);
 		relaxConstraints.setToolTipText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraintsTip);
+		relaxConstraints.setSelection(((ProvisioningOperationWizard) getWizard()).getRelaxedResoltion());
 		relaxConstraints.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -177,6 +186,13 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage {
 		});
 	}
 
+	@Override
+	public void setVisible(boolean visible) {
+		super.setVisible(visible);
+		if (visible)
+			relaxConstraints.setSelection(((ProvisioningOperationWizard) getWizard()).getRelaxedResoltion());
+	}
+
 	protected void createSizingInfo(Composite parent) {
 		// Default is to do nothing
 	}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java
index f240f82c1..122e6b736 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java
@@ -13,6 +13,7 @@
 package org.eclipse.equinox.internal.p2.ui.dialogs;
 
 import java.util.ArrayList;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.equinox.internal.p2.ui.ProvUI;
 import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
 import org.eclipse.equinox.internal.p2.ui.model.*;
@@ -173,10 +174,19 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti
 		Dialog.applyDialogFont(sashForm);
 	}
 
+	@Override
+	public void updateStatus(IUElementListRoot newRoot, ProfileChangeOperation op) {
+		super.updateStatus(newRoot, op);
+		IStatus currentStatus = getProvisioningWizard().getCurrentStatus();
+		if (relaxConstraints != null)
+			relaxConstraints.setEnabled(currentStatus != null && !currentStatus.isOK());
+	}
+
 	private void createViewControlsArea(Composite controlsComposite) {
 		relaxConstraints = new Button(controlsComposite, SWT.CHECK);
 		relaxConstraints.setText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraints);
 		relaxConstraints.setToolTipText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraintsTip);
+		relaxConstraints.setSelection(((ProvisioningOperationWizard) getWizard()).getRelaxedResoltion());
 		relaxConstraints.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -186,6 +196,13 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti
 		});
 	}
 
+	@Override
+	public void setVisible(boolean visible) {
+		super.setVisible(visible);
+		if (visible)
+			relaxConstraints.setSelection(((ProvisioningOperationWizard) getWizard()).getRelaxedResoltion());
+	}
+
 	private void createSelectButtons(Composite parent) {
 		Composite buttonParent = new Composite(parent, SWT.NONE);
 		GridLayout gridLayout = new GridLayout();