1 files changed, 54 insertions, 48 deletions

diff --git a/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java b/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java
index cd777b2b8..89383231a 100644
--- a/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java
+++ b/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java
@@ -24,78 +24,84 @@ import netscape.security.util.ObjectIdentifier;
 
 /**
  * Converts a RFC 1779 string to a X500Name, RDN or AVA object and vice versa.
- * 
+ *
  * @see LdapDNStrConverter
  * @see LdapV3DNStrConverter
- * 
+ *
  * @author Lily Hsiao, Slava Galperin at Netscape Communications, Inc.
  */
 
-public class RFC1779StrConverter extends LdapV3DNStrConverter {
+public class RFC1779StrConverter extends LdapV3DNStrConverter
+{
     //
     // Constructors.
-    //
+    // 
 
-    /**
-     * Constructs a RFC1779StrConverter using the global default X500NameAttrMap
-     * and accepts OIDs not listed in the attribute map.
+    /** 
+     * Constructs a RFC1779StrConverter using the global default
+     * X500NameAttrMap and accepts OIDs not listed in the attribute map.
      */
-    public RFC1779StrConverter() {
-        super();
+    public RFC1779StrConverter()
+    {
+	super();
     }
 
     /**
-     * Constructs a RFC1779StrConverter using the specified X500NameAttrMap and
-     * boolean for whether to accept OIDs not in the X500NameAttrMap.
+     * Constructs a RFC1779StrConverter using the specified X500NameAttrMap 
+     * and boolean for whether to accept OIDs not in the X500NameAttrMap.
      * 
-     * @param attributeMap A X500NameAttrMap to use for this converter.
-     * @param doAcceptUnknownOids Accept unregistered attributes, i.e. OIDs not
-     *            in the map).
+     * @param attributeMap 	A X500NameAttrMap to use for this converter.
+     * @param doAcceptUnknownOids  Accept unregistered attributes, i.e. OIDs 
+      *				   not in the map).
      */
-    public RFC1779StrConverter(X500NameAttrMap attributeMap,
-            boolean doAcceptUnknownOids) {
-        super(attributeMap, doAcceptUnknownOids);
+    public RFC1779StrConverter(X500NameAttrMap attributeMap, 
+				  boolean doAcceptUnknownOids)
+    {
+	super(attributeMap, doAcceptUnknownOids);
     }
 
     //
     // overriding methods.
     //
 
-    /**
-     * Converts a OID to a attribute keyword in a Ldap DN string or to a
-     * "OID.1.2.3.4" string syntax as defined in RFC1779.
-     * 
-     * @param oid an ObjectIdentifier.
-     * 
-     * @return a attribute keyword or "OID.1.2.3.4" string.
-     * 
-     * @exception IOException if an error occurs during the conversion.
+    /** 
+     * Converts a OID to a attribute keyword in a Ldap DN string or 
+     * to a "OID.1.2.3.4" string syntax as defined in RFC1779.
+     *
+     * @param oid 	an ObjectIdentifier.
+     *
+     * @return 		a attribute keyword or "OID.1.2.3.4" string.
+     *
+     * @exception IOException	if an error occurs during the conversion.
      */
-    public String encodeOID(ObjectIdentifier oid) throws IOException {
-        String keyword = attrMap.getName(oid);
-        if (keyword == null)
-            if (!acceptUnknownOids)
-                throw new IllegalArgumentException("Unrecognized OID");
-            else
-                keyword = "OID" + "." + oid.toString();
-        return keyword;
+    public String encodeOID(ObjectIdentifier oid)
+	throws IOException
+    {
+	String keyword = attrMap.getName(oid);
+	if (keyword == null)
+	    if (!acceptUnknownOids)
+	    throw new IllegalArgumentException("Unrecognized OID");
+	else 
+	    keyword = "OID" + "." + oid.toString();
+	return keyword;
     }
 
-    /**
-     * Converts a attribute value as a DerValue to a string in a RFC1779 Ldap DN
-     * string.
-     * 
-     * @param attrValue an attribute value.
-     * @param oid ObjectIdentifier for the attribute.
-     * @return a string in RFC1779 syntax.
-     * @exception IOException if an error occurs during the conversion.
+    /** 
+     * Converts a attribute value as a DerValue to a string in a 
+     * RFC1779 Ldap DN string.
+     *
+     * @param attrValue 	an attribute value.
+     * @param oid		ObjectIdentifier for the attribute.
+     * @return 			a string in RFC1779 syntax.
+     * @exception IOException	if an error occurs during the conversion.
      */
     public String encodeValue(DerValue attrValue, ObjectIdentifier oid)
-            throws IOException {
-        String s = super.encodeValue(attrValue, oid);
-        if (s.indexOf('\n') != -1)
-            return "\"" + s + "\"";
-        else
-            return s;
+	throws IOException
+    {
+	String s = super.encodeValue(attrValue, oid);
+	if (s.indexOf('\n') != -1)
+	    return "\""+s+"\"";
+	else
+	    return s;
     }
 }