1 files changed, 125 insertions, 111 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java
index 849ff4952..4bf1147ac 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java
+++ b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java
@@ -17,19 +17,21 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cmscore.cert;
 
+
 import java.util.ListResourceBundle;
 
 import netscape.security.extensions.NSCertTypeExtension;
 import netscape.security.x509.KeyUsageExtension;
 
+
 /**
  * Resource Boundle for the Pretty Print
- * 
+ *
  * @author Jack Pan-Chen
  * @version $Revision$, $Date$
  */
 
-public class PrettyPrintResources extends ListResourceBundle {
+public class PrettyPrintResources extends  ListResourceBundle {
 
     /**
      * Returns content
@@ -39,10 +41,11 @@ public class PrettyPrintResources extends ListResourceBundle {
     }
 
     /**
-     * Constants. The suffix represents the number of possible parameters.
+     * Constants. The suffix represents the number of
+     * possible parameters.
      */
 
-    // certificate pretty print
+    //certificate pretty print
     public final static String TOKEN_CERTIFICATE = "tokenCertificate";
     public final static String TOKEN_DATA = "tokenData";
     public final static String TOKEN_VERSION = "tokenVersion";
@@ -61,14 +64,14 @@ public class PrettyPrintResources extends ListResourceBundle {
     public final static String TOKEN_EXTENSIONS = "tokenExtensions";
     public final static String TOKEN_SIGNATURE = "tokenSignature";
 
-    // extension pretty print
+    //extension pretty print
     public final static String TOKEN_YES = "tokenYes";
     public final static String TOKEN_NO = "tokenNo";
     public final static String TOKEN_IDENTIFIER = "tokenIdentifier";
     public final static String TOKEN_CRITICAL = "tokenCritical";
     public final static String TOKEN_VALUE = "tokenValue";
 
-    // specific extension token
+    //specific extension token
     public final static String TOKEN_KEY_TYPE = "tokenKeyType";
     public final static String TOKEN_CERT_TYPE = "tokenCertType";
     public final static String TOKEN_SKI = "tokenSKI";
@@ -171,111 +174,122 @@ public class PrettyPrintResources extends ListResourceBundle {
     public final static String TOKEN_CACHE_NOT_AVAILABLE = "cacheNotAvailable";
     public final static String TOKEN_CACHE_IS_EMPTY = "cacheIsEmpty";
 
-    // Tokens should have blank_space as trailer
+    //Tokens should have blank_space as trailer
     static final Object[][] contents = {
-            { TOKEN_CERTIFICATE, "Certificate: " }, { TOKEN_DATA, "Data: " },
-            { TOKEN_VERSION, "Version: " },
-            { TOKEN_SERIAL, "Serial Number: " },
-            { TOKEN_SIGALG, "Signature Algorithm: " },
-            { TOKEN_ISSUER, "Issuer: " }, { TOKEN_VALIDITY, "Validity: " },
-            { TOKEN_NOT_BEFORE, "Not Before: " },
-            { TOKEN_NOT_AFTER, "Not  After: " },
-            { TOKEN_SUBJECT, "Subject: " },
-            { TOKEN_SPKI, "Subject Public Key Info: " },
-            { TOKEN_ALGORITHM, "Algorithm: " },
-            { TOKEN_PUBLIC_KEY, "Public Key: " },
-            { TOKEN_PUBLIC_KEY_MODULUS, "Public Key Modulus: " },
-            { TOKEN_PUBLIC_KEY_EXPONENT, "Exponent: " },
-            { TOKEN_EXTENSIONS, "Extensions: " },
-            { TOKEN_SIGNATURE, "Signature: " }, { TOKEN_YES, "yes " },
-            { TOKEN_NO, "no " }, { TOKEN_IDENTIFIER, "Identifier: " },
-            { TOKEN_CRITICAL, "Critical: " }, { TOKEN_VALUE, "Value: " },
-            { TOKEN_KEY_TYPE, "Key Type " },
-            { TOKEN_CERT_TYPE, "Netscape Certificate Type " },
-            { TOKEN_SKI, "Subject Key Identifier " },
-            { TOKEN_AKI, "Authority Key Identifier " },
-            { TOKEN_ACCESS_DESC, "Access Description: " },
-            { TOKEN_OCSP_NOCHECK, "OCSP NoCheck: " },
-            { TOKEN_EXTENDED_KEY_USAGE, "Extended Key Usage: " },
-            { TOKEN_PRIVATE_KEY_USAGE, "Private Key Usage: " },
-            { TOKEN_PRESENCE_SERVER, "Presence Server: " },
-            { TOKEN_AIA, "Authority Info Access: " },
-            { TOKEN_KEY_USAGE, "Key Usage: " },
-            { KeyUsageExtension.DIGITAL_SIGNATURE, "Digital Signature " },
-            { KeyUsageExtension.NON_REPUDIATION, "Non Repudiation " },
-            { KeyUsageExtension.KEY_ENCIPHERMENT, "Key Encipherment " },
-            { KeyUsageExtension.DATA_ENCIPHERMENT, "Data Encipherment " },
-            { KeyUsageExtension.KEY_AGREEMENT, "Key Agreement " },
-            { KeyUsageExtension.KEY_CERTSIGN, "Key CertSign " },
-            { KeyUsageExtension.CRL_SIGN, "Crl Sign " },
-            { KeyUsageExtension.ENCIPHER_ONLY, "Encipher Only " },
-            { KeyUsageExtension.DECIPHER_ONLY, "Decipher Only " },
-            { TOKEN_CERT_USAGE, "Certificate Usage: " },
-            { NSCertTypeExtension.SSL_CLIENT, "SSL Client " },
-            { NSCertTypeExtension.SSL_SERVER, "SSL Server " },
-            { NSCertTypeExtension.EMAIL, "Secure Email " },
-            { NSCertTypeExtension.OBJECT_SIGNING, "Object Signing " },
-            { NSCertTypeExtension.SSL_CA, "SSL CA " },
-            { NSCertTypeExtension.EMAIL_CA, "Secure Email CA " },
-            { NSCertTypeExtension.OBJECT_SIGNING_CA, "ObjectSigning CA " },
-            { TOKEN_KEY_ID, "Key Identifier: " },
-            { TOKEN_AUTH_NAME, "Authority Name: " },
-            { TOKEN_CRL, "Certificate Revocation List: " },
-            { TOKEN_THIS_UPDATE, "This Update: " },
-            { TOKEN_NEXT_UPDATE, "Next Update: " },
-            { TOKEN_REVOKED_CERTIFICATES, "Revoked Certificates: " },
-            { TOKEN_REVOCATION_DATE, "Revocation Date: " },
-            { TOKEN_REVOCATION_REASON, "Revocation Reason " },
-            { TOKEN_REASON, "Reason: " },
-            { TOKEN_BASIC_CONSTRAINTS, "Basic Constraints " },
-            { TOKEN_NAME_CONSTRAINTS, "Name Constraints " },
-            { TOKEN_NSC_COMMENT, "Netscape Comment " },
-            { TOKEN_IS_CA, "Is CA: " },
-            { TOKEN_PATH_LEN, "Path Length Constraint: " },
-            { TOKEN_PATH_LEN_UNLIMITED, "UNLIMITED" },
-            { TOKEN_PATH_LEN_UNDEFINED, "UNDEFINED" },
-            { TOKEN_PATH_LEN_INVALID, "INVALID" },
-            { TOKEN_CRL_NUMBER, "CRL Number " }, { TOKEN_NUMBER, "Number: " },
-            { TOKEN_DELTA_CRL_INDICATOR, "Delta CRL Indicator " },
-            { TOKEN_BASE_CRL_NUMBER, "Base CRL Number: " },
-            { TOKEN_CERT_SCOPE_OF_USE, "Certificate Scope of Use " },
-            { TOKEN_SCOPE_OF_USE, "Scope of Use: " }, { TOKEN_PORT, "Port: " },
-            { TOKEN_ISSUER_ALT_NAME, "Issuer Alternative Name " },
-            { TOKEN_ISSUER_NAMES, "Issuer Names: " },
-            { TOKEN_SUBJECT_ALT_NAME, "Subject Alternative Name " },
-            { TOKEN_DECODING_ERROR, "Decoding Error" },
-            { TOKEN_FRESHEST_CRL_EXT, "Freshest CRL " },
-            { TOKEN_CRL_DP_EXT, "CRL Distribution Points " },
-            { TOKEN_CRLDP_NUMPOINTS, "Number of Points: " },
-            { TOKEN_CRLDP_POINTN, "Point " },
-            { TOKEN_CRLDP_DISTPOINT, "Distribution Point: " },
-            { TOKEN_CRLDP_REASONS, "Reason Flags: " },
-            { TOKEN_CRLDP_CRLISSUER, "CRL Issuer: " },
-            { TOKEN_ISSUING_DIST_POINT, "Issuing Distribution Point " },
-            { TOKEN_DIST_POINT_NAME, "Distribution Point: " },
-            { TOKEN_FULL_NAME, "Full Name: " },
-            { TOKEN_RELATIVE_NAME, "Name Relative To CRL Issuer: " },
-            { TOKEN_ONLY_USER_CERTS, "Only Contains User Certificates: " },
-            { TOKEN_ONLY_CA_CERTS, "Only Contains CA Certificates: " },
-            { TOKEN_ONLY_SOME_REASONS, "Only Some Reasons: " },
-            { TOKEN_INDIRECT_CRL, "Indirect CRL: " },
-            { TOKEN_INVALIDITY_DATE, "Invalidity Date " },
-            { TOKEN_DATE_OF_INVALIDITY, "Invalidity Date: " },
-            { TOKEN_CERTIFICATE_ISSUER, "Certificate Issuer " },
-            { TOKEN_HOLD_INSTRUCTION, "Hold Instruction Code " },
-            { TOKEN_HOLD_INSTRUCTION_CODE, "Hold Instruction Code: " },
-            { TOKEN_POLICY_CONSTRAINTS, "Policy Constraints " },
-            { TOKEN_INHIBIT_POLICY_MAPPING, "Inhibit Policy Mapping: " },
-            { TOKEN_REQUIRE_EXPLICIT_POLICY, "Require Explicit Policy: " },
-            { TOKEN_POLICY_MAPPINGS, "Policy Mappings " },
-            { TOKEN_MAPPINGS, "Mappings: " }, { TOKEN_MAP, "Map " },
-            { TOKEN_ISSUER_DOMAIN_POLICY, "Issuer Domain Policy: " },
-            { TOKEN_SUBJECT_DOMAIN_POLICY, "Subject Domain Policy: " },
-            { TOKEN_SUBJECT_DIR_ATTR, "Subject Directory Attributes " },
-            { TOKEN_ATTRIBUTES, "Attributes:" },
-            { TOKEN_ATTRIBUTE, "Attribute " }, { TOKEN_VALUES, "Values: " },
-            { TOKEN_NOT_SET, "not set" }, { TOKEN_NONE, "none" },
-            { TOKEN_CACHE_NOT_AVAILABLE, "CRL cache is not available. " },
-            { TOKEN_CACHE_IS_EMPTY, "CRL cache is empty. " }, };
+            {TOKEN_CERTIFICATE, "Certificate: "},
+            {TOKEN_DATA, "Data: "},
+            {TOKEN_VERSION, "Version: "},
+            {TOKEN_SERIAL, "Serial Number: "},
+            {TOKEN_SIGALG, "Signature Algorithm: "},
+            {TOKEN_ISSUER, "Issuer: "},
+            {TOKEN_VALIDITY, "Validity: "},
+            {TOKEN_NOT_BEFORE, "Not Before: "},
+            {TOKEN_NOT_AFTER, "Not  After: "},
+            {TOKEN_SUBJECT, "Subject: "},
+            {TOKEN_SPKI, "Subject Public Key Info: "},
+            {TOKEN_ALGORITHM, "Algorithm: "},
+            {TOKEN_PUBLIC_KEY, "Public Key: "},
+            {TOKEN_PUBLIC_KEY_MODULUS, "Public Key Modulus: "},
+            {TOKEN_PUBLIC_KEY_EXPONENT, "Exponent: "},
+            {TOKEN_EXTENSIONS, "Extensions: "},
+            {TOKEN_SIGNATURE, "Signature: "},
+            {TOKEN_YES, "yes "},
+            {TOKEN_NO, "no "},
+            {TOKEN_IDENTIFIER, "Identifier: "},
+            {TOKEN_CRITICAL, "Critical: "},
+            {TOKEN_VALUE, "Value: "},
+            {TOKEN_KEY_TYPE, "Key Type "},
+            {TOKEN_CERT_TYPE, "Netscape Certificate Type "},
+            {TOKEN_SKI, "Subject Key Identifier "},
+            {TOKEN_AKI, "Authority Key Identifier "},
+            {TOKEN_ACCESS_DESC, "Access Description: "},
+            {TOKEN_OCSP_NOCHECK, "OCSP NoCheck: "},
+            {TOKEN_EXTENDED_KEY_USAGE, "Extended Key Usage: "},
+            {TOKEN_PRIVATE_KEY_USAGE, "Private Key Usage: "},
+            {TOKEN_PRESENCE_SERVER, "Presence Server: "},
+            {TOKEN_AIA, "Authority Info Access: "},
+            {TOKEN_KEY_USAGE, "Key Usage: "},
+            {KeyUsageExtension.DIGITAL_SIGNATURE, "Digital Signature "},
+            {KeyUsageExtension.NON_REPUDIATION, "Non Repudiation "},
+            {KeyUsageExtension.KEY_ENCIPHERMENT, "Key Encipherment "},        
+            {KeyUsageExtension.DATA_ENCIPHERMENT, "Data Encipherment "},
+            {KeyUsageExtension.KEY_AGREEMENT, "Key Agreement "},
+            {KeyUsageExtension.KEY_CERTSIGN, "Key CertSign "},
+            {KeyUsageExtension.CRL_SIGN, "Crl Sign "},
+            {KeyUsageExtension.ENCIPHER_ONLY, "Encipher Only "},
+            {KeyUsageExtension.DECIPHER_ONLY, "Decipher Only "},
+            {TOKEN_CERT_USAGE, "Certificate Usage: "},
+            {NSCertTypeExtension.SSL_CLIENT, "SSL Client "},
+            {NSCertTypeExtension.SSL_SERVER, "SSL Server "},
+            {NSCertTypeExtension.EMAIL, "Secure Email "},
+            {NSCertTypeExtension.OBJECT_SIGNING, "Object Signing "},
+            {NSCertTypeExtension.SSL_CA, "SSL CA "},
+            {NSCertTypeExtension.EMAIL_CA, "Secure Email CA "},
+            {NSCertTypeExtension.OBJECT_SIGNING_CA, "ObjectSigning CA "},
+            {TOKEN_KEY_ID, "Key Identifier: "},
+            {TOKEN_AUTH_NAME, "Authority Name: "},
+            {TOKEN_CRL, "Certificate Revocation List: "},
+            {TOKEN_THIS_UPDATE, "This Update: "},
+            {TOKEN_NEXT_UPDATE, "Next Update: "},
+            {TOKEN_REVOKED_CERTIFICATES, "Revoked Certificates: "},
+            {TOKEN_REVOCATION_DATE, "Revocation Date: "},
+            {TOKEN_REVOCATION_REASON, "Revocation Reason "},
+            {TOKEN_REASON, "Reason: "},
+            {TOKEN_BASIC_CONSTRAINTS, "Basic Constraints "},
+            {TOKEN_NAME_CONSTRAINTS, "Name Constraints "},
+            {TOKEN_NSC_COMMENT, "Netscape Comment "},
+            {TOKEN_IS_CA, "Is CA: "},
+            {TOKEN_PATH_LEN, "Path Length Constraint: "},
+            {TOKEN_PATH_LEN_UNLIMITED, "UNLIMITED"},
+            {TOKEN_PATH_LEN_UNDEFINED, "UNDEFINED"},
+            {TOKEN_PATH_LEN_INVALID, "INVALID"},
+            {TOKEN_CRL_NUMBER, "CRL Number "},
+            {TOKEN_NUMBER, "Number: "},
+            {TOKEN_DELTA_CRL_INDICATOR, "Delta CRL Indicator "},
+            {TOKEN_BASE_CRL_NUMBER, "Base CRL Number: "},
+            {TOKEN_CERT_SCOPE_OF_USE, "Certificate Scope of Use "},
+            {TOKEN_SCOPE_OF_USE, "Scope of Use: "},
+            {TOKEN_PORT, "Port: "},
+            {TOKEN_ISSUER_ALT_NAME, "Issuer Alternative Name "},
+            {TOKEN_ISSUER_NAMES, "Issuer Names: "},
+            {TOKEN_SUBJECT_ALT_NAME, "Subject Alternative Name "},
+            {TOKEN_DECODING_ERROR, "Decoding Error"},
+            {TOKEN_FRESHEST_CRL_EXT, "Freshest CRL "},
+            {TOKEN_CRL_DP_EXT, "CRL Distribution Points "},
+            {TOKEN_CRLDP_NUMPOINTS, "Number of Points: "},
+            {TOKEN_CRLDP_POINTN, "Point "},
+            {TOKEN_CRLDP_DISTPOINT, "Distribution Point: "},
+            {TOKEN_CRLDP_REASONS, "Reason Flags: "},
+            {TOKEN_CRLDP_CRLISSUER, "CRL Issuer: "},
+            {TOKEN_ISSUING_DIST_POINT, "Issuing Distribution Point "},
+            {TOKEN_DIST_POINT_NAME, "Distribution Point: "},
+            {TOKEN_FULL_NAME, "Full Name: "},
+            {TOKEN_RELATIVE_NAME, "Name Relative To CRL Issuer: "},
+            {TOKEN_ONLY_USER_CERTS, "Only Contains User Certificates: "},
+            {TOKEN_ONLY_CA_CERTS, "Only Contains CA Certificates: "},
+            {TOKEN_ONLY_SOME_REASONS, "Only Some Reasons: "},
+            {TOKEN_INDIRECT_CRL, "Indirect CRL: "},
+            {TOKEN_INVALIDITY_DATE, "Invalidity Date "},
+            {TOKEN_DATE_OF_INVALIDITY, "Invalidity Date: "},
+            {TOKEN_CERTIFICATE_ISSUER, "Certificate Issuer "},
+            {TOKEN_HOLD_INSTRUCTION, "Hold Instruction Code "},
+            {TOKEN_HOLD_INSTRUCTION_CODE, "Hold Instruction Code: "},
+            {TOKEN_POLICY_CONSTRAINTS, "Policy Constraints "},
+            {TOKEN_INHIBIT_POLICY_MAPPING, "Inhibit Policy Mapping: "},
+            {TOKEN_REQUIRE_EXPLICIT_POLICY, "Require Explicit Policy: "},
+            {TOKEN_POLICY_MAPPINGS, "Policy Mappings "},
+            {TOKEN_MAPPINGS, "Mappings: "},
+            {TOKEN_MAP, "Map "},
+            {TOKEN_ISSUER_DOMAIN_POLICY, "Issuer Domain Policy: "},
+            {TOKEN_SUBJECT_DOMAIN_POLICY, "Subject Domain Policy: "},
+            {TOKEN_SUBJECT_DIR_ATTR, "Subject Directory Attributes "},
+            {TOKEN_ATTRIBUTES, "Attributes:" },
+            {TOKEN_ATTRIBUTE, "Attribute "},
+            {TOKEN_VALUES, "Values: "},
+            {TOKEN_NOT_SET, "not set"},
+            {TOKEN_NONE, "none"},
+            {TOKEN_CACHE_NOT_AVAILABLE, "CRL cache is not available. "},
+            {TOKEN_CACHE_IS_EMPTY, "CRL cache is empty. "},
+        };
 
 }