1 files changed, 32 insertions, 36 deletions

diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
index 2a98f12f..39c5cc51 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
+++ b/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.policy.constraints;
 
-
 import java.util.Vector;
 
 import com.netscape.certsrv.apps.CMS;
@@ -30,24 +29,22 @@ import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.PolicyResult;
 import com.netscape.cms.policy.APolicyRule;
 
-
 /**
- * AgentPolicy is an enrollment policy wraps another policy module.
- *   Requests are sent first to the contained module, but if the
- *   policy indicates that the request should be deferred, a check
- *   for agent approvals is done.  If any are found, the request
- *   is approved.
+ * AgentPolicy is an enrollment policy wraps another policy module. Requests are
+ * sent first to the contained module, but if the policy indicates that the
+ * request should be deferred, a check for agent approvals is done. If any are
+ * found, the request is approved.
  * <P>
+ * 
  * <PRE>
  * NOTE:  The Policy Framework has been replaced by the Profile Framework.
  * </PRE>
  * <P>
- *
+ * 
  * @deprecated
  * @version $Revision$, $Date$
  */
-public class AgentPolicy extends APolicyRule
-    implements IEnrollmentPolicy {
+public class AgentPolicy extends APolicyRule implements IEnrollmentPolicy {
     public AgentPolicy() {
         NAME = "AgentPolicy";
         DESC = "Agent Approval Policy";
@@ -56,19 +53,19 @@ public class AgentPolicy extends APolicyRule
     /**
      * Initializes this policy rule.
      * <P>
-     *
+     * 
      * The entries may be of the form:
-     *
-     *      ra.Policy.rule.<ruleName>.implName=AgentPolicy
-     *      ra.Policy.rule.<ruleName>.enable=true
-     *      ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == netscape.com
-     *      ra.Policy.rule.<ruleName>.class=xxxx
-     *      ra.Policy.rule.<ruleName>.params.*
-     *
-     * @param config	The config store reference
+     * 
+     * ra.Policy.rule.<ruleName>.implName=AgentPolicy
+     * ra.Policy.rule.<ruleName>.enable=true
+     * ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o ==
+     * netscape.com ra.Policy.rule.<ruleName>.class=xxxx
+     * ra.Policy.rule.<ruleName>.params.*
+     * 
+     * @param config The config store reference
      */
     public void init(ISubsystem owner, IConfigStore config)
-        throws EPolicyException {
+            throws EPolicyException {
 
         // Create subordinate object
         String className = (String) config.get("class");
@@ -83,9 +80,9 @@ public class AgentPolicy extends APolicyRule
                 Object o = c.newInstance();
 
                 if (!(o instanceof APolicyRule)) {
-                    throw new EPolicyException(
-                            CMS.getUserMessage("CMS_POLICY_INVALID_POLICY_CLASS", 
-                                getInstanceName(), className));
+                    throw new EPolicyException(CMS.getUserMessage(
+                            "CMS_POLICY_INVALID_POLICY_CLASS",
+                            getInstanceName(), className));
                 }
 
                 APolicyRule pr = (APolicyRule) o;
@@ -97,9 +94,9 @@ public class AgentPolicy extends APolicyRule
                 throw e;
             } catch (Exception e) {
                 System.err.println("Agent Policy Error: " + e);
-                throw new EPolicyException(
-                        CMS.getUserMessage("CMS_POLICY_LOADING_POLICY_ERROR",
-                            getInstanceName(), className));
+                throw new EPolicyException(CMS.getUserMessage(
+                        "CMS_POLICY_LOADING_POLICY_ERROR", getInstanceName(),
+                        className));
             }
         }
     }
@@ -107,8 +104,8 @@ public class AgentPolicy extends APolicyRule
     /**
      * Applies the policy on the given Request.
      * <P>
-     *
-     * @param req	The request on which to apply policy.
+     * 
+     * @param req The request on which to apply policy.
      * @return The policy result object.
      */
     public PolicyResult apply(IRequest req) {
@@ -125,13 +122,13 @@ public class AgentPolicy extends APolicyRule
         if (result == PolicyResult.DEFERRED) {
             System.err.println("Checking agent approvals");
             // Try to find an agent approval
-            AgentApprovals aa = AgentApprovals.fromStringVector(
-                    req.getExtDataInStringVector(AgentApprovals.class.getName()));
+            AgentApprovals aa = AgentApprovals.fromStringVector(req
+                    .getExtDataInStringVector(AgentApprovals.class.getName()));
 
-            //Object o = req.get("agentApprovals");
+            // Object o = req.get("agentApprovals");
 
             // Any approvals causes success
-            if (aa != null && aa.elements().hasMoreElements()) //if (o != null)
+            if (aa != null && aa.elements().hasMoreElements()) // if (o != null)
             {
                 System.err.println("Agent approval found");
                 result = PolicyResult.ACCEPTED;
@@ -143,7 +140,7 @@ public class AgentPolicy extends APolicyRule
 
     /**
      * Return configured parameters for a policy rule instance.
-     *
+     * 
      * @return nvPairs A Vector of name/value pairs.
      */
     public Vector getInstanceParams() {
@@ -152,13 +149,12 @@ public class AgentPolicy extends APolicyRule
 
     /**
      * Return default parameters for a policy implementation.
-     *
+     * 
      * @return nvPairs A Vector of name/value pairs.
      */
     public Vector getDefaultParams() {
         return null;
     }
 
-    APolicyRule mPolicy = null; 
+    APolicyRule mPolicy = null;
 }
-