Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

1 files changed, 58 insertions, 57 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
index 5e4c015e8..33a0ff693 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.StringTokenizer;
@@ -38,19 +39,19 @@ import com.netscape.cms.servlet.wizard.WizardServlet;
 
 public class CAInfoPanel extends WizardPanelBase {
 
-    public CAInfoPanel() {
-    }
+    public CAInfoPanel() {}
 
     /**
      * Initializes this panel.
      */
-    public void init(ServletConfig config, int panelno) throws ServletException {
+    public void init(ServletConfig config, int panelno) 
+        throws ServletException {
         setPanelNo(panelno);
         setName("CA Information");
     }
 
-    public void init(WizardServlet servlet, ServletConfig config, int panelno,
-            String id) throws ServletException {
+    public void init(WizardServlet servlet, ServletConfig config, int panelno, String id) 
+        throws ServletException {
         setPanelNo(panelno);
         setName("CA Information");
         setId(id);
@@ -81,15 +82,14 @@ public class CAInfoPanel extends WizardPanelBase {
             } else {
                 return true;
             }
-        } catch (Exception e) {
-        }
+        } catch (Exception e) {}
 
         return false;
     }
 
     public PropertySet getUsage() {
         PropertySet set = new PropertySet();
-
+                                                                                
         return set;
     }
 
@@ -97,7 +97,8 @@ public class CAInfoPanel extends WizardPanelBase {
      * Display the panel.
      */
     public void display(HttpServletRequest request,
-            HttpServletResponse response, Context context) {
+            HttpServletResponse response,
+            Context context) {
         CMS.debug("CAInfoPanel: display");
 
         IConfigStore cs = CMS.getConfigStore();
@@ -117,18 +118,15 @@ public class CAInfoPanel extends WizardPanelBase {
 
             try {
                 hostname = cs.getString("preop.ca.hostname");
-            } catch (Exception e) {
-            }
+            } catch (Exception e) {}
 
             try {
                 httpport = cs.getString("preop.ca.httpport");
-            } catch (Exception e) {
-            }
+            } catch (Exception e) {}
 
             try {
                 httpsport = cs.getString("preop.ca.httpsport");
-            } catch (Exception e) {
-            }
+            } catch (Exception e) {}
 
             if (type.equals("sdca")) {
                 context.put("check_sdca", "checked");
@@ -145,11 +143,12 @@ public class CAInfoPanel extends WizardPanelBase {
         String cstype = "CA";
         String portType = "SecurePort";
 
-        /*
-         * try { cstype = cs.getString("cs.type", ""); } catch (EBaseException
-         * e) {}
-         */
-
+/*
+        try {
+            cstype = cs.getString("cs.type", "");
+        } catch (EBaseException e) {}
+*/
+                                                                                
         CMS.debug("CAInfoPanel: Ready to get url");
         Vector v = getUrlListFromSecurityDomain(cs, cstype, portType);
         v.addElement("External CA");
@@ -164,13 +163,12 @@ public class CAInfoPanel extends WizardPanelBase {
                 list.append(",");
             }
         }
-
+                                                                                
         try {
             cs.putString("preop.ca.list", list.toString());
             cs.commit(false);
-        } catch (Exception e) {
-        }
-
+        } catch (Exception e) {}
+                                                                                
         context.put("urls", v);
 
         context.put("sdcaHostname", hostname);
@@ -185,7 +183,8 @@ public class CAInfoPanel extends WizardPanelBase {
      * Checks if the given parameters are valid.
      */
     public void validate(HttpServletRequest request,
-            HttpServletResponse response, Context context) throws IOException {
+            HttpServletResponse response,
+            Context context) throws IOException {
         IConfigStore config = CMS.getConfigStore();
     }
 
@@ -193,18 +192,20 @@ public class CAInfoPanel extends WizardPanelBase {
      * Commit parameter changes
      */
     public void update(HttpServletRequest request,
-            HttpServletResponse response, Context context) throws IOException {
+            HttpServletResponse response,
+            Context context) throws IOException {
 
         /*
-         * String select = request.getParameter("choice"); if (select == null) {
-         * CMS.debug("CAInfoPanel: choice not found"); throw new
-         * IOException("choice not found"); }
+         String select = request.getParameter("choice");
+         if (select == null) {
+         CMS.debug("CAInfoPanel: choice not found");
+         throw new IOException("choice not found");
+         }
          */
         IConfigStore config = CMS.getConfigStore();
 
         try {
-            String subsystemselect = config.getString("preop.subsystem.select",
-                    "");
+            String subsystemselect = config.getString("preop.subsystem.select", "");
             if (subsystemselect.equals("clone"))
                 return;
         } catch (Exception e) {
@@ -212,26 +213,25 @@ public class CAInfoPanel extends WizardPanelBase {
 
         String select = null;
         String index = request.getParameter("urls");
-        String url = "";
+        String url = ""; 
         if (index.startsWith("http")) {
-            // user may submit url directlry
-            url = index;
+           // user may submit url directlry
+           url = index;
         } else {
-            try {
-                int x = Integer.parseInt(index);
-                String list = config.getString("preop.ca.list", "");
-                StringTokenizer tokenizer = new StringTokenizer(list, ",");
-                int counter = 0;
-
-                while (tokenizer.hasMoreTokens()) {
-                    url = tokenizer.nextToken();
-                    if (counter == x) {
-                        break;
-                    }
-                    counter++;
+          try {
+            int x = Integer.parseInt(index);
+            String list = config.getString("preop.ca.list", "");
+            StringTokenizer tokenizer = new StringTokenizer(list, ",");
+            int counter = 0;
+
+            while (tokenizer.hasMoreTokens()) {
+                url = tokenizer.nextToken();
+                if (counter == x) {
+                    break;
                 }
-            } catch (Exception e) {
+                counter++;
             }
+          } catch (Exception e) {}
         }
 
         URL urlx = null;
@@ -240,7 +240,7 @@ public class CAInfoPanel extends WizardPanelBase {
             select = "otherca";
             config.putString("preop.ca.pkcs7", "");
             config.putInteger("preop.ca.certchain.size", 0);
-        } else {
+        } else { 
             select = "sdca";
 
             // parse URL (CA1 - https://...)
@@ -272,12 +272,10 @@ public class CAInfoPanel extends WizardPanelBase {
 
         try {
             config.commit(false);
-        } catch (Exception e) {
-        }
+        } catch (Exception e) {}
     }
 
-    private void sdca(HttpServletRequest request, Context context,
-            String hostname, String httpsPortStr) throws IOException {
+    private void sdca(HttpServletRequest request, Context context, String hostname, String httpsPortStr) throws IOException {
         CMS.debug("CAInfoPanel update: this is the CA in the security domain.");
         IConfigStore config = CMS.getConfigStore();
 
@@ -294,23 +292,26 @@ public class CAInfoPanel extends WizardPanelBase {
         try {
             httpsport = Integer.parseInt(httpsPortStr);
         } catch (Exception e) {
-            CMS.debug("CAInfoPanel update: Https port is not valid. Exception: "
-                    + e.toString());
+            CMS.debug(
+                    "CAInfoPanel update: Https port is not valid. Exception: "
+                            + e.toString());
             throw new IOException("Http Port is not valid.");
         }
 
         config.putString("preop.ca.hostname", hostname);
         config.putString("preop.ca.httpsport", httpsPortStr);
         ConfigCertApprovalCallback certApprovalCallback = new ConfigCertApprovalCallback();
-        updateCertChainUsingSecureEEPort(config, "ca", hostname, httpsport,
-                true, context, certApprovalCallback);
+        updateCertChainUsingSecureEEPort( config, "ca", hostname,
+                                          httpsport, true, context,
+                                          certApprovalCallback );
     }
 
     /**
      * If validiate() returns false, this method will be called.
      */
     public void displayError(HttpServletRequest request,
-            HttpServletResponse response, Context context) {
+            HttpServletResponse response,
+            Context context) {
 
         /* This should never be called */
         context.put("title", "CA Information");