Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

1 files changed, 41 insertions, 35 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
index b5f74fd0e..a62b22b7b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+
 import java.io.IOException;
 
 import javax.servlet.ServletConfig;
@@ -35,19 +36,19 @@ import com.netscape.cms.servlet.wizard.WizardServlet;
 
 public class AgentAuthenticatePanel extends WizardPanelBase {
 
-    public AgentAuthenticatePanel() {
-    }
+    public AgentAuthenticatePanel() {}
 
     /**
      * Initializes this panel.
      */
-    public void init(ServletConfig config, int panelno) throws ServletException {
+    public void init(ServletConfig config, int panelno) 
+        throws ServletException {
         setPanelNo(panelno);
         setName("Agent Authentication");
     }
 
-    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("Agent Authentication");
         setId(id);
@@ -56,18 +57,18 @@ public class AgentAuthenticatePanel extends WizardPanelBase {
     public boolean isSubPanel() {
         return true;
     }
-
+                                                                                
     /**
      * Should we skip this panel for the configuration.
      */
     public boolean shouldSkip() {
         CMS.debug("DisplayCertChainPanel: should skip");
-
+                                                                                
         IConfigStore cs = CMS.getConfigStore();
         // if we are root, no need to get the certificate chain.
-
+                                                                                
         try {
-            String select = cs.getString("securitydomain.select", "");
+            String select = cs.getString("securitydomain.select","");
             if (select.equals("new")) {
                 return true;
             }
@@ -77,7 +78,7 @@ public class AgentAuthenticatePanel extends WizardPanelBase {
                 return true;
         } catch (EBaseException e) {
         }
-
+                                                                                
         return false;
     }
 
@@ -95,16 +96,15 @@ public class AgentAuthenticatePanel extends WizardPanelBase {
             } else {
                 return true;
             }
-        } catch (EBaseException e) {
-        }
+        } catch (EBaseException e) {}
         return false;
     }
 
     public PropertySet getUsage() {
         PropertySet set = new PropertySet();
-
+                                                                                
         /* XXX */
-
+                                                                                
         return set;
     }
 
@@ -112,19 +112,20 @@ public class AgentAuthenticatePanel extends WizardPanelBase {
      * Display the panel.
      */
     public void display(HttpServletRequest request,
-            HttpServletResponse response, Context context) {
+            HttpServletResponse response,
+            Context context) {
         context.put("title", "Agent Authentication");
         IConfigStore config = CMS.getConfigStore();
 
         if (isPanelDone()) {
-
+            
             try {
                 String s = config.getString("preop.ca.agent.uid", "");
                 String type = config.getString("preop.hierarchy.select", "");
                 if (type.equals("root"))
                     context.put("uid", "");
                 else
-                    context.put("uid", s);
+                    context.put("uid", s); 
             } catch (Exception e) {
                 CMS.debug(e.toString());
             }
@@ -141,14 +142,17 @@ public class AgentAuthenticatePanel 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 
+    {
     }
 
     /**
      * Commit parameter changes
      */
     public void update(HttpServletRequest request,
-            HttpServletResponse response, Context context) throws IOException {
+            HttpServletResponse response,
+            Context context) throws IOException {
         IConfigStore config = CMS.getConfigStore();
         context.put("panel", "admin/console/config/agentauthenticatepanel.vm");
         context.put("title", "Agent Authentication");
@@ -178,34 +182,34 @@ public class AgentAuthenticatePanel extends WizardPanelBase {
             try {
                 host = config.getString("preop.ca.hostname");
             } catch (Exception e) {
-                CMS.debug("AgentAuthenticatePanel update: " + e.toString());
+                CMS.debug("AgentAuthenticatePanel update: "+e.toString());
                 context.put("errorString", "Missing hostname");
                 throw new IOException("Missing hostname");
             }
-
+         
             try {
                 httpsport = config.getInteger("preop.ca.httpsport");
             } catch (Exception e) {
-                CMS.debug("AgentAuthenticatePanel update: " + e.toString());
+                CMS.debug("AgentAuthenticatePanel update: "+e.toString());
                 context.put("errorString", "Missing port");
                 throw new IOException("Missing port");
             }
 
-            /*
-             * // Bugzilla Bug #583825 - CC: Obsolete servlets to be removed
-             * from // web.xml as part of CC interface review boolean
-             * authenticated = authenticate(host, httpsport, true,
-             * "/ca/ee/ca/checkIdentity", "uid="+uid+"&pwd="+pwd);
-             * 
-             * if (!authenticated) { context.put("errorString",
-             * "Wrong user id or password"); throw new
-             * IOException("Wrong user id or password"); }
-             */
+/*
+             // Bugzilla Bug #583825 - CC: Obsolete servlets to be removed from
+             //                        web.xml as part of CC interface review
+             boolean authenticated = authenticate(host, httpsport, true,
+             "/ca/ee/ca/checkIdentity", "uid="+uid+"&pwd="+pwd);
+
+             if (!authenticated) {
+                 context.put("errorString", "Wrong user id or password");
+                 throw new IOException("Wrong user id or password");
+             }
+*/
 
             try {
                 config.commit(false);
-            } catch (EBaseException e) {
-            }
+            } catch (EBaseException e) {}
         }
     }
 
@@ -213,7 +217,9 @@ public class AgentAuthenticatePanel extends WizardPanelBase {
      * If validiate() returns false, this method will be called.
      */
     public void displayError(HttpServletRequest request,
-            HttpServletResponse response, Context context) {
+        HttpServletResponse response,
+        Context context)
+    {
         context.put("password", "");
         context.put("title", "Agent Authentication");
         context.put("panel", "admin/console/config/agentauthenticatepanel.vm");