Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

1 files changed, 89 insertions, 72 deletions

diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java
index fd046e1f..6e9b08ab 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java
+++ b/pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.profile.def;
 
+
 import java.io.IOException;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
@@ -35,10 +36,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 a
- * server-side configurable validity into the certificate template.
- * 
+ * This class implements an enrollment default policy
+ * that populates a server-side configurable validity
+ * into the certificate template.
+ *
  * @version $Revision$, $Date$
  */
 public class ValidityDefault extends EnrollDefault {
@@ -61,36 +64,43 @@ public class ValidityDefault extends EnrollDefault {
     }
 
     public void init(IProfile profile, IConfigStore config)
-            throws EProfileException {
+        throws EProfileException {
         super.init(profile, config);
     }
 
-    public void setConfig(String name, String value) throws EPropertyException {
+    public void setConfig(String name, String value)
+        throws EPropertyException {
         if (name.equals(CONFIG_RANGE)) {
-            try {
-                Integer.parseInt(value);
-            } catch (Exception e) {
+          try {
+            Integer.parseInt(value);
+          } catch (Exception e) {
                 throw new EPropertyException(CMS.getUserMessage(
-                        "CMS_INVALID_PROPERTY", CONFIG_RANGE));
-            }
+                            "CMS_INVALID_PROPERTY", CONFIG_RANGE));
+          }
         } else if (name.equals(CONFIG_START_TIME)) {
-            try {
-                Integer.parseInt(value);
-            } catch (Exception e) {
+          try {
+            Integer.parseInt(value);
+          } catch (Exception e) {
                 throw new EPropertyException(CMS.getUserMessage(
-                        "CMS_INVALID_PROPERTY", CONFIG_START_TIME));
-            }
+                            "CMS_INVALID_PROPERTY", CONFIG_START_TIME));
+          }
         }
         super.setConfig(name, value);
     }
 
     public IDescriptor getConfigDescriptor(Locale locale, String name) {
         if (name.equals(CONFIG_RANGE)) {
-            return new Descriptor(IDescriptor.STRING, null, "2922",
-                    CMS.getUserMessage(locale, "CMS_PROFILE_VALIDITY_RANGE"));
+            return new Descriptor(IDescriptor.STRING,
+                    null, 
+                    "2922",
+                    CMS.getUserMessage(locale,
+                        "CMS_PROFILE_VALIDITY_RANGE"));
         } else if (name.equals(CONFIG_START_TIME)) {
-            return new Descriptor(IDescriptor.STRING, null, "60", /* 1 minute */
-            CMS.getUserMessage(locale, "CMS_PROFILE_VALIDITY_START_TIME"));
+            return new Descriptor(IDescriptor.STRING,
+                    null, 
+                    "60", /* 1 minute */
+                    CMS.getUserMessage(locale,
+                        "CMS_PROFILE_VALIDITY_START_TIME"));
         } else {
             return null;
         }
@@ -108,95 +118,103 @@ public class ValidityDefault extends EnrollDefault {
         }
     }
 
-    public void setValue(String name, Locale locale, X509CertInfo info,
-            String value) throws EPropertyException {
-        if (name == null) {
-            throw new EPropertyException(CMS.getUserMessage(locale,
-                    "CMS_INVALID_PROPERTY", name));
+    public void setValue(String name, Locale locale,
+        X509CertInfo info, String value)
+        throws EPropertyException {
+        if (name == null) { 
+            throw new EPropertyException(CMS.getUserMessage(
+                        locale, "CMS_INVALID_PROPERTY", name));
         }
-        if (value == null || value.equals("")) {
-            throw new EPropertyException(CMS.getUserMessage(locale,
-                    "CMS_INVALID_PROPERTY", name));
+        if (value == null || value.equals("")) { 
+            throw new EPropertyException(CMS.getUserMessage(
+                        locale, "CMS_INVALID_PROPERTY", name));
         }
         if (name.equals(VAL_NOT_BEFORE)) {
-            SimpleDateFormat formatter = new SimpleDateFormat(DATE_FORMAT);
+            SimpleDateFormat formatter = 
+                new SimpleDateFormat(DATE_FORMAT);
             ParsePosition pos = new ParsePosition(0);
             Date date = formatter.parse(value, pos);
             CertificateValidity validity = null;
 
             try {
-                validity = (CertificateValidity) info
-                        .get(X509CertInfo.VALIDITY);
-                validity.set(CertificateValidity.NOT_BEFORE, date);
+                validity = (CertificateValidity)
+                        info.get(X509CertInfo.VALIDITY);
+                validity.set(CertificateValidity.NOT_BEFORE,
+                    date);
             } catch (Exception e) {
                 CMS.debug("ValidityDefault: setValue " + e.toString());
-                throw new EPropertyException(CMS.getUserMessage(locale,
-                        "CMS_INVALID_PROPERTY", name));
+                throw new EPropertyException(CMS.getUserMessage(
+                            locale, "CMS_INVALID_PROPERTY", name));
             }
         } else if (name.equals(VAL_NOT_AFTER)) {
-            SimpleDateFormat formatter = new SimpleDateFormat(DATE_FORMAT);
+            SimpleDateFormat formatter = 
+                new SimpleDateFormat(DATE_FORMAT);
             ParsePosition pos = new ParsePosition(0);
             Date date = formatter.parse(value, pos);
             CertificateValidity validity = null;
 
             try {
-                validity = (CertificateValidity) info
-                        .get(X509CertInfo.VALIDITY);
-                validity.set(CertificateValidity.NOT_AFTER, date);
+                validity = (CertificateValidity)
+                        info.get(X509CertInfo.VALIDITY);
+                validity.set(CertificateValidity.NOT_AFTER,
+                    date);
             } catch (Exception e) {
                 CMS.debug("ValidityDefault: setValue " + e.toString());
-                throw new EPropertyException(CMS.getUserMessage(locale,
-                        "CMS_INVALID_PROPERTY", name));
+                throw new EPropertyException(CMS.getUserMessage(
+                            locale, "CMS_INVALID_PROPERTY", name));
             }
         } else {
-            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));
 
         if (name.equals(VAL_NOT_BEFORE)) {
-            SimpleDateFormat formatter = new SimpleDateFormat(DATE_FORMAT);
+            SimpleDateFormat formatter = 
+                new SimpleDateFormat(DATE_FORMAT);
             CertificateValidity validity = null;
 
             try {
-                validity = (CertificateValidity) info
-                        .get(X509CertInfo.VALIDITY);
-                return formatter.format((Date) validity
-                        .get(CertificateValidity.NOT_BEFORE));
+                validity = (CertificateValidity)
+                        info.get(X509CertInfo.VALIDITY);
+                return formatter.format((Date)
+                        validity.get(CertificateValidity.NOT_BEFORE));
             } catch (Exception e) {
                 CMS.debug("ValidityDefault: getValue " + e.toString());
             }
             throw new EPropertyException("Invalid valie");
         } else if (name.equals(VAL_NOT_AFTER)) {
-            SimpleDateFormat formatter = new SimpleDateFormat(DATE_FORMAT);
+            SimpleDateFormat formatter = 
+                new SimpleDateFormat(DATE_FORMAT);
             CertificateValidity validity = null;
 
             try {
-                validity = (CertificateValidity) info
-                        .get(X509CertInfo.VALIDITY);
-                return formatter.format((Date) validity
-                        .get(CertificateValidity.NOT_AFTER));
+                validity = (CertificateValidity)
+                        info.get(X509CertInfo.VALIDITY);
+                return formatter.format((Date)
+                        validity.get(CertificateValidity.NOT_AFTER));
             } catch (Exception e) {
                 CMS.debug("ValidityDefault: getValue " + e.toString());
             }
-            throw new EPropertyException(CMS.getUserMessage(locale,
-                    "CMS_INVALID_PROPERTY", name));
+            throw new EPropertyException(CMS.getUserMessage(
+                        locale, "CMS_INVALID_PROPERTY", name));
         } 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) {
-        return CMS.getUserMessage(locale, "CMS_PROFILE_DEF_VALIDITY",
+        return CMS.getUserMessage(locale, "CMS_PROFILE_DEF_VALIDITY", 
                 getConfig(CONFIG_RANGE));
     }
 
@@ -204,11 +222,11 @@ public class ValidityDefault extends EnrollDefault {
      * Populates the request with this policy default.
      */
     public void populate(IRequest request, X509CertInfo info)
-            throws EProfileException {
+        throws EProfileException {
         // always + 60 seconds
         String startTimeStr = getConfig(CONFIG_START_TIME);
         try {
-            startTimeStr = mapPattern(request, startTimeStr);
+          startTimeStr = mapPattern(request, startTimeStr);
         } catch (IOException e) {
             CMS.debug("ValidityDefault: populate " + e.toString());
         }
@@ -217,32 +235,31 @@ public class ValidityDefault extends EnrollDefault {
             startTimeStr = "60";
         }
         int startTime = Integer.parseInt(startTimeStr);
-        Date notBefore = new Date(CMS.getCurrentDate().getTime()
-                + (1000 * startTime));
+        Date notBefore = new Date(CMS.getCurrentDate().getTime() + (1000 * startTime));
         long notAfterVal = 0;
 
         try {
             String rangeStr = getConfig(CONFIG_RANGE);
             rangeStr = mapPattern(request, rangeStr);
-            notAfterVal = notBefore.getTime()
-                    + (mDefault * Integer.parseInt(rangeStr));
+            notAfterVal = notBefore.getTime() + 
+                    (mDefault * Integer.parseInt(rangeStr));
         } catch (Exception e) {
             // configured value is not correct
             CMS.debug("ValidityDefault: populate " + e.toString());
-            throw new EProfileException(CMS.getUserMessage(getLocale(request),
-                    "CMS_INVALID_PROPERTY", CONFIG_RANGE));
+            throw new EProfileException(CMS.getUserMessage(
+                        getLocale(request), "CMS_INVALID_PROPERTY", CONFIG_RANGE));
         }
         Date notAfter = new Date(notAfterVal);
-        CertificateValidity validity = new CertificateValidity(notBefore,
-                notAfter);
+        CertificateValidity validity = 
+            new CertificateValidity(notBefore, notAfter);
 
         try {
             info.set(X509CertInfo.VALIDITY, validity);
         } catch (Exception e) {
             // failed to insert subject name
             CMS.debug("ValidityDefault: populate " + e.toString());
-            throw new EProfileException(CMS.getUserMessage(getLocale(request),
-                    "CMS_INVALID_PROPERTY", X509CertInfo.VALIDITY));
+            throw new EProfileException(CMS.getUserMessage(
+                        getLocale(request), "CMS_INVALID_PROPERTY", X509CertInfo.VALIDITY));
         }
     }
 }