diff options
author | Mickael Istria | 2021-06-18 07:16:39 +0000 |
---|---|---|
committer | Mickael Istria | 2021-06-18 07:42:42 +0000 |
commit | b3de3dad4aa1bfe90eaa8cdc5081c80a1bbea9d9 (patch) | |
tree | 08451d7b4bf52c8df9a85f7a7c60e9770483f76c | |
parent | dcd4789b8f2528b605fe913cf43161b052e4874c (diff) | |
download | rt.equinox.p2-b3de3dad4aa1bfe90eaa8cdc5081c80a1bbea9d9.tar.gz rt.equinox.p2-b3de3dad4aa1bfe90eaa8cdc5081c80a1bbea9d9.tar.xz rt.equinox.p2-b3de3dad4aa1bfe90eaa8cdc5081c80a1bbea9d9.zip |
Bug 572816 - Fix JavadocY20210623-0320Y20210622-1150I20210627-1800I20210626-1800I20210625-1800I20210624-1800I20210624-1210I20210622-1800I20210621-1800I20210620-1800I20210619-1800I20210618-1920I20210618-1800
Change-Id: I66049499b6a43933edf2bcd3e31a0b74bf4538c5
Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.p2/+/182152
Tested-by: Equinox Bot <equinox-bot@eclipse.org>
Reviewed-by: Mickael Istria <mistria@redhat.com>
-rw-r--r-- | bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/UIServices.java | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/UIServices.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/UIServices.java index b260e7654..7a29b1d9b 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/UIServices.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/UIServices.java @@ -83,9 +83,11 @@ public abstract class UIServices { /** * - * @param trusted - * @param save - * @param trustUnsigned + * @param trusted Trusted certificates + * @param save Whether to store trusted certificates or not + * @param trustUnsigned Whether to trust unsigned. <code>true</code> if + * installation should continue despite unsigned content; + * <code>false</code> otherwise. * @deprecated use other constructor */ @Deprecated @@ -98,10 +100,13 @@ public abstract class UIServices { /** * - * @param trustedCertificates - * @param trustedPGPKeys - * @param save - * @param trustUnsigned + * @param trustedCertificates Trusted certificates + * @param trustedPGPKeys Trusted PGP public keys + * @param save Whether to store trusted certificates and keys or + * not. + * @param trustUnsigned Whether to trust unsigned. <code>true</code> if + * installation should continue despite unsigned + * content; <code>false</code> otherwise. * @since 2.8 */ public TrustInfo(Collection<Certificate> trustedCertificates, Collection<PGPPublicKey> trustedPGPKeys, @@ -207,20 +212,22 @@ public abstract class UIServices { /** * Opens a UI prompt to capture information about trusted content. * - * @param untrustedChain - an array of certificate chains for which there is - * no current trust anchor. May be <code>null</code>, - * which means there are no untrusted certificate - * chains. - * @param untrustedPGPKeys - * @param unsignedDetail - an array of strings, where each String describes - * content that is not signed. May be <code>null</code>, - * which means there is no unsigned content + * @param unTrustedCertificateChains - an array of certificate chains for which + * there is no current trust anchor. May be + * <code>null</code>, which means there are no + * untrusted certificate chains. + * @param untrustedPGPKeys Collection of PGP signer keys that are not + * trusted + * @param unsignedDetail - an array of strings, where each String + * describes content that is not signed. May + * be <code>null</code>, which means there is + * no unsigned content * @return the TrustInfo that describes the user's choices for trusting * certificates and unsigned content. * @since 2.8 */ public TrustInfo getTrustInfo(Certificate[][] unTrustedCertificateChains, Collection<PGPPublicKey> untrustedPGPKeys, - String[] details) { - return getTrustInfo(unTrustedCertificateChains, details); + String[] unsignedDetail) { + return getTrustInfo(unTrustedCertificateChains, unsignedDetail); } } |