Formatting (no line wrap in comments or code)

1 files changed, 69 insertions, 73 deletions

diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
index e3438ccf6..0677ef69f 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
+++ b/pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.profile.def;
 
-
 import java.security.cert.CertificateException;
 import java.util.Locale;
 
@@ -33,12 +32,11 @@ 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 a Netscape Certificate Type extension
  * into the certificate template.
- *
+ * 
  * @version $Revision$, $Date$
  */
 public class NSCertTypeExtDefault extends EnrollExtDefault {
@@ -83,11 +81,11 @@ public class NSCertTypeExtDefault 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",
@@ -127,7 +125,7 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
 
     public IDescriptor getValueDescriptor(Locale locale, String name) {
         if (name.equals(VAL_CRITICAL)) {
-            return new Descriptor(IDescriptor.BOOLEAN, null, 
+            return new Descriptor(IDescriptor.BOOLEAN, null,
                     "false",
                     CMS.getUserMessage(locale, "CMS_PROFILE_CRITICAL"));
         } else if (name.equals(VAL_SSL_CLIENT)) {
@@ -135,7 +133,7 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
                     "false",
                     CMS.getUserMessage(locale, "CMS_PROFILE_SSL_CLIENT"));
         } else if (name.equals(VAL_SSL_SERVER)) {
-            return new Descriptor(IDescriptor.BOOLEAN, null, 
+            return new Descriptor(IDescriptor.BOOLEAN, null,
                     "false",
                     CMS.getUserMessage(locale, "CMS_PROFILE_SSL_SERVER"));
         } else if (name.equals(VAL_EMAIL)) {
@@ -155,7 +153,7 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
                     "false",
                     CMS.getUserMessage(locale, "CMS_PROFILE_EMAIL_CA"));
         } else if (name.equals(VAL_OBJECT_SIGNING_CA)) {
-            return new Descriptor(IDescriptor.BOOLEAN, null, 
+            return new Descriptor(IDescriptor.BOOLEAN, null,
                     "false",
                     CMS.getUserMessage(locale, "CMS_PROFILE_OBJECT_SIGNING_CA"));
         } else {
@@ -164,8 +162,8 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
     }
 
     public void setValue(String name, Locale locale,
-        X509CertInfo info, String value)
-        throws EPropertyException {
+            X509CertInfo info, String value)
+            throws EPropertyException {
         try {
             NSCertTypeExtension ext = null;
 
@@ -174,12 +172,11 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
                             locale, "CMS_INVALID_PROPERTY", name));
             }
 
-
             ext = (NSCertTypeExtension)
                         getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
 
-            if(ext == null) {
-                populate(null,info);
+            if (ext == null) {
+                populate(null, info);
 
             }
             if (name.equals(VAL_CRITICAL)) {
@@ -187,69 +184,69 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
                         getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
                 boolean val = Boolean.valueOf(value).booleanValue();
 
-                if(ext == null)  {
-                    return ;
+                if (ext == null) {
+                    return;
                 }
-                ext.setCritical(val); 
-            } else if (name.equals(VAL_SSL_CLIENT)) { 
+                ext.setCritical(val);
+            } else if (name.equals(VAL_SSL_CLIENT)) {
                 ext = (NSCertTypeExtension)
                         getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
-                if(ext == null)  {
-                    return ;
+                if (ext == null) {
+                    return;
                 }
                 Boolean val = Boolean.valueOf(value);
 
                 ext.set(NSCertTypeExtension.SSL_CLIENT, val);
-            } else if (name.equals(VAL_SSL_SERVER)) { 
+            } else if (name.equals(VAL_SSL_SERVER)) {
                 ext = (NSCertTypeExtension)
                         getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
-                if(ext == null)  {
-                    return ;
+                if (ext == null) {
+                    return;
                 }
                 Boolean val = Boolean.valueOf(value);
 
                 ext.set(NSCertTypeExtension.SSL_SERVER, val);
-            } else if (name.equals(VAL_EMAIL)) { 
+            } else if (name.equals(VAL_EMAIL)) {
                 ext = (NSCertTypeExtension)
                         getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
-                if(ext == null)  {
-                    return ;
+                if (ext == null) {
+                    return;
                 }
                 Boolean val = Boolean.valueOf(value);
 
                 ext.set(NSCertTypeExtension.EMAIL, val);
-            } else if (name.equals(VAL_OBJECT_SIGNING)) { 
+            } else if (name.equals(VAL_OBJECT_SIGNING)) {
                 ext = (NSCertTypeExtension)
                         getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
-                if(ext == null)  {
-                    return ;
+                if (ext == null) {
+                    return;
                 }
                 Boolean val = Boolean.valueOf(value);
 
                 ext.set(NSCertTypeExtension.OBJECT_SIGNING, val);
-            } else if (name.equals(VAL_SSL_CA)) { 
+            } else if (name.equals(VAL_SSL_CA)) {
                 ext = (NSCertTypeExtension)
                         getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
-                if(ext == null)  {
-                    return ;
+                if (ext == null) {
+                    return;
                 }
                 Boolean val = Boolean.valueOf(value);
 
                 ext.set(NSCertTypeExtension.SSL_CA, val);
-            } else if (name.equals(VAL_EMAIL_CA)) { 
+            } else if (name.equals(VAL_EMAIL_CA)) {
                 ext = (NSCertTypeExtension)
                         getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
-                if(ext == null)  {
-                    return ;
+                if (ext == null) {
+                    return;
                 }
                 Boolean val = Boolean.valueOf(value);
 
                 ext.set(NSCertTypeExtension.EMAIL_CA, val);
-            } else if (name.equals(VAL_OBJECT_SIGNING_CA)) { 
+            } else if (name.equals(VAL_OBJECT_SIGNING_CA)) {
                 ext = (NSCertTypeExtension)
                         getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
-                if(ext == null)  {
-                    return ;
+                if (ext == null) {
+                    return;
                 }
                 Boolean val = Boolean.valueOf(value);
 
@@ -266,31 +263,30 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
     }
 
     public String getValue(String name, Locale locale,
-        X509CertInfo info)
-        throws EPropertyException {
+            X509CertInfo info)
+            throws EPropertyException {
         try {
-            if (name == null) { 
-                throw new EPropertyException(CMS.getUserMessage( 
+            if (name == null) {
+                throw new EPropertyException(CMS.getUserMessage(
                             locale, "CMS_INVALID_PROPERTY", name));
             }
 
             NSCertTypeExtension ext = (NSCertTypeExtension)
                     getExtension(NSCertTypeExtension.CertType_Id.toString(), 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 = (NSCertTypeExtension)
-                    getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
+                        getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
 
                 if (ext == null) {
                     return null;
@@ -300,63 +296,63 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
                 } else {
                     return "false";
                 }
-            } else if (name.equals(VAL_SSL_CLIENT)) { 
+            } else if (name.equals(VAL_SSL_CLIENT)) {
                 ext = (NSCertTypeExtension)
-                    getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
+                        getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
                 if (ext == null) {
                     return null;
                 }
                 Boolean val = (Boolean) ext.get(NSCertTypeExtension.SSL_CLIENT);
 
                 return val.toString();
-            } else if (name.equals(VAL_SSL_SERVER)) { 
+            } else if (name.equals(VAL_SSL_SERVER)) {
                 ext = (NSCertTypeExtension)
-                    getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
+                        getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
                 if (ext == null) {
                     return null;
                 }
                 Boolean val = (Boolean) ext.get(NSCertTypeExtension.SSL_SERVER);
 
                 return val.toString();
-            } else if (name.equals(VAL_EMAIL)) { 
+            } else if (name.equals(VAL_EMAIL)) {
                 ext = (NSCertTypeExtension)
-                    getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
+                        getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
                 if (ext == null) {
                     return null;
                 }
                 Boolean val = (Boolean) ext.get(NSCertTypeExtension.EMAIL);
 
                 return val.toString();
-            } else if (name.equals(VAL_OBJECT_SIGNING)) { 
+            } else if (name.equals(VAL_OBJECT_SIGNING)) {
                 ext = (NSCertTypeExtension)
-                    getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
+                        getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
                 if (ext == null) {
                     return null;
                 }
                 Boolean val = (Boolean) ext.get(NSCertTypeExtension.OBJECT_SIGNING);
 
                 return val.toString();
-            } else if (name.equals(VAL_SSL_CA)) { 
+            } else if (name.equals(VAL_SSL_CA)) {
                 ext = (NSCertTypeExtension)
-                    getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
+                        getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
                 if (ext == null) {
                     return null;
                 }
                 Boolean val = (Boolean) ext.get(NSCertTypeExtension.SSL_CA);
 
                 return val.toString();
-            } else if (name.equals(VAL_EMAIL_CA)) { 
+            } else if (name.equals(VAL_EMAIL_CA)) {
                 ext = (NSCertTypeExtension)
-                    getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
+                        getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
                 if (ext == null) {
                     return null;
                 }
                 Boolean val = (Boolean) ext.get(NSCertTypeExtension.EMAIL_CA);
 
                 return val.toString();
-            } else if (name.equals(VAL_OBJECT_SIGNING_CA)) { 
+            } else if (name.equals(VAL_OBJECT_SIGNING_CA)) {
                 ext = (NSCertTypeExtension)
-                    getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
+                        getExtension(NSCertTypeExtension.CertType_Id.toString(), info);
                 if (ext == null) {
                     return null;
                 }
@@ -364,7 +360,7 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
 
                 return val.toString();
             } else {
-                throw new EPropertyException(CMS.getUserMessage( 
+                throw new EPropertyException(CMS.getUserMessage(
                             locale, "CMS_INVALID_PROPERTY", name));
             }
         } catch (CertificateException e) {
@@ -375,13 +371,13 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
 
     public String getText(Locale locale) {
         String params[] = {
-                getConfig(CONFIG_CRITICAL), 
-                getConfig(CONFIG_SSL_CLIENT), 
-                getConfig(CONFIG_SSL_SERVER), 
-                getConfig(CONFIG_EMAIL), 
-                getConfig(CONFIG_OBJECT_SIGNING), 
-                getConfig(CONFIG_SSL_CA), 
-                getConfig(CONFIG_EMAIL_CA), 
+                getConfig(CONFIG_CRITICAL),
+                getConfig(CONFIG_SSL_CLIENT),
+                getConfig(CONFIG_SSL_SERVER),
+                getConfig(CONFIG_EMAIL),
+                getConfig(CONFIG_OBJECT_SIGNING),
+                getConfig(CONFIG_SSL_CA),
+                getConfig(CONFIG_EMAIL_CA),
                 getConfig(CONFIG_OBJECT_SIGNING_CA)
             };
 
@@ -393,14 +389,14 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
      * Populates the request with this policy default.
      */
     public void populate(IRequest request, X509CertInfo info)
-        throws EProfileException {
+            throws EProfileException {
         NSCertTypeExtension ext = createExtension();
 
         addExtension(NSCertTypeExtension.CertType_Id.toString(), ext, info);
     }
 
     public NSCertTypeExtension createExtension() {
-        NSCertTypeExtension ext = null; 
+        NSCertTypeExtension ext = null;
         boolean[] bits = new boolean[NSCertTypeExtension.NBITS];
 
         boolean critical = getConfigBoolean(CONFIG_CRITICAL);
@@ -415,8 +411,8 @@ public class NSCertTypeExtDefault extends EnrollExtDefault {
         try {
             ext = new NSCertTypeExtension(critical, bits);
         } catch (Exception e) {
-            CMS.debug("NSCertTypeExtDefault: createExtension " + 
-                e.toString());
+            CMS.debug("NSCertTypeExtDefault: createExtension " +
+                    e.toString());
         }
         return ext;
     }