summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorirbull2011-10-26 02:46:33 (EDT)
committerirbull2011-10-26 02:46:33 (EDT)
commit4aac70df6e9a3891927c09ce94ac7f29195f0770 (patch)
tree929c3e5172261a4e12e98912b6324eeacf5f5833
parenta928532f4fbcc4d7bef5b8587877d30e5cab0414 (diff)
downloadrt.equinox.p2-4aac70df6e9a3891927c09ce94ac7f29195f0770.zip
rt.equinox.p2-4aac70df6e9a3891927c09ce94ac7f29195f0770.tar.gz
rt.equinox.p2-4aac70df6e9a3891927c09ce94ac7f29195f0770.tar.bz2
Revert the 'relaxed constraint option' for now. v20111026-0646
This marks the button as not visible for M3. We can enable it early in M4.
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java1
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/SelectableIUsPage.java1
2 files changed, 2 insertions, 0 deletions
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 d0ffad9..8f823d6 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
@@ -174,6 +174,7 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage {
private void createViewControlsArea(Composite controlsComposite) {
relaxConstraints = new Button(controlsComposite, SWT.CHECK);
+ relaxConstraints.setVisible(false);
relaxConstraints.setText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraints);
relaxConstraints.setToolTipText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraintsTip);
relaxConstraints.setSelection(((ProvisioningOperationWizard) getWizard()).getRelaxedResoltion());
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 122e6b7..54536c9 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
@@ -184,6 +184,7 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti
private void createViewControlsArea(Composite controlsComposite) {
relaxConstraints = new Button(controlsComposite, SWT.CHECK);
+ relaxConstraints.setVisible(false);
relaxConstraints.setText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraints);
relaxConstraints.setToolTipText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraintsTip);
relaxConstraints.setSelection(((ProvisioningOperationWizard) getWizard()).getRelaxedResoltion());