diff options
| author | Fabian Pfaff | 2017-06-02 15:18:38 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2017-06-23 06:14:17 +0000 |
| commit | b1b14d5061eb7a9ae592fbd71a2437bfb5d86ba3 (patch) | |
| tree | 6c50f0c92ebd35afa06c29037c93824317269fa2 | |
| parent | 6e0300fbe0155dd09a58b195b9310342162bc7b8 (diff) | |
| download | rt.equinox.p2-b1b14d5061eb7a9ae592fbd71a2437bfb5d86ba3.tar.gz rt.equinox.p2-b1b14d5061eb7a9ae592fbd71a2437bfb5d86ba3.tar.xz rt.equinox.p2-b1b14d5061eb7a9ae592fbd71a2437bfb5d86ba3.zip | |
bug 517474 - Revert software configuration in the installation dialogI20170626-2000I20170625-2000I20170624-2000I20170623-2000
should use verbs instead of OK
Change-Id: I57bdfedb30096d146a1e451a258c5febeb5b43a8
Signed-off-by: Fabian Pfaff <fabian.pfaff@vogella.com>
3 files changed, 5 insertions, 2 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 ac04365c4..59a93aa41 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 @@ -235,6 +235,7 @@ public class ProvUIMessages extends NLS { public static String RevertDialog_ConfirmRestartMessage; public static String RevertDialog_RevertOperationLabel; public static String RevertDialog_Title; + public static String RevertDialog_CancelButtonLabel; public static String RollbackProfileElement_CurrentInstallation; public static String SelectableIUsPage_Select_All; public static String SelectableIUsPage_Deselect_All; 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 a21995668..a6bc216f7 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 @@ -268,6 +268,7 @@ RevertDialog_ConfigsLabel=&Previous configurations: RevertDialog_ConfirmRestartMessage=This operation requires restarting the workbench. Would you like to proceed? RevertDialog_RevertOperationLabel=Revert configuration RevertDialog_Title=Revert Software Configuration +RevertDialog_CancelButtonLabel=Cancel RollbackProfileElement_CurrentInstallation=Current Installation TrustCertificateDialog_Details=Details diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RevertProfilePage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RevertProfilePage.java index 9e65824bc..1f763abca 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RevertProfilePage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RevertProfilePage.java @@ -29,6 +29,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.*; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.*; +import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.dnd.*; @@ -274,8 +275,8 @@ public class RevertProfilePage extends InstallationPage implements ICopyable { revertAction = new Action() { @Override public void run() { - boolean result = MessageDialog.openQuestion(getShell(), ProvUIMessages.RevertDialog_Title, ProvUIMessages.RevertDialog_ConfirmRestartMessage); - if (!result) + int result = MessageDialog.open(MessageDialog.QUESTION, getShell(), ProvUIMessages.RevertDialog_Title, ProvUIMessages.RevertDialog_ConfirmRestartMessage, SWT.NONE, ProvUIMessages.RevertProfilePage_RevertLabel, ProvUIMessages.RevertDialog_CancelButtonLabel); + if (result != Window.OK) return; boolean finish = revert(); if (finish) { |