diff options
author | Fabian Pfaff | 2017-03-31 16:40:36 +0000 |
---|---|---|
committer | Pascal Rapicault | 2017-04-14 02:50:14 +0000 |
commit | e40aaa1a98bbf2e279e34e5b1b80b4c9efac8283 (patch) | |
tree | fcde71eca5c1fa56dffb17270d3fb40fa3458753 | |
parent | 9a2188080b901060f79f5aa4408a7f508ce3e369 (diff) | |
download | rt.equinox.p2-e40aaa1a98bbf2e279e34e5b1b80b4c9efac8283.tar.gz rt.equinox.p2-e40aaa1a98bbf2e279e34e5b1b80b4c9efac8283.tar.xz rt.equinox.p2-e40aaa1a98bbf2e279e34e5b1b80b4c9efac8283.zip |
bug 514495 - Certificate trust dialog ("Selection needed"): use "AcceptY20170420-1000I20170423-2000I20170422-2000I20170422-0300I20170421-2000I20170420-2000I20170419-2000I20170419-0430I20170419-0130I20170418-2000I20170417-2000I20170416-2000I20170415-2000I20170414-2000
selected" instead of "OK"
Change-Id: Ia23e33615141067b02f1390ca56e68301e9f5794
Signed-off-by: Fabian Pfaff <fabian.pfaff@vogella.com>
3 files changed, 9 insertions, 0 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 67d80b07c..6ab19e280 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 @@ -266,6 +266,7 @@ public class ProvUIMessages extends NLS { public static String TrustCertificateDialog_Details; public static String TrustCertificateDialog_Title; + public static String TrustCertificateDialog_AcceptSelectedButtonLabel; // Operations public static String UpdateManagerCompatibility_ExportSitesTitle; public static String UpdateManagerCompatibility_ImportSitesTitle; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TrustCertificateDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TrustCertificateDialog.java index 7c36e5ac4..52fe9e797 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TrustCertificateDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/TrustCertificateDialog.java @@ -14,6 +14,7 @@ import java.security.cert.X509Certificate; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.viewers.CertificateLabelProvider; import org.eclipse.equinox.internal.provisional.security.ui.X509CertificateViewDialog; +import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.viewers.*; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; @@ -61,6 +62,12 @@ public class TrustCertificateDialog extends ListSelectionDialog { } @Override + protected void createButtonsForButtonBar(Composite parent) { + createButton(parent, IDialogConstants.OK_ID, ProvUIMessages.TrustCertificateDialog_AcceptSelectedButtonLabel, true); + createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); + } + + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); certificateChainViewer = new TreeViewer(composite, SWT.BORDER); 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 1f68f4e7c..d6bc99629 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 @@ -273,3 +273,4 @@ RevertDialog_Title=Revert Software Configuration RollbackProfileElement_CurrentInstallation=Current Installation TrustCertificateDialog_Details=Details TrustCertificateDialog_Title=Do you trust these certificates? +TrustCertificateDialog_AcceptSelectedButtonLabel=&Accept selected |