Formatting - no wrap in comments and code

1 files changed, 34 insertions, 32 deletions

diff --git a/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java b/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java
index 1f2eb69a..21280f0f 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.authentication;
 
-
 import java.io.IOException;
 import java.io.PushbackReader;
 import java.io.StringReader;
@@ -28,24 +27,25 @@ import netscape.ldap.LDAPEntry;
 import com.netscape.certsrv.authentication.EAuthException;
 import com.netscape.certsrv.base.EBaseException;
 
-
 /**
- * class for parsing a DN pattern used to construct a certificate 
- * subject name from ldap attributes and dn.<p>
+ * class for parsing a DN pattern used to construct a certificate
+ * subject name from ldap attributes and dn.
+ * <p>
  * 
- * dnpattern is a string representing a subject name pattern to formulate from 
- * the directory attributes and entry dn. If empty or not set, the 
- * ldap entry DN will be used as the certificate subject name. <p>
+ * dnpattern is a string representing a subject name pattern to formulate from the directory attributes and entry dn. If empty or not set, the ldap entry DN will be used as the certificate subject name.
+ * <p>
+ * 
+ * The syntax is
  * 
- * The syntax is 
  * <pre>
- *		dnPattern := rdnPattern *[ "," rdnPattern ]
- *		rdnPattern := avaPattern *[ "+" avaPattern ]
+ * 	dnPattern := rdnPattern *[ "," rdnPattern ]
+ * 	rdnPattern := avaPattern *[ "+" avaPattern ]
  * 		avaPattern := name "=" value | 
- *				      name "=" "$attr" "." attrName [ "." attrNumber ] | 
- *				      name "=" "$dn" "." attrName [ "." attrNumber ] | 
- *				 	  "$dn" "." "$rdn" "." number
+ * 			      name "=" "$attr" "." attrName [ "." attrNumber ] | 
+ * 			      name "=" "$dn" "." attrName [ "." attrNumber ] | 
+ * 			 	  "$dn" "." "$rdn" "." number
  * </pre>
+ * 
  * <pre>
  * Example1: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US </i>
  * Ldap entry: dn:  UID=jjames, OU=IS, OU=people, O=acme.org
@@ -72,11 +72,12 @@ import com.netscape.certsrv.base.EBaseException;
  *     E = the first 'mail' ldap attribute value in user's entry. <br>
  *     CN = the (first) 'cn' ldap attribute value in the user's entry. <br>
  *     OU = the second 'ou' value in the user's entry DN. note multiple AVAs
- *		    in a RDN in this example. <br>
+ * 	    in a RDN in this example. <br>
  *     O = the (first) 'o' value in the user's entry DN. <br>
  *     C = the string "US"
  * <p>
  * </pre>
+ * 
  * <pre>
  * Example3: <i>CN=$attr.cn, $rdn.2, O=$dn.o, C=US</i>
  * Ldap entry: dn:  UID=jjames, OU=IS+OU=people, O=acme.org
@@ -101,15 +102,15 @@ import com.netscape.certsrv.base.EBaseException;
  * <p>	
  *     CN = the (first) 'cn' ldap attribute value in the user's entry. <br>
  *     OU = the second 'ou' value in the user's entry DN followed by the 
- *			first 'ou' value in the user's entry. note multiple AVAs
- *		    in a RDN in this example. <br>
+ * 		first 'ou' value in the user's entry. note multiple AVAs
+ * 	    in a RDN in this example. <br>
  *     O = the (first) 'o' value in the user's entry DN. <br>
  *     C = the string "US"
  * <p>
  * </pre>
- * If an attribute or subject DN component does not exist the attribute 
- * is skipped.
- *
+ * 
+ * If an attribute or subject DN component does not exist the attribute is skipped.
+ * 
  * @version $Revision$, $Date$
  */
 public class DNPattern {
@@ -125,13 +126,14 @@ public class DNPattern {
 
     protected String mTestDN = null;
 
-    /** 
+    /**
      * Construct a DN pattern by parsing a pattern string.
+     * 
      * @param pattern the DN pattern
-     * @exception EBaseException If parsing error occurs. 
+     * @exception EBaseException If parsing error occurs.
      */
     public DNPattern(String pattern)
-        throws EAuthException {
+            throws EAuthException {
         if (pattern == null || pattern.equals("")) {
             // create an attribute list that is the dn. 
             mLdapAttrs = new String[] { "dn" };
@@ -143,13 +145,13 @@ public class DNPattern {
         }
     }
 
-    public DNPattern(PushbackReader in) 
-        throws EAuthException {
+    public DNPattern(PushbackReader in)
+            throws EAuthException {
         parse(in);
     }
 
     private void parse(PushbackReader in)
-        throws EAuthException {
+            throws EAuthException {
         Vector rdnPatterns = new Vector();
         RDNPattern rdnPattern = null;
         int lastChar = -1;
@@ -162,8 +164,7 @@ public class DNPattern {
             } catch (IOException e) {
                 throw new EAuthException("CMS_AUTHENTICATION_INTERNAL_ERROR", e.toString());
             }
-        }
-        while (lastChar == ',');
+        } while (lastChar == ',');
 
         mRDNPatterns = new RDNPattern[rdnPatterns.size()];
         rdnPatterns.copyInto(mRDNPatterns);
@@ -173,8 +174,8 @@ public class DNPattern {
         for (int i = 0; i < mRDNPatterns.length; i++) {
             String[] rdnAttrs = mRDNPatterns[i].getLdapAttrs();
 
-            if (rdnAttrs != null && rdnAttrs.length > 0) 
-                for (int j = 0; j < rdnAttrs.length; j++) 
+            if (rdnAttrs != null && rdnAttrs.length > 0)
+                for (int j = 0; j < rdnAttrs.length; j++)
                     ldapAttrs.addElement(rdnAttrs[j]);
         }
         mLdapAttrs = new String[ldapAttrs.size()];
@@ -183,11 +184,12 @@ public class DNPattern {
 
     /**
      * Form a Ldap v3 DN string from results of a ldap search.
+     * 
      * @param entry LDAPentry from a ldap search
-     * @return Ldap v3 DN string to use for a subject name. 
+     * @return Ldap v3 DN string to use for a subject name.
      */
     public String formDN(LDAPEntry entry)
-        throws EAuthException {
+            throws EAuthException {
         StringBuffer formedDN = new StringBuffer();
 
         for (int i = 0; i < mRDNPatterns.length; i++) {
@@ -197,7 +199,7 @@ public class DNPattern {
 
             if (rdn != null) {
                 if (rdn != null && rdn.length() != 0) {
-                    if (formedDN.length() != 0) 
+                    if (formedDN.length() != 0)
                         formedDN.append(",");
                     formedDN.append(rdn);
                 }