You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/01/21 16:07:36 UTC

svn commit: r371073 - in /struts/action/trunk/src/java/org/apache/struts: action/ chain/ chain/commands/ chain/commands/generic/ chain/contexts/

Author: husted
Date: Sat Jan 21 07:07:30 2006
New Revision: 371073

URL: http://svn.apache.org/viewcvs?rev=371073&view=rev
Log:
CheckStyle pass
* chain.command.generic and some stragglers
** Low-risk, mechanical changes only.
** Mostly Javadocs.
** Some IDE-assisted code changes, such as renaming final fields or removing unused private fields
** Down to 1729 in Action subproject

Modified:
    struts/action/trunk/src/java/org/apache/struts/action/Action.java
    struts/action/trunk/src/java/org/apache/struts/action/ActionForward.java
    struts/action/trunk/src/java/org/apache/struts/action/ActionMessages.java
    struts/action/trunk/src/java/org/apache/struts/action/ActionServlet.java
    struts/action/trunk/src/java/org/apache/struts/chain/Constants.java
    struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
    struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
    struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
    struts/action/trunk/src/java/org/apache/struts/chain/contexts/ActionContextBase.java

Modified: struts/action/trunk/src/java/org/apache/struts/action/Action.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/Action.java?rev=371073&r1=371072&r2=371073&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/Action.java (original)
+++ struts/action/trunk/src/java/org/apache/struts/action/Action.java Sat Jan 21 07:07:30 2006
@@ -319,7 +319,7 @@
      * <p>Return the specified message resources for the current module.</p>
      *
      * @param request The servlet request we are processing
-     * @param key     The key specified in the <code>&lt;message-resources&gt;</code>
+     * @param key     The key specified in the message-resources
      *                element for the requested bundle.
      * @return The specified message resource for the current module.
      * @since Struts 1.1

Modified: struts/action/trunk/src/java/org/apache/struts/action/ActionForward.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/ActionForward.java?rev=371073&r1=371072&r2=371073&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/ActionForward.java (original)
+++ struts/action/trunk/src/java/org/apache/struts/action/ActionForward.java Sat Jan 21 07:07:30 2006
@@ -21,32 +21,32 @@
 
 /**
  * <p>An <strong>ActionForward</strong> represents a destination to which the
- * controller, <code>RequestProcessor</code>, might be directed to perform a
- * <code>RequestDispatcher.forward</code> or <code>HttpServletResponse.sendRedirect</code>
- * to, as a result of processing activities of an <code>Action</code> class.
+ * controller, RequestProcessor, might be directed to perform a
+ * RequestDispatcher.forward or HttpServletResponse.sendRedirect
+ * to, as a result of processing activities of an Action class.
  * Instances of this class may be created dynamically as necessary, or
- * configured in association with an <code>ActionMapping</code> instance for
+ * configured in association with an ActionMapping instance for
  * named lookup of potentially multiple destinations for a particular mapping
  * instance.</p>
  *
- * <p>An <code>ActionForward</code> has the following minimal set of properties.
+ * <p>An ActionForward has the following minimal set of properties.
  * Additional properties can be provided as needed by subclassses.</p> <ul>
- * <li><strong>contextRelative</strong> - Should the <code>path</code> value be
+ * <li><strong>contextRelative</strong> - Should the path value be
  * interpreted as context-relative (instead of module-relative, if it starts
  * with a '/' character? [false]</li> <li><strong>name</strong> - Logical name
  * by which this instance may be looked up in relationship to a particular
- * <code>ActionMapping</code>. </li> <li><strong>path</strong> - Module-relative
+ * ActionMapping. </li> <li><strong>path</strong> - Module-relative
  * or context-relative URI to which control should be forwarded, or an absolute
  * or relative URI to which control should be redirected.</li>
- * <li><strong>redirect</strong> - Set to <code>true</code> if the controller
- * servlet should call <code>HttpServletResponse.sendRedirect()</code> on the
- * associated path; otherwise <code>false</code>.  [false]</li> </ul>
+ * <li><strong>redirect</strong> - Set to true if the controller
+ * servlet should call HttpServletResponse.sendRedirect() on the
+ * associated path; otherwise false.  [false]</li> </ul>
  *
- * <p>Since Struts 1.1 this class extends <code>ForwardConfig</code> and
- * inherits the <code>contextRelative</code> property.
+ * <p>Since Struts 1.1 this class extends ForwardConfig and
+ * inherits the contextRelative property.
  *
  * <p><strong>NOTE</strong> - This class would have been deprecated and replaced
- * by <code>org.apache.struts.config.ForwardConfig</code> except for the fact
+ * by org.apache.struts.config.ForwardConfig except for the fact
  * that it is part of the public API that existing applications are using.</p>
  *
  * @version $Rev$ $Date: 2005-08-14 17:24:39 -0400 (Sun, 14 Aug 2005)

Modified: struts/action/trunk/src/java/org/apache/struts/action/ActionMessages.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/ActionMessages.java?rev=371073&r1=371072&r2=371073&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/ActionMessages.java (original)
+++ struts/action/trunk/src/java/org/apache/struts/action/ActionMessages.java Sat Jan 21 07:07:30 2006
@@ -354,9 +354,9 @@
         /**
          * <p>Construct an instance of this class.</p>
          *
-         * @param list     The list of <code>ActionMessage</code>s.
+         * @param list     The list of ActionMessages.
          * @param iOrder   The position in the list of messages.
-         * @param property The property associated with <code>ActionMessage</code>.
+         * @param property The property associated with ActionMessage.
          */
         public ActionMessageItem(List list, int iOrder, String property) {
             this.list = list;

Modified: struts/action/trunk/src/java/org/apache/struts/action/ActionServlet.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/ActionServlet.java?rev=371073&r1=371072&r2=371073&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/ActionServlet.java (original)
+++ struts/action/trunk/src/java/org/apache/struts/action/ActionServlet.java Sat Jan 21 07:07:30 2006
@@ -136,7 +136,7 @@
  * This can be repeated as many times as required for multiple modules. (Since
  * Struts 1.1)</li> <li><strong>configFactory</strong> - The Java class name of
  * the <code>ModuleConfigFactory</code> used to create the implementation of the
- * ModuleConfig interface. </li> </li> <li><strong>convertNull</strong> - Force
+ * ModuleConfig interface. </li> <li><strong>convertNull</strong> - Force
  * simulation of the Struts 1.0 behavior when populating forms. If set to true,
  * the numeric Java wrapper class types (like <code>java.lang.Integer</code>)
  * will default to null (rather than 0). (Since Struts 1.1) [false] </li>
@@ -720,7 +720,7 @@
     }
 
     /**
-     * <p>Simplifies exception handling in the <code>parseModuleConfigFile</code>
+     * <p>Simplifies exception handling in the parseModuleConfigFile
      * method.<p>
      *
      * @param path The path to which the exception relates.

Modified: struts/action/trunk/src/java/org/apache/struts/chain/Constants.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/chain/Constants.java?rev=371073&r1=371072&r2=371073&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/chain/Constants.java (original)
+++ struts/action/trunk/src/java/org/apache/struts/chain/Constants.java Sat Jan 21 07:07:30 2006
@@ -101,7 +101,7 @@
 
     /**
      * <p>The base part of the context attribute under which a Map containing
-     * the Action</code> instances associated with this module are stored. This
+     * the Action instances associated with this module are stored. This
      * value must be suffixed with the module prefix in order to create a unique
      * key per module.</p>
      */

Modified: struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSelectLocale.java?rev=371073&r1=371072&r2=371073&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSelectLocale.java (original)
+++ struts/action/trunk/src/java/org/apache/struts/chain/commands/AbstractSelectLocale.java Sat Jan 21 07:07:30 2006
@@ -37,7 +37,7 @@
     /**
      * <p> Provide Commons Logging instance for this class. </p>
      */
-    private static final Log log =
+    private static final Log LOG =
             LogFactory.getLog(AbstractSelectLocale.class);
 
     // ---------------------------------------------------------- Public Methods
@@ -52,13 +52,13 @@
     public boolean execute(ActionContext actionCtx)
             throws Exception {
         // Are we configured to select Locale automatically?
-        log.trace("retrieve config...");
+        LOG.trace("retrieve config...");
 
         ModuleConfig moduleConfig = actionCtx.getModuleConfig();
 
         if (!moduleConfig.getControllerConfig().getLocale()) {
-            if (log.isDebugEnabled()) {
-                log.debug("module is not configured for a specific locale; "
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("module is not configured for a specific locale; "
                         + "nothing to do");
             }
 
@@ -68,8 +68,8 @@
         // Retrieve and cache appropriate Locale for this request
         Locale locale = getLocale(actionCtx);
 
-        if (log.isDebugEnabled()) {
-            log.debug("set context locale to " + locale);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("set context locale to " + locale);
         }
 
         actionCtx.setLocale(locale);

Modified: struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java?rev=371073&r1=371072&r2=371073&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java (original)
+++ struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java Sat Jan 21 07:07:30 2006
@@ -31,14 +31,15 @@
  * @version $Id$
  */
 public class CopyFormToContext extends ActionCommandBase {
+
     // ------------------------------------------------------ Instance Variables
 
     /**
-     * <p>The name of a form bean as configured in a <code>struts-config.xml</code>
-     * file for this module.  </p>
+     * <p>The name of a form bean as configured in a struts-config.xml file for
+     * this module.  </p>
      *
-     * <p> Either <code>actionPath</code> or both this and <code>scope</code>
-     * are required configuration properties.</p>
+     * <p> Either actionPath or both this and scope are required configuration
+     * properties.</p>
      */
     private String formName = null;
 
@@ -72,34 +73,75 @@
     private String toKey = ActionContextBase.ACTION_FORM_KEY;
 
     // ------------------------------------------------------ Properties
+
+    /**
+     * Return ActionPath property.
+     *
+     * @return ActionPath property
+     */
     public String getActionPath() {
         return this.actionPath;
     }
 
+    /**
+     * Set ActionPath property.
+     *
+     * @param actionPath New valuefor ActionPath
+     */
     public void setActionPath(String actionPath) {
         this.actionPath = actionPath;
     }
 
+    /**
+     * Return FormName property.
+     *
+     * @return FormName property
+     */
     public String getFormName() {
         return this.formName;
     }
 
+    /**
+     * Set FormName property.
+     *
+     * @param formName New valuefor FormName
+     */
     public void setFormName(String formName) {
         this.formName = formName;
     }
 
+    /**
+     * Return Scope property.
+     *
+     * @return Scope property
+     */
     public String getScope() {
         return this.scope;
     }
 
+    /**
+     * Set Scope property.
+     *
+     * @param scope New valuefor Scope
+     */
     public void setScope(String scope) {
         this.scope = scope;
     }
 
+    /**
+     * Return ToKey property.
+     *
+     * @return ToKey property
+     */
     public String getToKey() {
         return this.toKey;
     }
 
+    /**
+     * Set ToKey property.
+     *
+     * @param toKey New valuefor FormName
+     */
     public void setToKey(String toKey) {
         this.toKey = toKey;
     }
@@ -114,6 +156,9 @@
      * an HTML form.  It will also be in the <code>ActionContext</code>
      * available for another command to do prepopulation of values or other
      * preparation.</p>
+     * @param actionContext Our ActionContext
+     * @return TRUE if processing should halt
+     * @throws Exception on any error
      */
     public boolean execute(ActionContext actionContext)
             throws Exception {
@@ -134,15 +179,18 @@
      * <code>ActionContext</code>, find or create an ActionForm instance for
      * preparation.</p>
      *
-     * @param context
-     * @return
-     * @throws IllegalAccessException
-     * @throws InstantiationException
+     * @param context ActionContextBase class that we are processing
+     * @return ActionForm instance
+     * @throws IllegalArgumentException On ActionConfig not found
+     * @throws IllegalStateException    On undefined scope and formbean
+     * @throws IllegalAccessException   On failed instantiation
+     * @throws InstantiationException   If ActionContext is not subsclass of
+     *                                  ActionContextBase
      */
     protected ActionForm findOrCreateForm(ActionContext context)
             throws IllegalAccessException, InstantiationException {
-        String effectiveFormName = null;
-        String effectiveScope = null;
+        String effectiveFormName;
+        String effectiveScope;
 
         if (!(isEmpty(this.getActionPath()))) {
             ActionConfig actionConfig = context.getModuleConfig()
@@ -183,25 +231,27 @@
      * <code>ActionContextBase</code>, which implements the utility method
      * <code>findOrCreateActionForm</code>. </p>
      *
-     * @param ctx
-     * @param effectiveFormName
-     * @param effectiveScope
-     * @return
-     * @throws IllegalAccessException
-     * @throws InstantiationException
-     * @throws IllegalArgumentException
+     * @param ctx               The ActionContext we are processing
+     * @param effectiveFormName the target form name
+     * @param effectiveScope    The target scope
+     * @return ActionForm instnace, storing in scope if created
+     * @throws InstantiationException   If ActionContext is not subsclass of
+     *                                  ActionContextBase
+     * @throws InstantiationException   If object cannot be created
+     * @throws IllegalArgumentException On form not found in/ scope
+     * @throws IllegalAccessException   On failed instantiation
+     * @throws IllegalStateException    If ActionContext is not a subclass of
+     *                                  ActionBase
      */
     protected ActionForm findOrCreateForm(ActionContext ctx,
                                           String effectiveFormName,
                                           String effectiveScope)
-            throws IllegalAccessException, InstantiationException,
-            IllegalArgumentException {
+            throws IllegalAccessException, InstantiationException {
         ActionContextBase context;
 
         try {
             context = (ActionContextBase) ctx;
-        }
-        catch (ClassCastException e) {
+        } catch (ClassCastException e) {
             throw new IllegalStateException("ActionContext [" + ctx + "]"
                     + " must be subclass of ActionContextBase");
         }
@@ -218,6 +268,12 @@
         return form;
     }
 
+    /**
+     * <p>Convenience method to test for an empty string.</p>
+     *
+     * @param test String to test
+     * @return TRUE if test is null or zero-length
+     */
     private boolean isEmpty(String test) {
         return (test == null) || (test.trim().length() == 0);
     }

Modified: struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java?rev=371073&r1=371072&r2=371073&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java (original)
+++ struts/action/trunk/src/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java Sat Jan 21 07:07:30 2006
@@ -30,20 +30,47 @@
 import java.lang.reflect.InvocationTargetException;
 
 /**
- * Variant on chain LookupCommand which can optionally wrap the context it
- * passes to the looked up command in an alternative class.
+ * <p>Variant on chain LookupCommand which can optionally wrap the context it
+ * passes to the looked up command in an alternative class.</p>
  */
 public class WrappingLookupCommand implements Filter {
-    private static final Log log =
+
+    /**
+     * Provide Commons Logging instance for this class.
+     */
+    private static final Log LOG =
             LogFactory.getLog(WrappingLookupCommand.class);
 
     // ------------------------------------------------------ Instance Variables
+
+    /**
+     * <p>Field for property.</p>
+     */
     private String catalogName = null;
+
+    /**
+     * <p>Field for property.</p>
+     */
     private String name = null;
+
+    /**
+     * <p>Field for property.</p>
+     */
     private String nameKey = null;
+
+    /**
+     * <p>Field for property.</p>
+     */
     private String wrapperClassName = null;
+
+    /**
+     * <p>Field for property.</p>
+     */
     private boolean optional = false;
 
+    /**
+     * <p>Zero-argument constructor.</p>
+     */
     public WrappingLookupCommand() {
         catalogName = null;
         name = null;
@@ -51,50 +78,108 @@
         optional = false;
     }
 
+    /**
+     * <p>Return CatalogName property.  </p>
+     *
+     * @return Value of CatalogName property.
+     */
     public String getCatalogName() {
         return catalogName;
     }
 
+    /**
+     * <p>Set CatalogName property.</p>
+     *
+     * @param catalogName New value for CatalogName
+     */
     public void setCatalogName(String catalogName) {
         this.catalogName = catalogName;
     }
 
+    /**
+     * <p>Retrieve Name property.</p>
+     *
+     * @return Value of Name property
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * <p>Set Name property.</p>
+     *
+     * @param name New value for Name
+     */
     public void setName(String name) {
         this.name = name;
     }
 
+    /**
+     * <p>Return NameKey property.</p>
+     *
+     * @return Value of NameKey property.
+     */
     public String getNameKey() {
         return nameKey;
     }
 
+    /**
+     * <p>Set NameKey property.</p>
+     *
+     * @param nameKey New value for NameKey
+     */
     public void setNameKey(String nameKey) {
         this.nameKey = nameKey;
     }
 
+    /**
+     * <p>Test Optional property.</p>
+     *
+     * @return TRUE if Optional is TRUE.
+     */
     public boolean isOptional() {
         return optional;
     }
 
+    /**
+     * <p>Set Optional property.</p>
+     *
+     * @param optional New value for Optional
+     */
     public void setOptional(boolean optional) {
         this.optional = optional;
     }
 
+    /**
+     * <p>Return the WrapperClass property.</p>
+     *
+     * @return The WrapperClass property
+     */
     public String getWrapperClassName() {
         return wrapperClassName;
     }
 
+    /**
+     * <p>Set WrappClassName property. </p>
+     *
+     * @param wrapperClassName The name of a WrapperClass
+     */
     public void setWrapperClassName(String wrapperClassName) {
         this.wrapperClassName = wrapperClassName;
     }
 
+    /**
+     * <p>Invoke the Command for a Context, returning TRUE if processing should
+     * halt.</p>
+     *
+     * @param context Our ActionContext
+     * @return TRUE if processing should halt
+     * @throws Exception On any error
+     */
     public boolean execute(Context context)
             throws Exception {
-        if (log.isTraceEnabled()) {
-            log.trace("execute [" + this + "]");
+        if (LOG.isTraceEnabled()) {
+            LOG.trace("execute [" + this + "]");
         }
 
         Command command = getCommand(context);
@@ -106,6 +191,13 @@
         }
     }
 
+    /**
+     * <p>Process the Exception for any Command that is a filter.</p>
+     *
+     * @param context   Our ActionContext
+     * @param exception The Exception thrown by another Comamnd in a Chain
+     * @return TRUE if there is a Filter to process
+     */
     public boolean postprocess(Context context, Exception exception) {
         Command command = getCommand(context);
 
@@ -113,31 +205,32 @@
             try {
                 return ((Filter) command).postprocess(getContext(context),
                         exception);
-            }
-            catch (NoSuchMethodException ex) {
-                log.error("Error wrapping context in postprocess", ex);
-            }
-            catch (IllegalAccessException ex) {
-                log.error("Error wrapping context in postprocess", ex);
-            }
-            catch (InvocationTargetException ex) {
-                log.error("Error wrapping context in postprocess", ex);
-            }
-            catch (InstantiationException ex) {
-                log.error("Error wrapping context in postprocess", ex);
-            }
-            catch (ClassNotFoundException ex) {
-                log.error("Error wrapping context in postprocess", ex);
+            } catch (NoSuchMethodException ex) {
+                LOG.error("Error wrapping context in postprocess", ex);
+            } catch (IllegalAccessException ex) {
+                LOG.error("Error wrapping context in postprocess", ex);
+            } catch (InvocationTargetException ex) {
+                LOG.error("Error wrapping context in postprocess", ex);
+            } catch (InstantiationException ex) {
+                LOG.error("Error wrapping context in postprocess", ex);
+            } catch (ClassNotFoundException ex) {
+                LOG.error("Error wrapping context in postprocess", ex);
             }
         }
 
         return false;
     }
 
+    /**
+     * <p>Return the Command to process for this Context.</p>
+     *
+     * @param context The Context we are processing
+     * @return The Command to process for this Context
+     */
     protected Command getCommand(Context context) {
         CatalogFactory catalogFactory = CatalogFactory.getInstance();
         String catalogName = getCatalogName();
-        Catalog catalog = null;
+        Catalog catalog;
 
         if (catalogName == null) {
             catalog = catalogFactory.getCatalog();
@@ -151,7 +244,7 @@
                     + catalogName + "'");
         }
 
-        Command command = null;
+        Command command;
         String name = getName();
 
         if (name == null) {
@@ -159,15 +252,15 @@
         }
 
         if (name != null) {
-            if (log.isDebugEnabled()) {
-                log.debug("Lookup command " + name + " in catalog "
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Lookup command " + name + " in catalog "
                         + catalogName);
             }
 
             command = catalog.getCommand(name);
 
-            if (log.isDebugEnabled()) {
-                log.debug("Found command " + command + ";" + " optional: "
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Found command " + command + ";" + " optional: "
                         + isOptional());
             }
 
@@ -185,38 +278,43 @@
     }
 
     /**
-     * <p>If the <code>wrapperClassName</code> property is not null, return a
-     * <code>Context</code> of the type specified by <code>wrapperClassName</code>,
-     * instantiated using a single-arg constructor which takes the
-     * <code>context</code> passed as an argument to this method.</p>
+     * <p>If the wrapperClassName property is not null, return a Context of the
+     * type specified by wrapperClassName, instantiated using a single-arg
+     * constructor which takes the context passed as an argument to this
+     * method.</p>
      *
      * <p>This method throws an exception if the wrapperClass cannot be found,
      * or if there are any errors instantiating the wrapping context.</p>
      *
-     * @param context
-     * @return
+     * @param context Context we are processing
+     * @return Context wrapper
+     * @throws ClassNotFoundException    On failed instantiation
+     * @throws InstantiationException    On failed instantiation
+     * @throws InvocationTargetException On failed instantiation
+     * @throws IllegalAccessException    On failed instantiation
+     * @throws NoSuchMethodException     On failed instantiation
      */
     protected Context getContext(Context context)
             throws ClassNotFoundException, InstantiationException,
             InvocationTargetException, IllegalAccessException,
             NoSuchMethodException {
         if (wrapperClassName == null) {
-            if (log.isDebugEnabled()) {
-                log.debug("No defined wrapper class; "
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("No defined wrapper class; "
                         + "returning original context.");
             }
 
             return context;
         }
 
-        if (log.isDebugEnabled()) {
-            log.debug("Looking for wrapper class: " + wrapperClassName);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Looking for wrapper class: " + wrapperClassName);
         }
 
         Class wrapperClass = ClassUtils.getApplicationClass(wrapperClassName);
 
-        if (log.isDebugEnabled()) {
-            log.debug("Instantiating wrapper class");
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Instantiating wrapper class");
         }
 
         return (Context) ConstructorUtils.invokeConstructor(wrapperClass,

Modified: struts/action/trunk/src/java/org/apache/struts/chain/contexts/ActionContextBase.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/chain/contexts/ActionContextBase.java?rev=371073&r1=371072&r2=371073&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/chain/contexts/ActionContextBase.java (original)
+++ struts/action/trunk/src/java/org/apache/struts/chain/contexts/ActionContextBase.java Sat Jan 21 07:07:30 2006
@@ -489,8 +489,8 @@
      * @param formName  The name attribute of our ActionForm
      * @param scopeName The scope identier (request, session)
      * @return The ActionForm for this request
-     * @throws IllegalAccessException
-     * @throws InstantiationException
+     * @throws IllegalAccessException If object cannot be created
+     * @throws InstantiationException If object cannot be created
      * @see this.findOrCreateActionForm(String, String, ModuleConfig)
      */
     public ActionForm findOrCreateActionForm(String formName,



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org