From e771ea26838a58ae79e71a9a522538d8d27e863f Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 06 Jan 2016 11:20:30 +0000
Subject: [PATCH] Added @Override annotations, removed {@inheritDoc}

---
 opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
index d90ea02..c613fc3 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions copyright 2014-2015 ForgeRock AS
+ *      Portions copyright 2014-2016 ForgeRock AS
  */
 package com.forgerock.opendj.cli;
 
@@ -54,9 +54,7 @@
  * like to trust a server certificate.
  */
 public final class PromptingTrustManager implements X509TrustManager {
-    /**
-     * Enumeration description server certificate trust option.
-     */
+    /** Enumeration description server certificate trust option. */
     private static enum TrustOption {
         UNTRUSTED(1, INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_NO.get()),
         SESSION(2, INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_SESSION.get()),
@@ -64,7 +62,6 @@
         CERTIFICATE_DETAILS(4, INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_DETAILS.get());
 
         private Integer choice;
-
         private LocalizableMessage msg;
 
         /**
@@ -209,7 +206,7 @@
         this(app, DEFAULT_PATH, sourceTrustManager);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void checkClientTrusted(final X509Certificate[] x509Certificates, final String s)
             throws CertificateException {
         try {
@@ -231,7 +228,7 @@
         }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void checkServerTrusted(final X509Certificate[] x509Certificates, final String s)
             throws CertificateException {
         try {
@@ -253,7 +250,7 @@
         }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public X509Certificate[] getAcceptedIssuers() {
         if (nestedTrustManager != null) {
             return nestedTrustManager.getAcceptedIssuers();

--
Gitblit v1.10.0