Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

1 files changed, 77 insertions, 61 deletions

diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
index 141718cde..62d21cc8c 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
+++ b/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.profile.def;
 
+
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.StringTokenizer;
@@ -34,10 +35,12 @@ import com.netscape.certsrv.property.EPropertyException;
 import com.netscape.certsrv.property.IDescriptor;
 import com.netscape.certsrv.request.IRequest;
 
+
 /**
- * This class implements an enrollment default policy that populates Extended
- * Key Usage extension into the certificate template.
- * 
+ * This class implements an enrollment default policy
+ * that populates Extended Key Usage extension
+ * into the certificate template.
+ *
  * @version $Revision$, $Date$
  */
 public class ExtendedKeyUsageExtDefault extends EnrollExtDefault {
@@ -57,16 +60,18 @@ public class ExtendedKeyUsageExtDefault extends EnrollExtDefault {
     }
 
     public void init(IProfile profile, IConfigStore config)
-            throws EProfileException {
+        throws EProfileException {
         super.init(profile, config);
     }
 
-    public IDescriptor getConfigDescriptor(Locale locale, String name) {
+    public IDescriptor getConfigDescriptor(Locale locale, String name) { 
         if (name.equals(CONFIG_CRITICAL)) {
-            return new Descriptor(IDescriptor.BOOLEAN, null, "false",
+            return new Descriptor(IDescriptor.BOOLEAN, null, 
+                    "false",
                     CMS.getUserMessage(locale, "CMS_PROFILE_CRITICAL"));
         } else if (name.equals(CONFIG_OIDS)) {
-            return new Descriptor(IDescriptor.STRING, null, null,
+            return new Descriptor(IDescriptor.STRING, null, 
+                    null,
                     CMS.getUserMessage(locale, "CMS_PROFILE_OIDS"));
         }
         return null;
@@ -74,7 +79,8 @@ public class ExtendedKeyUsageExtDefault extends EnrollExtDefault {
 
     public IDescriptor getValueDescriptor(Locale locale, String name) {
         if (name.equals(VAL_CRITICAL)) {
-            return new Descriptor(IDescriptor.BOOLEAN, null, "false",
+            return new Descriptor(IDescriptor.BOOLEAN, null,
+                    "false",
                     CMS.getUserMessage(locale, "CMS_PROFILE_CRITICAL"));
         } else if (name.equals(VAL_OIDS)) {
             return new Descriptor(IDescriptor.STRING_LIST, null, null,
@@ -84,87 +90,93 @@ public class ExtendedKeyUsageExtDefault extends EnrollExtDefault {
         }
     }
 
-    public void setValue(String name, Locale locale, X509CertInfo info,
-            String value) throws EPropertyException {
+    public void setValue(String name, Locale locale,
+        X509CertInfo info, String value)
+        throws EPropertyException {
         ExtendedKeyUsageExtension ext = null;
 
-        ext = (ExtendedKeyUsageExtension) getExtension(
-                ExtendedKeyUsageExtension.OID, info);
 
-        if (ext == null) {
+        ext = (ExtendedKeyUsageExtension)
+                    getExtension(ExtendedKeyUsageExtension.OID, info);
+
+        if(ext == null)
+        {
             try {
-                populate(null, info);
+                populate(null,info);
 
             } catch (EProfileException e) {
-                throw new EPropertyException(CMS.getUserMessage(locale,
-                        "CMS_INVALID_PROPERTY", name));
+                 throw new EPropertyException(CMS.getUserMessage(
+                      locale, "CMS_INVALID_PROPERTY", name));
             }
 
-        }
-        if (name == null) {
-            throw new EPropertyException(CMS.getUserMessage(locale,
-                    "CMS_INVALID_PROPERTY", name));
+        } 
+        if (name == null) { 
+            throw new EPropertyException(CMS.getUserMessage(
+                        locale, "CMS_INVALID_PROPERTY", name));
         }
         if (name.equals(VAL_CRITICAL)) {
-            ext = (ExtendedKeyUsageExtension) getExtension(
-                    ExtendedKeyUsageExtension.OID, info);
-            boolean val = Boolean.valueOf(value).booleanValue();
+            ext = (ExtendedKeyUsageExtension)
+                    getExtension(ExtendedKeyUsageExtension.OID, info); 
+            boolean val = Boolean.valueOf(value).booleanValue(); 
 
-            if (ext == null) {
+            if(ext == null) {
                 return;
             }
-            ext.setCritical(val);
+            ext.setCritical(val);	    
         } else if (name.equals(VAL_OIDS)) {
-            ext = (ExtendedKeyUsageExtension) getExtension(
-                    ExtendedKeyUsageExtension.OID, info);
-            // ext.deleteAllOIDs();
+            ext = (ExtendedKeyUsageExtension)
+                    getExtension(ExtendedKeyUsageExtension.OID, info);
+            //		ext.deleteAllOIDs();
             StringTokenizer st = new StringTokenizer(value, ",");
 
-            if (ext == null) {
+            if(ext == null) {
                 return;
             }
             while (st.hasMoreTokens()) {
                 String oid = st.nextToken();
 
-                ext.addOID(new ObjectIdentifier(oid));
+                ext.addOID(new ObjectIdentifier(oid));	
             }
         } else {
-            throw new EPropertyException(CMS.getUserMessage(locale,
-                    "CMS_INVALID_PROPERTY", name));
+            throw new EPropertyException(CMS.getUserMessage(
+                        locale, "CMS_INVALID_PROPERTY", name));
         }
         try {
             replaceExtension(ExtendedKeyUsageExtension.OID, ext, info);
         } catch (EProfileException e) {
             CMS.debug("ExtendedKeyUsageExtDefault: setValue " + e.toString());
-            throw new EPropertyException(CMS.getUserMessage(locale,
-                    "CMS_INVALID_PROPERTY", name));
+            throw new EPropertyException(CMS.getUserMessage(
+                        locale, "CMS_INVALID_PROPERTY", name));
         }
     }
 
-    public String getValue(String name, Locale locale, X509CertInfo info)
-            throws EPropertyException {
+    public String getValue(String name, Locale locale,
+        X509CertInfo info)
+        throws EPropertyException {
         if (name == null) {
-            throw new EPropertyException(CMS.getUserMessage(locale,
-                    "CMS_INVALID_PROPERTY", name));
+            throw new EPropertyException(CMS.getUserMessage(
+                        locale, "CMS_INVALID_PROPERTY", name));
         }
 
-        ExtendedKeyUsageExtension ext = (ExtendedKeyUsageExtension) getExtension(
-                ExtendedKeyUsageExtension.OID, info);
+        ExtendedKeyUsageExtension ext = (ExtendedKeyUsageExtension)
+                getExtension(ExtendedKeyUsageExtension.OID, info);
+       
 
-        if (ext == null) {
+        if(ext == null)
+        {
             try {
-                populate(null, info);
+                populate(null,info);
 
             } catch (EProfileException e) {
-                throw new EPropertyException(CMS.getUserMessage(locale,
-                        "CMS_INVALID_PROPERTY", name));
+                 throw new EPropertyException(CMS.getUserMessage(
+                      locale, "CMS_INVALID_PROPERTY", name));
             }
 
         }
 
         if (name.equals(VAL_CRITICAL)) {
-            ext = (ExtendedKeyUsageExtension) getExtension(
-                    ExtendedKeyUsageExtension.OID, info);
+            ext = (ExtendedKeyUsageExtension)
+                getExtension(ExtendedKeyUsageExtension.OID, info);
 
             if (ext == null) {
                 return null;
@@ -175,54 +187,58 @@ public class ExtendedKeyUsageExtDefault extends EnrollExtDefault {
                 return "false";
             }
         } else if (name.equals(VAL_OIDS)) {
-            ext = (ExtendedKeyUsageExtension) getExtension(
-                    ExtendedKeyUsageExtension.OID, info);
+            ext = (ExtendedKeyUsageExtension)
+                getExtension(ExtendedKeyUsageExtension.OID, info);
             StringBuffer sb = new StringBuffer();
-            if (ext == null) {
+            if(ext == null) {
                 return "";
             }
             Enumeration e = ext.getOIDs();
 
             while (e.hasMoreElements()) {
-                ObjectIdentifier oid = (ObjectIdentifier) e.nextElement();
+                ObjectIdentifier oid = (ObjectIdentifier)
+                    e.nextElement();
 
                 if (!sb.toString().equals("")) {
                     sb.append(",");
-                }
+                }	
                 sb.append(oid.toString());
             }
             return sb.toString();
         } else {
-            throw new EPropertyException(CMS.getUserMessage(locale,
-                    "CMS_INVALID_PROPERTY", name));
+            throw new EPropertyException(CMS.getUserMessage(
+                        locale, "CMS_INVALID_PROPERTY", name));
         }
     }
 
     public String getText(Locale locale) {
-        String params[] = { getConfig(CONFIG_CRITICAL), getConfig(CONFIG_OIDS) };
+        String params[] = {
+                getConfig(CONFIG_CRITICAL), 
+                getConfig(CONFIG_OIDS)
+            };
 
-        return CMS.getUserMessage(locale, "CMS_PROFILE_DEF_EXTENDED_KEY_EXT",
-                params);
+        return CMS.getUserMessage(locale, 
+                "CMS_PROFILE_DEF_EXTENDED_KEY_EXT", params);
     }
 
     /**
      * Populates the request with this policy default.
      */
     public void populate(IRequest request, X509CertInfo info)
-            throws EProfileException {
+        throws EProfileException {
         ExtendedKeyUsageExtension ext = createExtension();
 
         addExtension(ExtendedKeyUsageExtension.OID, ext, info);
     }
 
     public ExtendedKeyUsageExtension createExtension() {
-        ExtendedKeyUsageExtension ext = null;
+        ExtendedKeyUsageExtension ext = null; 
 
         try {
             ext = new ExtendedKeyUsageExtension();
         } catch (Exception e) {
-            CMS.debug("ExtendedKeyUsageExtDefault: createExtension "
-                    + e.toString());
+            CMS.debug("ExtendedKeyUsageExtDefault: createExtension " +
+                e.toString());
         }
         if (ext == null)
             return null;
@@ -234,7 +250,7 @@ public class ExtendedKeyUsageExtDefault extends EnrollExtDefault {
         while (st.hasMoreTokens()) {
             String oid = st.nextToken();
 
-            ext.addOID(new ObjectIdentifier(oid));
+            ext.addOID(new ObjectIdentifier(oid));	
         }
         return ext;
     }