summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorirbull2011-10-25 17:46:04 (EDT)
committerirbull2011-10-25 17:46:04 (EDT)
commit2152b9f4142f961497c59111d58c1641901431d0 (patch)
treedcba7df19d4645ecbf4ce94cd3c75d8140cc665e
parent4f57e452bf00223696f3fd13b5d6fcef6d2e9a7b (diff)
downloadrt.equinox.p2-2152b9f4142f961497c59111d58c1641901431d0.zip
rt.equinox.p2-2152b9f4142f961497c59111d58c1641901431d0.tar.gz
rt.equinox.p2-2152b9f4142f961497c59111d58c1641901431d0.tar.bz2
Bug 261928 : Adds a Relaxed Constraint Optionv20111025-2146
Adds a tooltip to the relaxed constraint option.
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java1
-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
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties3
4 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
index 2324793..eb62ed9 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
@@ -159,6 +159,7 @@ public class ProvUIMessages extends NLS {
public static String ResolutionWizardPage_NoSelections;
public static String ResolutionWizardPage_WarningInfoStatus;
public static String ResolutionWizardPage_RelaxedConstraints;
+ public static String ResolutionWizardPage_RelaxedConstraintsTip;
public static String ResolutionStatusPage_ErrorIULocked;
// Dialogs
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 a0033f1..cb51fa0 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
@@ -167,6 +167,7 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage {
private void createViewControlsArea(Composite controlsComposite) {
relaxConstraints = new Button(controlsComposite, SWT.CHECK);
relaxConstraints.setText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraints);
+ relaxConstraints.setToolTipText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraintsTip);
relaxConstraints.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
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 d6a85db..f240f82 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
@@ -176,6 +176,7 @@ public class SelectableIUsPage extends ResolutionStatusPage implements IResoluti
private void createViewControlsArea(Composite controlsComposite) {
relaxConstraints = new Button(controlsComposite, SWT.CHECK);
relaxConstraints.setText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraints);
+ relaxConstraints.setToolTipText(ProvUIMessages.ResolutionWizardPage_RelaxedConstraintsTip);
relaxConstraints.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
index e1db8c2..8abcaa4 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
@@ -106,7 +106,8 @@ ResolutionWizardPage_Canceled=The operation was cancelled.
ResolutionWizardPage_ErrorStatus=The operation cannot be completed. See the details.
ResolutionWizardPage_NoSelections=There were no installable units selected when the plan was computed.
ResolutionWizardPage_WarningInfoStatus=Your original request has been modified. See the details.
-ResolutionWizardPage_RelaxedConstraints=Run with relaxed constraints.
+ResolutionWizardPage_RelaxedConstraints=Install software with with relaxed constraints.
+ResolutionWizardPage_RelaxedConstraintsTip=Instructs p2 to install the selected software with with relaxed constraints.
ResolutionStatusPage_ErrorIULocked=Insufficient access privileges to apply this update.\n\n{0}