Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

1 files changed, 197 insertions, 219 deletions

diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
index ac32550e1..4490b25ee 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.policy.extensions;
 
+
 import java.io.IOException;
 import java.security.cert.CertificateException;
 import java.util.Locale;
@@ -49,20 +50,21 @@ import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.PolicyResult;
 import com.netscape.cms.policy.APolicyRule;
 
+
 /**
- * Certificate Policies. Adds certificate policies extension.
+ * Certificate Policies.
+ * Adds certificate policies extension.
  * <P>
- * 
  * <PRE>
  * NOTE:  The Policy Framework has been replaced by the Profile Framework.
  * </PRE>
  * <P>
- * 
+ *
  * @deprecated
  * @version $Revision$, $Date$
  */
-public class CertificatePoliciesExt extends APolicyRule implements
-        IEnrollmentPolicy, IExtendedPluginInfo {
+public class CertificatePoliciesExt extends APolicyRule
+    implements IEnrollmentPolicy, IExtendedPluginInfo {
     protected static final String PROP_CRITICAL = "critical";
     protected static final String PROP_NUM_CERTPOLICIES = "numCertPolicies";
 
@@ -89,46 +91,42 @@ public class CertificatePoliciesExt extends APolicyRule implements
     /**
      * Initializes this policy rule.
      * <P>
-     * 
+     *
      * The entries may be of the form:
-     * 
-     * ca.Policy.rule.<ruleName>.predicate=certType==ca
-     * ca.Policy.rule.<ruleName>.implName= ca.Policy.rule.<ruleName>.enable=true
-     * 
-     * @param config The config store reference
+     *
+     *      ca.Policy.rule.<ruleName>.predicate=certType==ca
+     *      ca.Policy.rule.<ruleName>.implName=
+     *      ca.Policy.rule.<ruleName>.enable=true
+     *
+     * @param config	The config store reference
      */
     public void init(ISubsystem owner, IConfigStore config)
-            throws EBaseException {
+        throws EBaseException {
         mConfig = config;
 
-        mEnabled = mConfig.getBoolean(IPolicyProcessor.PROP_ENABLE, false);
+        mEnabled = mConfig.getBoolean(
+                    IPolicyProcessor.PROP_ENABLE, false);
         mCritical = mConfig.getBoolean(PROP_CRITICAL, DEF_CRITICAL);
 
-        mNumCertPolicies = mConfig.getInteger(PROP_NUM_CERTPOLICIES,
-                DEF_NUM_CERTPOLICIES);
+        mNumCertPolicies = mConfig.getInteger(
+                    PROP_NUM_CERTPOLICIES, DEF_NUM_CERTPOLICIES);
         if (mNumCertPolicies < 1) {
-            log(ILogger.LL_FAILURE,
-                    CMS.getLogMessage("BASE_INVALID_ATTR_VALUE_2", NAME, ""));
-            throw new EBaseException(CMS.getUserMessage(
-                    "CMS_BASE_INVALID_ATTR_VALUE", PROP_NUM_CERTPOLICIES,
-                    "value must be greater than or equal to 1"));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("BASE_INVALID_ATTR_VALUE_2", NAME, ""));
+            throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_ATTR_VALUE",
+                        PROP_NUM_CERTPOLICIES,
+                        "value must be greater than or equal to 1"));
         }
 
-        // init Policy Mappings, check values if enabled.
+        // init Policy Mappings, check values if enabled. 
         mCertPolicies = new CertPolicy[mNumCertPolicies];
         for (int i = 0; i < mNumCertPolicies; i++) {
             String subtreeName = PROP_CERTPOLICY + i;
 
             try {
-                mCertPolicies[i] = new CertPolicy(subtreeName, mConfig,
-                        mEnabled);
+                mCertPolicies[i] = new CertPolicy(subtreeName, mConfig, mEnabled);
             } catch (EBaseException e) {
-                log(ILogger.LL_FAILURE,
-                        NAME
-                                + ": "
-                                + CMS.getLogMessage(
-                                        "POLICY_ERROR_CREATE_CERT_POLICY",
-                                        e.toString()));
+                log(ILogger.LL_FAILURE, NAME + ": " +
+                    CMS.getLogMessage("POLICY_ERROR_CREATE_CERT_POLICY", e.toString()));
                 throw e;
             }
         }
@@ -139,22 +137,22 @@ public class CertificatePoliciesExt extends APolicyRule implements
                 Vector CertPolicies = new Vector();
 
                 for (int j = 0; j < mNumCertPolicies; j++) {
-                    CertPolicies
-                            .addElement(mCertPolicies[j].mCertificatePolicyInfo);
+                    CertPolicies.addElement(
+                        mCertPolicies[j].mCertificatePolicyInfo);
                 }
-                mCertificatePoliciesExtension = new CertificatePoliciesExtension(
-                        mCritical, CertPolicies);
+                mCertificatePoliciesExtension = 
+                        new CertificatePoliciesExtension(mCritical, CertPolicies);
             } catch (IOException e) {
-                throw new EBaseException(CMS.getUserMessage(
-                        "CMS_BASE_INTERNAL_ERROR", "Error initializing " + NAME
-                                + " Error: " + e));
+                throw new EBaseException(
+                        CMS.getUserMessage("CMS_BASE_INTERNAL_ERROR",
+                            "Error initializing " + NAME + " Error: " + e));
             }
         }
 
-        // form instance params
+        // form instance params 
         mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical);
-        mInstanceParams.addElement(PROP_NUM_CERTPOLICIES + "="
-                + mNumCertPolicies);
+        mInstanceParams.addElement(
+            PROP_NUM_CERTPOLICIES + "=" + mNumCertPolicies);
         for (int i = 0; i < mNumCertPolicies; i++) {
             mCertPolicies[i].getInstanceParams(mInstanceParams);
         }
@@ -163,18 +161,19 @@ public class CertificatePoliciesExt extends APolicyRule implements
     /**
      * Applies the policy on the given Request.
      * <p>
-     * 
-     * @param req The request on which to apply policy.
+     *
+     * @param req	The request on which to apply policy.
      * @return The policy result object.
      */
     public PolicyResult apply(IRequest req) {
 
         // get certInfo from request.
-        X509CertInfo[] ci = req.getExtDataInCertInfoArray(IRequest.CERT_INFO);
-
+        X509CertInfo[] ci = 
+            req.getExtDataInCertInfoArray(IRequest.CERT_INFO);
+		
         if (ci == null || ci[0] == null) {
             setError(req, CMS.getUserMessage("CMS_POLICY_NO_CERT_INFO"), NAME);
-            return PolicyResult.REJECTED;
+            return PolicyResult.REJECTED; 
         }
 
         for (int i = 0; i < ci.length; i++) {
@@ -190,13 +189,13 @@ public class CertificatePoliciesExt extends APolicyRule implements
         CertificateExtensions extensions = null;
 
         try {
-            extensions = (CertificateExtensions) certInfo
-                    .get(X509CertInfo.EXTENSIONS);
+            extensions = (CertificateExtensions)
+                    certInfo.get(X509CertInfo.EXTENSIONS);
             if (extensions == null) {
                 extensions = new CertificateExtensions();
                 try {
-                    certInfo.set(X509CertInfo.VERSION, new CertificateVersion(
-                            CertificateVersion.V3));
+                    certInfo.set(X509CertInfo.VERSION, 
+                        new CertificateVersion(CertificateVersion.V3));
                     certInfo.set(X509CertInfo.EXTENSIONS, extensions);
                 } catch (Exception e) {
                 }
@@ -205,9 +204,8 @@ public class CertificatePoliciesExt extends APolicyRule implements
                 try {
                     extensions.delete(CertificatePoliciesExtension.NAME);
                 } catch (IOException e) {
-                    // this is the hack: for some reason, the key which is the
-                    // name
-                    // of the policy has been converted into the OID
+                    // this is the hack: for some reason, the key which is the name
+                    // of the policy has been converted into the OID 
                     try {
                         extensions.delete("2.5.29.32");
                     } catch (IOException ee) {
@@ -215,33 +213,24 @@ public class CertificatePoliciesExt extends APolicyRule implements
                 }
             }
             extensions.set(CertificatePoliciesExtension.NAME,
-                    mCertificatePoliciesExtension);
+                mCertificatePoliciesExtension);
         } catch (IOException e) {
-            log(ILogger.LL_FAILURE,
-                    CMS.getLogMessage("POLICY_ERROR_CERTIFICATE_POLICIES_1",
-                            e.toString()));
-            setError(
-                    req,
-                    CMS.getUserMessage("CMS_POLICY_CERTIFICATE_POLICIES_ERROR"),
-                    NAME);
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_ERROR_CERTIFICATE_POLICIES_1",
+                    e.toString()));
+            setError(req,
+                CMS.getUserMessage("CMS_POLICY_CERTIFICATE_POLICIES_ERROR"), NAME);
             return PolicyResult.REJECTED;
         } catch (CertificateException e) {
-            log(ILogger.LL_FAILURE,
-                    CMS.getLogMessage("POLICY_ERROR_CERTIFICATE_POLICIES_1",
-                            e.toString()));
-            setError(
-                    req,
-                    CMS.getUserMessage("CMS_POLICY_CERTIFICATE_POLICIES_ERROR"),
-                    NAME);
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_ERROR_CERTIFICATE_POLICIES_1",
+                    e.toString()));
+            setError(req,
+                CMS.getUserMessage("CMS_POLICY_CERTIFICATE_POLICIES_ERROR"), NAME);
             return PolicyResult.REJECTED;
         } catch (Exception e) {
-            log(ILogger.LL_FAILURE,
-                    CMS.getLogMessage("POLICY_ERROR_CERTIFICATE_POLICIES_1",
-                            e.toString()));
-            setError(
-                    req,
-                    CMS.getUserMessage("CMS_POLICY_CERTIFICATE_POLICIES_ERROR"),
-                    NAME);
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_ERROR_CERTIFICATE_POLICIES_1",
+                    e.toString()));
+            setError(req,
+                CMS.getUserMessage("CMS_POLICY_CERTIFICATE_POLICIES_ERROR"), NAME);
             return PolicyResult.REJECTED;
         }
         return PolicyResult.ACCEPTED;
@@ -249,82 +238,74 @@ public class CertificatePoliciesExt extends APolicyRule implements
 
     /**
      * Return configured parameters for a policy rule instance.
-     * 
+     *
      * @return nvPairs A Vector of name/value pairs.
      */
-    public Vector getInstanceParams() {
+    public Vector getInstanceParams() { 
         return mInstanceParams;
     }
 
     /**
-     * Default config parameters. To add more permitted or excluded subtrees,
-     * increase the num to greater than 0 and more configuration params will
-     * show up in the console.
+     * Default config parameters. 
+     * To add more permitted or excluded subtrees, 
+     * increase the num to greater than 0 and more configuration params 
+     * will show up in the console.
      */
     private static Vector mDefParams = new Vector();
     static {
         mDefParams.addElement(PROP_CRITICAL + "=" + DEF_CRITICAL);
-        mDefParams.addElement(PROP_NUM_CERTPOLICIES + "="
-                + DEF_NUM_CERTPOLICIES);
+        mDefParams.addElement(
+            PROP_NUM_CERTPOLICIES + "=" + DEF_NUM_CERTPOLICIES);
         String certPolicy0Dot = PROP_CERTPOLICY + "0.";
 
-        mDefParams.addElement(certPolicy0Dot
-                + CertPolicy.PROP_POLICY_IDENTIFIER + "=" + "");
-        mDefParams.addElement(certPolicy0Dot + CertPolicy.PROP_NOTICE_REF_ORG
-                + "=" + "");
-        mDefParams.addElement(certPolicy0Dot + CertPolicy.PROP_NOTICE_REF_NUMS
-                + "=" + "");
-        mDefParams.addElement(certPolicy0Dot + CertPolicy.PROP_USER_NOTICE_TEXT
-                + "=" + "");
-        mDefParams.addElement(certPolicy0Dot + CertPolicy.PROP_CPS_URI + "="
-                + "");
+        mDefParams.addElement(
+            certPolicy0Dot + CertPolicy.PROP_POLICY_IDENTIFIER + "=" + "");
+        mDefParams.addElement(
+            certPolicy0Dot + CertPolicy.PROP_NOTICE_REF_ORG + "=" + "");
+        mDefParams.addElement(
+            certPolicy0Dot + CertPolicy.PROP_NOTICE_REF_NUMS + "=" + "");
+        mDefParams.addElement(
+            certPolicy0Dot + CertPolicy.PROP_USER_NOTICE_TEXT + "=" + "");
+        mDefParams.addElement(
+            certPolicy0Dot + CertPolicy.PROP_CPS_URI + "=" + "");
 
     }
 
     /**
      * Return default parameters for a policy implementation.
-     * 
+     *
      * @return nvPairs A Vector of name/value pairs.
      */
-    public Vector getDefaultParams() {
+    public Vector getDefaultParams() { 
         return mDefParams;
     }
 
     public String[] getExtendedPluginInfo(Locale locale) {
         Vector theparams = new Vector();
-
-        theparams.addElement(PROP_CRITICAL
-                + ";boolean;RFC 3280 recommendation: MUST be non-critical.");
-        theparams
-                .addElement(PROP_NUM_CERTPOLICIES
-                        + ";number; Number of certificate policies. The value must be greater than or equal to 1");
+		
+        theparams.addElement(PROP_CRITICAL + ";boolean;RFC 3280 recommendation: MUST be non-critical.");
+        theparams.addElement(PROP_NUM_CERTPOLICIES + ";number; Number of certificate policies. The value must be greater than or equal to 1");
 
         for (int k = 0; k < 5; k++) {
             String certPolicykDot = PROP_CERTPOLICY + k + ".";
 
-            theparams
-                    .addElement(certPolicykDot
-                            + CertPolicy.PROP_POLICY_IDENTIFIER
-                            + ";string,required;An object identifier in the form n.n.n.n");
-            theparams.addElement(certPolicykDot
-                    + CertPolicy.PROP_NOTICE_REF_ORG
-                    + ";string;See RFC 3280 sec 4.2.1.5");
-            theparams
-                    .addElement(certPolicykDot
-                            + CertPolicy.PROP_NOTICE_REF_NUMS
-                            + ";string;comma-separated list of numbers. See RFC 3280 sec 4.2.1.5");
-            theparams.addElement(certPolicykDot
-                    + CertPolicy.PROP_USER_NOTICE_TEXT
-                    + ";string;See RFC 3280 sec 4.2.1.5");
-            theparams.addElement(certPolicykDot + CertPolicy.PROP_CPS_URI
-                    + ";string;See RFC 3280 sec 4.2.1.5");
+            theparams.addElement(certPolicykDot +
+                CertPolicy.PROP_POLICY_IDENTIFIER + ";string,required;An object identifier in the form n.n.n.n");
+            theparams.addElement(certPolicykDot +
+                CertPolicy.PROP_NOTICE_REF_ORG + ";string;See RFC 3280 sec 4.2.1.5");
+            theparams.addElement(certPolicykDot +
+                CertPolicy.PROP_NOTICE_REF_NUMS +
+                ";string;comma-separated list of numbers. See RFC 3280 sec 4.2.1.5");
+            theparams.addElement(certPolicykDot +
+                CertPolicy.PROP_USER_NOTICE_TEXT + ";string;See RFC 3280 sec 4.2.1.5");
+            theparams.addElement(certPolicykDot +
+                CertPolicy.PROP_CPS_URI + ";string;See RFC 3280 sec 4.2.1.5");
         }
 
-        theparams.addElement(IExtendedPluginInfo.HELP_TOKEN
-                + ";configuration-policyrules-certificatepolicies");
-        theparams
-                .addElement(IExtendedPluginInfo.HELP_TEXT
-                        + ";Adds Certificate Policies Extension. See RFC 3280 (4.2.1.5)");
+        theparams.addElement(IExtendedPluginInfo.HELP_TOKEN +
+            ";configuration-policyrules-certificatepolicies");
+        theparams.addElement(IExtendedPluginInfo.HELP_TEXT +
+            ";Adds Certificate Policies Extension. See RFC 3280 (4.2.1.5)");
 
         String[] params = new String[theparams.size()];
 
@@ -333,6 +314,7 @@ public class CertificatePoliciesExt extends APolicyRule implements
     }
 }
 
+
 class CertPolicy {
 
     protected static final String PROP_POLICY_IDENTIFIER = "policyId";
@@ -355,35 +337,34 @@ class CertPolicy {
 
     /**
      * forms policy map parameters.
-     * 
      * @param name name of this policy map, for example certPolicy0
      * @param config parent's config from where we find this configuration.
      * @param enabled whether policy was enabled.
      */
-    protected CertPolicy(String name, IConfigStore config, boolean enabled)
-            throws EBaseException {
+    protected CertPolicy(String name, IConfigStore config, boolean enabled) 
+        throws EBaseException {
         mName = name;
         mConfig = config.getSubStore(mName);
         mNameDot = mName + ".";
 
-        if (mConfig == null) {
-            CMS.debug("CertificatePoliciesExt::CertPolicy - mConfig is "
-                    + "null!");
-            throw new EBaseException("mConfig is null");
+        if( mConfig == null ) {
+            CMS.debug( "CertificatePoliciesExt::CertPolicy - mConfig is " +
+                       "null!" );
+            throw new EBaseException( "mConfig is null" );
         }
 
         // if there's no configuration for this policy put it there.
         if (mConfig.size() == 0) {
-            config.putString(mNameDot + PROP_POLICY_IDENTIFIER, "");
-            config.putString(mNameDot + PROP_NOTICE_REF_ORG, "");
-            config.putString(mNameDot + PROP_NOTICE_REF_NUMS, "");
-            config.putString(mNameDot + PROP_USER_NOTICE_TEXT, "");
-            config.putString(mNameDot + PROP_CPS_URI, "");
+            config.putString(mNameDot + PROP_POLICY_IDENTIFIER, ""); 
+            config.putString(mNameDot + PROP_NOTICE_REF_ORG, ""); 
+            config.putString(mNameDot + PROP_NOTICE_REF_NUMS, ""); 
+            config.putString(mNameDot + PROP_USER_NOTICE_TEXT, ""); 
+            config.putString(mNameDot + PROP_CPS_URI, ""); 
             mConfig = config.getSubStore(mName);
-            if (mConfig == null || mConfig.size() == 0) {
-                CMS.debug("CertificatePoliciesExt::CertPolicy - mConfig "
-                        + "is null or empty!");
-                throw new EBaseException("mConfig is null or empty");
+            if(mConfig == null || mConfig.size() == 0) {
+	            CMS.debug( "CertificatePoliciesExt::CertPolicy - mConfig " +
+                           "is null or empty!" );
+                throw new EBaseException( "mConfig is null or empty" );
             }
         }
 
@@ -395,71 +376,71 @@ class CertPolicy {
         mCpsUri = mConfig.getString(PROP_CPS_URI, null);
 
         // adjust for "" and console returning "null"
-        if (mPolicyId != null
-                && (mPolicyId.length() == 0 || mPolicyId.equals("null"))) {
+        if (mPolicyId != null && 
+            (mPolicyId.length() == 0 || 
+                mPolicyId.equals("null"))) {
             mPolicyId = null;
         }
-        if (mNoticeRefOrg != null
-                && (mNoticeRefOrg.length() == 0 || mNoticeRefOrg.equals("null"))) {
+        if (mNoticeRefOrg != null && 
+            (mNoticeRefOrg.length() == 0 || 
+                mNoticeRefOrg.equals("null"))) {
             mNoticeRefOrg = null;
         }
-        if (mNoticeRefNums != null
-                && (mNoticeRefNums.length() == 0 || mNoticeRefNums
-                        .equals("null"))) {
+        if (mNoticeRefNums != null && 
+            (mNoticeRefNums.length() == 0 || 
+                mNoticeRefNums.equals("null"))) {
             mNoticeRefNums = null;
         }
-        if (mNoticeRefExplicitText != null
-                && (mNoticeRefExplicitText.length() == 0 || mNoticeRefExplicitText
-                        .equals("null"))) {
+        if (mNoticeRefExplicitText != null && 
+            (mNoticeRefExplicitText.length() == 0 || 
+                mNoticeRefExplicitText.equals("null"))) {
             mNoticeRefExplicitText = null;
         }
-        if (mCpsUri != null
-                && (mCpsUri.length() == 0 || mCpsUri.equals("null"))) {
+        if (mCpsUri != null && 
+            (mCpsUri.length() == 0 || 
+                mCpsUri.equals("null"))) {
             mCpsUri = null;
         }
 
         // policy ids cannot be null if policy is enabled.
         String msg = "value cannot be null.";
 
-        if (mPolicyId == null && enabled)
-            throw new EBaseException(CMS.getUserMessage(
-                    "CMS_BASE_INVALID_ATTR_VALUE", mNameDot
-                            + PROP_POLICY_IDENTIFIER, msg));
+        if (mPolicyId == null && enabled) 
+            throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_ATTR_VALUE",
+                        mNameDot + PROP_POLICY_IDENTIFIER, msg));
         msg = "NoticeReference is optional; If chosen to include, NoticeReference must at least has 'organization'";
-        if (mNoticeRefOrg == null && mNoticeRefNums != null && enabled)
-            throw new EBaseException(CMS.getUserMessage(
-                    "CMS_BASE_INVALID_ATTR_VALUE", mNameDot
-                            + PROP_NOTICE_REF_ORG, msg));
-
-        // if a policy id is not null check that it is a valid OID.
+        if (mNoticeRefOrg == null && mNoticeRefNums != null && enabled) 
+            throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_ATTR_VALUE",
+                        mNameDot + PROP_NOTICE_REF_ORG, msg));
+		
+            // if a policy id is not null check that it is a valid OID.
         ObjectIdentifier policyId = null;
 
-        if (mPolicyId != null)
-            policyId = CMS.checkOID(mNameDot + PROP_POLICY_IDENTIFIER,
-                    mPolicyId);
-
-        // if enabled, form CertificatePolicyInfo to be encoded in
-        // extension. Policy ids should be all set.
+        if (mPolicyId != null) 
+            policyId = CMS.checkOID(
+                        mNameDot + PROP_POLICY_IDENTIFIER, mPolicyId);
+		
+            // if enabled, form CertificatePolicyInfo to be encoded in
+            // extension. Policy ids should be all set.
         if (enabled) {
-            CMS.debug("CertPolicy: in CertPolicy");
+	    CMS.debug("CertPolicy: in CertPolicy");
             DisplayText displayText = null;
 
-            if (mNoticeRefExplicitText != null
-                    && !mNoticeRefExplicitText.equals(""))
-                displayText = new DisplayText(DisplayText.tag_VisibleString,
-                        mNoticeRefExplicitText);
-            // new DisplayText(DisplayText.tag_IA5String,
-            // mNoticeRefExplicitText);
+            if (mNoticeRefExplicitText != null && 
+                !mNoticeRefExplicitText.equals(""))
+                displayText = new DisplayText(DisplayText.tag_VisibleString, mNoticeRefExplicitText);
+                //		  new DisplayText(DisplayText.tag_IA5String, mNoticeRefExplicitText);
             DisplayText orgName = null;
 
-            if (mNoticeRefOrg != null && !mNoticeRefOrg.equals(""))
-                orgName = new DisplayText(DisplayText.tag_VisibleString,
-                        mNoticeRefOrg);
-            // new DisplayText(DisplayText.tag_VisibleString, mNoticeRefOrg);
+            if (mNoticeRefOrg != null && 
+                !mNoticeRefOrg.equals(""))
+                orgName =
+                        new DisplayText(DisplayText.tag_VisibleString, mNoticeRefOrg);
+                //		  new DisplayText(DisplayText.tag_VisibleString, mNoticeRefOrg);
 
-            int[] nums = new int[0];
-            ;
-            if (mNoticeRefNums != null && !mNoticeRefNums.equals("")) {
+            int[] nums = new int[0];;
+            if (mNoticeRefNums != null && 
+                !mNoticeRefNums.equals("")) {
 
                 // should add a method to NoticeReference to take a
                 // Vector...but let's do this for now
@@ -485,27 +466,26 @@ class CertPolicy {
             CertificatePolicyId cpolicyId = null;
 
             try {
-                cpolicyId = new CertificatePolicyId(
-                        ObjectIdentifier.getObjectIdentifier(mPolicyId));
+                cpolicyId = new CertificatePolicyId(ObjectIdentifier.getObjectIdentifier(mPolicyId));
             } catch (Exception e) {
-                throw new EBaseException(CMS.getUserMessage(
-                        "CMS_POLICY_CERTIFICATE_POLICIES_ERROR", mPolicyId));
+                throw new
+                    EBaseException(CMS.getUserMessage("CMS_POLICY_CERTIFICATE_POLICIES_ERROR", mPolicyId));
             }
 
             PolicyQualifiers policyQualifiers = new PolicyQualifiers();
-
+			
             NoticeReference noticeReference = null;
-
+			
             if (orgName != null)
                 noticeReference = new NoticeReference(orgName, nums);
 
             UserNotice userNotice = null;
 
             if (displayText != null || noticeReference != null) {
-                userNotice = new UserNotice(noticeReference, displayText);
-
-                PolicyQualifierInfo policyQualifierInfo1 = new PolicyQualifierInfo(
-                        PolicyQualifierInfo.QT_UNOTICE, userNotice);
+                userNotice = new UserNotice (noticeReference, displayText);
+				
+                PolicyQualifierInfo policyQualifierInfo1 =
+                    new PolicyQualifierInfo(PolicyQualifierInfo.QT_UNOTICE, userNotice);
 
                 policyQualifiers.add(policyQualifierInfo1);
             }
@@ -513,48 +493,46 @@ class CertPolicy {
             CPSuri cpsUri = null;
 
             if (mCpsUri != null && mCpsUri.length() > 0) {
-                cpsUri = new CPSuri(mCpsUri);
-                PolicyQualifierInfo policyQualifierInfo2 = new PolicyQualifierInfo(
-                        PolicyQualifierInfo.QT_CPS, cpsUri);
-
+                cpsUri = new CPSuri (mCpsUri);
+                PolicyQualifierInfo policyQualifierInfo2 =
+                    new PolicyQualifierInfo(PolicyQualifierInfo.QT_CPS, cpsUri);
+				
                 policyQualifiers.add(policyQualifierInfo2);
             }
 
-            if ((mNoticeRefOrg == null || mNoticeRefOrg.equals(""))
-                    && (mNoticeRefExplicitText == null || mNoticeRefExplicitText
-                            .equals(""))
-                    && (mCpsUri == null || mCpsUri.equals(""))) {
-                CMS.debug("CertPolicy mNoticeRefOrg = " + mNoticeRefOrg);
-                CMS.debug("CertPolicy mNoticeRefExplicitText = "
-                        + mNoticeRefExplicitText);
-                CMS.debug("CertPolicy mCpsUri = " + mCpsUri);
+            if ((mNoticeRefOrg == null || mNoticeRefOrg.equals("")) &&
+                (mNoticeRefExplicitText == null || mNoticeRefExplicitText.equals("")) &&
+                (mCpsUri == null || mCpsUri.equals(""))) {
+		CMS.debug("CertPolicy mNoticeRefOrg = "+mNoticeRefOrg);
+		CMS.debug("CertPolicy mNoticeRefExplicitText = "+mNoticeRefExplicitText);
+		CMS.debug("CertPolicy mCpsUri = "+mCpsUri);
 
                 mCertificatePolicyInfo = new CertificatePolicyInfo(cpolicyId);
             } else {
-                CMS.debug("CertPolicy mNoticeRefOrg = " + mNoticeRefOrg);
-                CMS.debug("CertPolicy mNoticeRefExplicitText = "
-                        + mNoticeRefExplicitText);
-                CMS.debug("CertPolicy mCpsUri = " + mCpsUri);
-                mCertificatePolicyInfo = new CertificatePolicyInfo(cpolicyId,
-                        policyQualifiers);
+		CMS.debug("CertPolicy mNoticeRefOrg = "+mNoticeRefOrg);
+		CMS.debug("CertPolicy mNoticeRefExplicitText = "+mNoticeRefExplicitText);
+		CMS.debug("CertPolicy mCpsUri = "+mCpsUri);
+                mCertificatePolicyInfo = new CertificatePolicyInfo(cpolicyId, policyQualifiers);
             }
         }
     }
 
     protected void getInstanceParams(Vector instanceParams) {
-        instanceParams.addElement(mNameDot + PROP_POLICY_IDENTIFIER + "="
-                + (mPolicyId == null ? "" : mPolicyId));
-        instanceParams.addElement(mNameDot + PROP_NOTICE_REF_ORG + "="
-                + (mNoticeRefOrg == null ? "" : mNoticeRefOrg));
-        instanceParams.addElement(mNameDot + PROP_NOTICE_REF_NUMS + "="
-                + (mNoticeRefNums == null ? "" : mNoticeRefNums));
-        instanceParams
-                .addElement(mNameDot
-                        + PROP_USER_NOTICE_TEXT
-                        + "="
-                        + (mNoticeRefExplicitText == null ? ""
-                                : mNoticeRefExplicitText));
-        instanceParams.addElement(mNameDot + PROP_CPS_URI + "="
-                + (mCpsUri == null ? "" : mCpsUri));
+        instanceParams.addElement(
+            mNameDot + PROP_POLICY_IDENTIFIER + "=" + (mPolicyId == null ? "" :
+                mPolicyId));
+        instanceParams.addElement(
+            mNameDot + PROP_NOTICE_REF_ORG + "=" + (mNoticeRefOrg == null ? "" :
+                mNoticeRefOrg));
+        instanceParams.addElement(
+            mNameDot + PROP_NOTICE_REF_NUMS + "=" + (mNoticeRefNums == null ? "" :
+                mNoticeRefNums));
+        instanceParams.addElement(
+            mNameDot + PROP_USER_NOTICE_TEXT + "=" + (mNoticeRefExplicitText == null ? "" :
+                mNoticeRefExplicitText));
+        instanceParams.addElement(
+            mNameDot + PROP_CPS_URI + "=" + (mCpsUri == null ? "" :
+                mCpsUri));
     }
 }
+