Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

1 files changed, 35 insertions, 32 deletions

diff --git a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java b/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java
index a3fa598ed..16324fb91 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java
+++ b/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.certsrv.base;
 
+
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
 import java.util.Date;
@@ -24,12 +25,13 @@ import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
+
 /**
- * Factors out common function of formatting internatinalized messages taking
- * arguments and using java.util.ResourceBundle and java.text.MessageFormat
- * mechanism.
+ * Factors out common function of formatting internatinalized 
+ * messages taking arguments and using  java.util.ResourceBundle 
+ * and java.text.MessageFormat mechanism.
  * <P>
- * 
+ *
  * @version $Revision$, $Date$
  * @see java.text.MessageFormat
  * @see java.util.ResourceBundle
@@ -40,47 +42,50 @@ public class MessageFormatter {
 
     /**
      * Retrieves the localized string.
-     * 
+     *
      * @param locale end user locale
      * @param resourceBundleBaseName resource bundle class name
      * @param formatString format string
      * @return localized string
      */
-    public static String getLocalizedString(Locale locale,
-            String resourceBundleBaseName, String formatString) {
-        return getLocalizedString(locale, resourceBundleBaseName, formatString,
-                null);
+    public static String getLocalizedString(
+        Locale locale, String resourceBundleBaseName,
+        String formatString) {
+        return getLocalizedString(locale, resourceBundleBaseName, 
+                formatString, null);
     }
 
     /**
      * Retrieves the localized string.
-     * 
+     *
      * @param locale end user locale
      * @param resourceBundleBaseName resource bundle class name
      * @param formatString format string
      * @param params parameters to be substituted
      * @return localized string
      */
-    public static String getLocalizedString(Locale locale,
-            String resourceBundleBaseName, String formatString, Object params) {
+    public static String getLocalizedString(
+        Locale locale, String resourceBundleBaseName,
+        String formatString, Object params) {
         Object o[] = new Object[1];
 
         o[0] = params;
-        return getLocalizedString(locale, resourceBundleBaseName, formatString,
-                o);
+        return getLocalizedString(locale, resourceBundleBaseName, 
+                formatString, o);
     }
 
     /**
      * Retrieves the localized string.
-     * 
+     *
      * @param locale end user locale
      * @param resourceBundleBaseName resource bundle class name
      * @param formatString format string
      * @param params parameters to be substituted
      * @return localized string
      */
-    public static String getLocalizedString(Locale locale,
-            String resourceBundleBaseName, String formatString, Object[] params) {
+    public static String getLocalizedString(
+        Locale locale, String resourceBundleBaseName,
+        String formatString, Object[] params) {
 
         String localizedFormat = null;
 
@@ -92,43 +97,42 @@ public class MessageFormatter {
                 // instantiated everytime you call toString().
 
                 localizedFormat = ResourceBundle.getBundle(
-                        resourceBundleBaseName, locale).getString(formatString);
+                            resourceBundleBaseName, locale).getString(formatString);
             } catch (MissingResourceException e) {
                 return formatString;
-
+				
             }
             Object[] localizedParams = params;
             Object[] localeArg = null;
 
             if (params != null) {
                 for (int i = 0; i < params.length; ++i) {
-                    if (!(params[i] instanceof String)
-                            || !(params[i] instanceof Date)
-                            || !(params[i] instanceof Number)) {
+                    if (!(params[i] instanceof String) ||
+                        !(params[i] instanceof Date) ||
+                        !(params[i] instanceof Number)) {
                         if (localizedParams == params) {
 
                             // only done once
-                            // NB if the following variant of cloning code is
-                            // used
-                            // localizedParams = (Object [])mParams.clone();
+                            // NB if the following variant of cloning code is used
+                            //         localizedParams = (Object [])mParams.clone();
                             // it causes ArrayStoreException in
-                            // localizedParams[i] = params[i].toString();
+                            //         localizedParams[i] = params[i].toString();
                             // below
 
                             localizedParams = new Object[params.length];
                             System.arraycopy(params, 0, localizedParams, 0,
-                                    params.length);
+                                params.length);
                         }
                         try {
-                            Method toStringMethod = params[i].getClass()
-                                    .getMethod("toString", toStringSignature);
+                            Method toStringMethod = params[i].getClass().getMethod(
+                                    "toString", toStringSignature);
 
                             if (localeArg == null) {
                                 // only done once
                                 localeArg = new Object[] { locale };
                             }
                             localizedParams[i] = toStringMethod.invoke(
-                                    params[i], localeArg);
+                                        params[i], localeArg);
                         } catch (Exception e) {
                             // no method for localization, fall back
                             localizedParams[i] = params[i].toString();
@@ -137,8 +141,7 @@ public class MessageFormatter {
                 }
             }
             try {
-                // XXX - runtime exception may be raised by the following
-                // function
+                // XXX - runtime exception may be raised by the following function
                 MessageFormat format = new MessageFormat(localizedFormat);
 
                 return format.format(localizedParams);