struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r376842 [1/2] - /struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/
Date Fri, 10 Feb 2006 21:02:04 GMT
Author: husted
Date: Fri Feb 10 13:02:03 2006
New Revision: 376842

URL: http://svn.apache.org/viewcvs?rev=376842&view=rev
Log:
Checkstyle Roundup 
* Taglib logic package reformatted with latest Jalopy settings. Stylistic changes only.


Modified:
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/CompareTagBase.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/ConditionalTagBase.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/EmptyTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/EqualTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/ForwardTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/GreaterEqualTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/GreaterThanTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/IterateTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/IterateTei.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/LessEqualTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/LessThanTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MatchTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MessagesNotPresentTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MessagesPresentTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotEmptyTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotEqualTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotMatchTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotPresentTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/PresentTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/RedirectTag.java
    struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/package.html

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/CompareTagBase.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/CompareTagBase.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/CompareTagBase.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/CompareTagBase.java Fri Feb 10 13:02:03 2006
@@ -1,76 +1,66 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.struts.taglib.TagUtils;
+import org.apache.struts.util.MessageResources;
 
-import java.lang.reflect.InvocationTargetException;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
-import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.struts.util.MessageResources;
-import org.apache.struts.taglib.TagUtils;
 
+import java.lang.reflect.InvocationTargetException;
 
 /**
  * Abstract base class for comparison tags.  Concrete subclasses need only
  * define values for desired1 and desired2.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
-
 public abstract class CompareTagBase extends ConditionalTagBase {
-
-
     // ----------------------------------------------------- Instance Variables
 
-
     /**
      * We will do a double/float comparison.
      */
     protected static final int DOUBLE_COMPARE = 0;
 
-
     /**
      * We will do a long/int comparison.
      */
     protected static final int LONG_COMPARE = 1;
 
-
     /**
      * We will do a String comparison.
      */
     protected static final int STRING_COMPARE = 2;
 
-
     /**
      * The message resources for this package.
      */
     protected static MessageResources messages =
-     MessageResources.getMessageResources
-        ("org.apache.struts.taglib.logic.LocalStrings");
-
+        MessageResources.getMessageResources(
+            "org.apache.struts.taglib.logic.LocalStrings");
 
     // ------------------------------------------------------------ Properties
 
-
     /**
      * The value to which the variable specified by other attributes of this
      * tag will be compared.
@@ -85,53 +75,46 @@
         this.value = value;
     }
 
-
     // --------------------------------------------------------- Public Methods
 
-
     /**
      * Release all allocated resources.
      */
     public void release() {
-
         super.release();
         value = null;
-
     }
 
-
     // ------------------------------------------------------ Protected Methods
 
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected abstract boolean condition() throws JspException;
-
+    protected abstract boolean condition()
+        throws JspException;
 
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
      * @param desired1 First desired value for a true result (-1, 0, +1)
      * @param desired2 Second desired value for a true result (-1, 0, +1)
-     *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
     protected boolean condition(int desired1, int desired2)
         throws JspException {
-
         // Acquire the value and determine the test type
         int type = -1;
         double doubleValue = 0.0;
         long longValue = 0;
+
         if ((type < 0) && (value.length() > 0)) {
             try {
                 doubleValue = Double.parseDouble(value);
@@ -140,6 +123,7 @@
                 ;
             }
         }
+
         if ((type < 0) && (value.length() > 0)) {
             try {
                 longValue = Long.parseLong(value);
@@ -148,89 +132,103 @@
                 ;
             }
         }
+
         if (type < 0) {
             type = STRING_COMPARE;
         }
 
         // Acquire the unconverted variable value
         Object variable = null;
+
         if (cookie != null) {
-            Cookie cookies[] =
-                ((HttpServletRequest) pageContext.getRequest()).
-                getCookies();
-            if (cookies == null)
+            Cookie[] cookies =
+                ((HttpServletRequest) pageContext.getRequest()).getCookies();
+
+            if (cookies == null) {
                 cookies = new Cookie[0];
+            }
+
             for (int i = 0; i < cookies.length; i++) {
                 if (cookie.equals(cookies[i].getName())) {
                     variable = cookies[i].getValue();
+
                     break;
                 }
             }
         } else if (header != null) {
             variable =
-                ((HttpServletRequest) pageContext.getRequest()).
-                getHeader(header);
+                ((HttpServletRequest) pageContext.getRequest()).getHeader(header);
         } else if (name != null) {
-            Object bean = TagUtils.getInstance().lookup(pageContext, name, scope);
+            Object bean =
+                TagUtils.getInstance().lookup(pageContext, name, scope);
+
             if (property != null) {
                 if (bean == null) {
-                    JspException e = new JspException
-                        (messages.getMessage("logic.bean", name));
+                    JspException e =
+                        new JspException(messages.getMessage("logic.bean", name));
+
                     TagUtils.getInstance().saveException(pageContext, e);
                     throw e;
                 }
+
                 try {
                     variable = PropertyUtils.getProperty(bean, property);
                 } catch (InvocationTargetException e) {
                     Throwable t = e.getTargetException();
-                    if (t == null)
+
+                    if (t == null) {
                         t = e;
+                    }
+
                     TagUtils.getInstance().saveException(pageContext, t);
-                    throw new JspException
-                        (messages.getMessage("logic.property", name, property,
-                                             t.toString()));
+                    throw new JspException(messages.getMessage(
+                            "logic.property", name, property, t.toString()));
                 } catch (Throwable t) {
                     TagUtils.getInstance().saveException(pageContext, t);
-                    throw new JspException
-                        (messages.getMessage("logic.property", name, property,
-                                             t.toString()));
+                    throw new JspException(messages.getMessage(
+                            "logic.property", name, property, t.toString()));
                 }
             } else {
                 variable = bean;
             }
         } else if (parameter != null) {
-            variable =
-                pageContext.getRequest().getParameter(parameter);
+            variable = pageContext.getRequest().getParameter(parameter);
         } else {
-            JspException e = new JspException
-                (messages.getMessage("logic.selector"));
+            JspException e =
+                new JspException(messages.getMessage("logic.selector"));
+
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;
         }
+
         if (variable == null) {
-            variable = "";    // Coerce null to a zero-length String
+            variable = ""; // Coerce null to a zero-length String
         }
 
         // Perform the appropriate comparison
         int result = 0;
+
         if (type == DOUBLE_COMPARE) {
             try {
-                double doubleVariable =
-                    Double.parseDouble(variable.toString());
-                if (doubleVariable < doubleValue)
+                double doubleVariable = Double.parseDouble(variable.toString());
+
+                if (doubleVariable < doubleValue) {
                     result = -1;
-                else if (doubleVariable > doubleValue)
+                } else if (doubleVariable > doubleValue) {
                     result = +1;
+                }
             } catch (NumberFormatException e) {
                 result = variable.toString().compareTo(value);
             }
         } else if (type == LONG_COMPARE) {
             try {
                 long longVariable = Long.parseLong(variable.toString());
-                if (longVariable < longValue)
+
+                if (longVariable < longValue) {
                     result = -1;
-                else if (longVariable > longValue)
+                } else if (longVariable > longValue) {
                     result = +1;
+                }
             } catch (NumberFormatException e) {
                 result = variable.toString().compareTo(value);
             }
@@ -239,15 +237,13 @@
         }
 
         // Normalize the result
-        if (result < 0)
+        if (result < 0) {
             result = -1;
-        else if (result > 0)
+        } else if (result > 0) {
             result = +1;
+        }
 
         // Return true if the result matches either desired value
         return ((result == desired1) || (result == desired2));
-
     }
-
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/ConditionalTagBase.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/ConditionalTagBase.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/ConditionalTagBase.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/ConditionalTagBase.java Fri Feb 10 13:02:03 2006
@@ -1,47 +1,86 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
+import org.apache.struts.util.MessageResources;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.util.MessageResources;
-
 
 /**
  * Abstract base class for the various conditional evaluation tags.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
-
 public abstract class ConditionalTagBase extends TagSupport {
-
+    /**
+     * The message resources for this package.
+     */
+    protected static MessageResources messages =
+        MessageResources.getMessageResources(
+            "org.apache.struts.taglib.logic.LocalStrings");
 
     // ------------------------------------------------------------- Properties
 
-
     /**
      * The name of the cookie to be used as a variable.
      */
     protected String cookie = null;
 
+    /**
+     * The name of the HTTP request header to be used as a variable.
+     */
+    protected String header = null;
+
+    /**
+     * The name of the JSP bean to be used as a variable (if
+     * <code>property</code> is not specified), or whose property is to be
+     * accessed (if <code>property</code> is specified).
+     */
+    protected String name = null;
+
+    /**
+     * The name of the HTTP request parameter to be used as a variable.
+     */
+    protected String parameter = null;
+
+    /**
+     * The name of the bean property to be used as a variable.
+     */
+    protected String property = null;
+
+    /**
+     * The name of the security role to be checked for.
+     */
+    protected String role = null;
+
+    /**
+     * The scope to search for the bean named by the name property, or "any
+     * scope" if null.
+     */
+    protected String scope = null;
+
+    /**
+     * The user principal name to be checked for.
+     */
+    protected String user = null;
+
     public String getCookie() {
         return (this.cookie);
     }
@@ -50,12 +89,6 @@
         this.cookie = cookie;
     }
 
-
-    /**
-     * The name of the HTTP request header to be used as a variable.
-     */
-    protected String header = null;
-
     public String getHeader() {
         return (this.header);
     }
@@ -64,22 +97,6 @@
         this.header = header;
     }
 
-
-    /**
-     * The message resources for this package.
-     */
-    protected static MessageResources messages =
-     MessageResources.getMessageResources
-        ("org.apache.struts.taglib.logic.LocalStrings");
-
-
-    /**
-     * The name of the JSP bean to be used as a variable (if
-     * <code>property</code> is not specified), or whose property is to be
-     * accessed (if <code>property</code> is specified).
-     */
-    protected String name = null;
-
     public String getName() {
         return (this.name);
     }
@@ -88,12 +105,6 @@
         this.name = name;
     }
 
-
-    /**
-     * The name of the HTTP request parameter to be used as a variable.
-     */
-    protected String parameter = null;
-
     public String getParameter() {
         return (this.parameter);
     }
@@ -102,12 +113,6 @@
         this.parameter = parameter;
     }
 
-
-    /**
-     * The name of the bean property to be used as a variable.
-     */
-    protected String property = null;
-
     public String getProperty() {
         return (this.property);
     }
@@ -116,12 +121,6 @@
         this.property = property;
     }
 
-
-    /**
-     * The name of the security role to be checked for.
-     */
-    protected String role = null;
-
     public String getRole() {
         return (this.role);
     }
@@ -130,13 +129,6 @@
         this.role = role;
     }
 
-
-    /**
-     * The scope to search for the bean named by the name property, or
-     * "any scope" if null.
-     */
-    protected String scope = null;
-
     public String getScope() {
         return (this.scope);
     }
@@ -145,12 +137,6 @@
         this.scope = scope;
     }
 
-
-    /**
-     * The user principal name to be checked for.
-     */
-    protected String user = null;
-
     public String getUser() {
         return (this.user);
     }
@@ -159,43 +145,35 @@
         this.user = user;
     }
 
-
     // --------------------------------------------------------- Public Methods
 
-
     /**
      * Perform the test required for this particular tag, and either evaluate
      * or skip the body of this tag.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
     public int doStartTag() throws JspException {
-
-        if (condition())
+        if (condition()) {
             return (EVAL_BODY_INCLUDE);
-        else
+        } else {
             return (SKIP_BODY);
-
+        }
     }
 
-
     /**
      * Evaluate the remainder of the current page normally.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
     public int doEndTag() throws JspException {
-
         return (EVAL_PAGE);
-
     }
 
-
     /**
      * Release all allocated resources.
      */
     public void release() {
-
         super.release();
         cookie = null;
         header = null;
@@ -205,22 +183,18 @@
         role = null;
         scope = null;
         user = null;
-
     }
 
-
     // ------------------------------------------------------ Protected Methods
 
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected abstract boolean condition() throws JspException;
-
-
+    protected abstract boolean condition()
+        throws JspException;
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/EmptyTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/EmptyTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/EmptyTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/EmptyTag.java Fri Feb 10 13:02:03 2006
@@ -1,5 +1,5 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
  *
@@ -15,95 +15,91 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.struts.taglib.logic;
 
-import java.util.Collection;
-import java.util.Map;
-import java.lang.reflect.Array;
+import org.apache.struts.taglib.TagUtils;
 
 import javax.servlet.jsp.JspException;
 
-import org.apache.struts.taglib.TagUtils;
+import java.lang.reflect.Array;
+
+import java.util.Collection;
+import java.util.Map;
 
 /**
- * Evalute the nested body content of this tag if the specified value
- * is empty for this request.
+ * Evalute the nested body content of this tag if the specified value is empty
+ * for this request.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
  */
 public class EmptyTag extends ConditionalTagBase {
-
-
     // ------------------------------------------------------ Protected Methods
 
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(true));
-
     }
 
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
      * @param desired Desired outcome for a true result
-     *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition(boolean desired) throws JspException {
+    protected boolean condition(boolean desired)
+        throws JspException {
         if (this.name == null) {
             JspException e =
-                    new JspException(messages.getMessage("empty.noNameAttribute"));
+                new JspException(messages.getMessage("empty.noNameAttribute"));
+
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;
         }
 
         Object value = null;
+
         if (this.property == null) {
             value = TagUtils.getInstance().lookup(pageContext, name, scope);
         } else {
-            value = TagUtils.getInstance().lookup(pageContext, name, property, scope);
+            value =
+                TagUtils.getInstance().lookup(pageContext, name, property, scope);
         }
 
         boolean empty = true;
 
         if (value == null) {
             empty = true;
-
         } else if (value instanceof String) {
             String strValue = (String) value;
-            empty = (strValue.length() < 1);
 
+            empty = (strValue.length() < 1);
         } else if (value instanceof Collection) {
             Collection collValue = (Collection) value;
-            empty = collValue.isEmpty();
 
+            empty = collValue.isEmpty();
         } else if (value instanceof Map) {
             Map mapValue = (Map) value;
-            empty = mapValue.isEmpty();
 
+            empty = mapValue.isEmpty();
         } else if (value.getClass().isArray()) {
             empty = Array.getLength(value) == 0;
-
         } else {
             empty = false;
         }
 
         return (empty == desired);
     }
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/EqualTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/EqualTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/EqualTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/EqualTag.java Fri Feb 10 13:02:03 2006
@@ -1,51 +1,42 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
-
 import javax.servlet.jsp.JspException;
 
-
 /**
- * Evaluate the nested body content of this tag if the specified variable
- * and value are equal.
+ * Evaluate the nested body content of this tag if the specified variable and
+ * value are equal.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
-
 public class EqualTag extends CompareTagBase {
-
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(0, 0));
-
     }
-
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/ForwardTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/ForwardTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/ForwardTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/ForwardTag.java Fri Feb 10 13:02:03 2006
@@ -1,41 +1,40 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.struts.taglib.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.config.ModuleConfig;
 import org.apache.struts.taglib.TagUtils;
 import org.apache.struts.util.MessageResources;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
 /**
  * Perform a forward or redirect to a page that is looked up in the
  * configuration information associated with our application.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
 public class ForwardTag extends TagSupport {
-
     // ----------------------------------------------------------- Properties
 
     /**
@@ -46,8 +45,8 @@
             "org.apache.struts.taglib.logic.LocalStrings");
 
     /**
-     * The logical name of the <code>ActionForward</code> entry to be
-     * looked up.
+     * The logical name of the <code>ActionForward</code> entry to be looked
+     * up.
      */
     protected String name = null;
 
@@ -64,39 +63,39 @@
     /**
      * Defer processing until the end of this tag is encountered.
      *
-     * @exception JspException if a JSP exception has occurred
+     * @throws JspException if a JSP exception has occurred
      */
     public int doStartTag() throws JspException {
-
         return (SKIP_BODY);
-
     }
 
     /**
-     * Look up the ActionForward associated with the specified name,
-     * and perform a forward or redirect to that path as indicated.
+     * Look up the ActionForward associated with the specified name, and
+     * perform a forward or redirect to that path as indicated.
      *
-     * @exception JspException if a JSP exception has occurred
+     * @throws JspException if a JSP exception has occurred
      */
     public int doEndTag() throws JspException {
-
         // Look up the desired ActionForward entry
         ActionForward forward = null;
-        ModuleConfig config = TagUtils.getInstance().getModuleConfig(pageContext);
-        
-        if (config != null){
+        ModuleConfig config =
+            TagUtils.getInstance().getModuleConfig(pageContext);
+
+        if (config != null) {
             forward = (ActionForward) config.findForwardConfig(name);
         }
-            
+
         if (forward == null) {
             JspException e =
                 new JspException(messages.getMessage("forward.lookup", name));
+
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;
         }
 
         // Forward or redirect to the corresponding actual path
         String path = forward.getPath();
+
         path = config.getPrefix() + path;
 
         if (forward.getRedirect()) {
@@ -107,50 +106,51 @@
 
         // Skip the remainder of this page
         return (SKIP_PAGE);
-
     }
 
     /**
      * Forward to the given path converting exceptions to JspException.
+     *
      * @param path The path to forward to.
      * @throws JspException
      * @since Struts 1.2
      */
-    protected void doForward(String path) throws JspException {
+    protected void doForward(String path)
+        throws JspException {
         try {
             pageContext.forward(path);
-            
         } catch (Exception e) {
             TagUtils.getInstance().saveException(pageContext, e);
-            throw new JspException(
-                messages.getMessage("forward.forward", name, e.toString()));
+            throw new JspException(messages.getMessage("forward.forward", name,
+                    e.toString()));
         }
     }
 
     /**
      * Redirect to the given path converting exceptions to JspException.
+     *
      * @param path The path to redirect to.
      * @throws JspException
      * @since Struts 1.2
      */
-    protected void doRedirect(String path) throws JspException {
+    protected void doRedirect(String path)
+        throws JspException {
         HttpServletRequest request =
             (HttpServletRequest) pageContext.getRequest();
-            
+
         HttpServletResponse response =
             (HttpServletResponse) pageContext.getResponse();
-            
+
         try {
             if (path.startsWith("/")) {
                 path = request.getContextPath() + path;
             }
-            
+
             response.sendRedirect(response.encodeRedirectURL(path));
-            
         } catch (Exception e) {
             TagUtils.getInstance().saveException(pageContext, e);
-            throw new JspException(
-                messages.getMessage("forward.redirect", name, e.toString()));
+            throw new JspException(messages.getMessage("forward.redirect",
+                    name, e.toString()));
         }
     }
 
@@ -158,10 +158,7 @@
      * Release all allocated resources.
      */
     public void release() {
-
         super.release();
         name = null;
-
     }
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/GreaterEqualTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/GreaterEqualTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/GreaterEqualTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/GreaterEqualTag.java Fri Feb 10 13:02:03 2006
@@ -1,51 +1,42 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
-
 import javax.servlet.jsp.JspException;
 
-
 /**
- * Evaluate the nested body content of this tag if the specified variable
- * is greater than or equal to the specified value.
+ * Evaluate the nested body content of this tag if the specified variable is
+ * greater than or equal to the specified value.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
-
 public class GreaterEqualTag extends CompareTagBase {
-
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(+1, 0));
-
     }
-
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/GreaterThanTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/GreaterThanTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/GreaterThanTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/GreaterThanTag.java Fri Feb 10 13:02:03 2006
@@ -1,51 +1,42 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
-
 import javax.servlet.jsp.JspException;
 
-
 /**
- * Evaluate the nested body content of this tag if the specified variable
- * is greater than the specified value.
+ * Evaluate the nested body content of this tag if the specified variable is
+ * greater than the specified value.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
-
 public class GreaterThanTag extends CompareTagBase {
-
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(+1, +1));
-
     }
-
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/IterateTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/IterateTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/IterateTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/IterateTag.java Fri Feb 10 13:02:03 2006
@@ -1,24 +1,31 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.struts.taglib.logic;
 
+import org.apache.struts.taglib.TagUtils;
+import org.apache.struts.util.IteratorAdapter;
+import org.apache.struts.util.MessageResources;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
 import java.lang.reflect.Array;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,24 +33,23 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-import org.apache.struts.util.IteratorAdapter;
-import org.apache.struts.taglib.TagUtils;
-import org.apache.struts.util.MessageResources;
-
 /**
- * Custom tag that iterates the elements of a collection, which can be
- * either an attribute or the property of an attribute.  The collection
- * can be any of the following:  an array of objects, an Enumeration,
- * an Iterator, a Collection (which includes Lists, Sets and Vectors),
- * or a Map (which includes Hashtables) whose elements will be iterated over.
+ * Custom tag that iterates the elements of a collection, which can be either
+ * an attribute or the property of an attribute.  The collection can be any of
+ * the following:  an array of objects, an Enumeration, an Iterator, a
+ * Collection (which includes Lists, Sets and Vectors), or a Map (which
+ * includes Hashtables) whose elements will be iterated over.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-11-03 14:20:47 -0500 (Wed, 03 Nov 2004)
+ *          $
  */
-
 public class IterateTag extends BodyTagSupport {
+    /**
+     * The message resources for this package.
+     */
+    protected static MessageResources messages =
+        MessageResources.getMessageResources(
+            "org.apache.struts.taglib.logic.LocalStrings");
 
     // ----------------------------------------------------- Instance Variables
 
@@ -64,12 +70,6 @@
     protected int lengthValue = 0;
 
     /**
-     * The message resources for this package.
-     */
-    protected static MessageResources messages =
-        MessageResources.getMessageResources("org.apache.struts.taglib.logic.LocalStrings");
-
-    /**
      * The actual offset value (calculated in the start tag).
      */
     protected int offsetValue = 0;
@@ -86,6 +86,46 @@
      */
     protected Object collection = null;
 
+    /**
+     * The name of the scripting variable to be exposed.
+     */
+    protected String id = null;
+
+    /**
+     * The name of the scripting variable to be exposed as the current index.
+     */
+    protected String indexId = null;
+
+    /**
+     * The length value or attribute name (<=0 means no limit).
+     */
+    protected String length = null;
+
+    /**
+     * The name of the collection or owning bean.
+     */
+    protected String name = null;
+
+    /**
+     * The starting offset (zero relative).
+     */
+    protected String offset = null;
+
+    /**
+     * The property name containing the collection.
+     */
+    protected String property = null;
+
+    /**
+     * The scope of the bean specified by the name property, if any.
+     */
+    protected String scope = null;
+
+    /**
+     * The Java class of each exposed element of the collection.
+     */
+    protected String type = null;
+
     public Object getCollection() {
         return (this.collection);
     }
@@ -94,11 +134,6 @@
         this.collection = collection;
     }
 
-    /**
-     * The name of the scripting variable to be exposed.
-     */
-    protected String id = null;
-
     public String getId() {
         return (this.id);
     }
@@ -119,17 +154,13 @@
      * </p>
      */
     public int getIndex() {
-        if (started)
-            return (offsetValue + lengthCount - 1);
-        else
+        if (started) {
+            return ((offsetValue + lengthCount) - 1);
+        } else {
             return (0);
+        }
     }
 
-    /**
-     * The name of the scripting variable to be exposed as the current index.
-     */
-    protected String indexId = null;
-
     public String getIndexId() {
         return (this.indexId);
     }
@@ -138,11 +169,6 @@
         this.indexId = indexId;
     }
 
-    /**
-     * The length value or attribute name (<=0 means no limit).
-     */
-    protected String length = null;
-
     public String getLength() {
         return (this.length);
     }
@@ -151,11 +177,6 @@
         this.length = length;
     }
 
-    /**
-     * The name of the collection or owning bean.
-     */
-    protected String name = null;
-
     public String getName() {
         return (this.name);
     }
@@ -164,11 +185,6 @@
         this.name = name;
     }
 
-    /**
-     * The starting offset (zero relative).
-     */
-    protected String offset = null;
-
     public String getOffset() {
         return (this.offset);
     }
@@ -177,11 +193,6 @@
         this.offset = offset;
     }
 
-    /**
-     * The property name containing the collection.
-     */
-    protected String property = null;
-
     public String getProperty() {
         return (this.property);
     }
@@ -190,11 +201,6 @@
         this.property = property;
     }
 
-    /**
-     * The scope of the bean specified by the name property, if any.
-     */
-    protected String scope = null;
-
     public String getScope() {
         return (this.scope);
     }
@@ -203,11 +209,6 @@
         this.scope = scope;
     }
 
-    /**
-     * The Java class of each exposed element of the collection.
-     */
-    protected String type = null;
-
     public String getType() {
         return (this.type);
     }
@@ -219,21 +220,24 @@
     // --------------------------------------------------------- Public Methods
 
     /**
-     * Construct an iterator for the specified collection, and begin
-     * looping through the body once per element.
+     * Construct an iterator for the specified collection, and begin looping
+     * through the body once per element.
      *
-     * @exception JspException if a JSP exception has occurred
+     * @throws JspException if a JSP exception has occurred
      */
     public int doStartTag() throws JspException {
-
         // Acquire the collection we are going to iterate over
         Object collection = this.collection;
+
         if (collection == null) {
-            collection = TagUtils.getInstance().lookup(pageContext, name, property, scope);
+            collection =
+                TagUtils.getInstance().lookup(pageContext, name, property, scope);
         }
 
         if (collection == null) {
-            JspException e = new JspException(messages.getMessage("iterate.collection"));
+            JspException e =
+                new JspException(messages.getMessage("iterate.collection"));
+
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;
         }
@@ -248,9 +252,11 @@
                 // Rats -- it is an array of primitives
                 int length = Array.getLength(collection);
                 ArrayList c = new ArrayList(length);
+
                 for (int i = 0; i < length; i++) {
                     c.add(Array.get(collection, i));
                 }
+
                 iterator = c.iterator();
             }
         } else if (collection instanceof Collection) {
@@ -262,7 +268,9 @@
         } else if (collection instanceof Enumeration) {
             iterator = new IteratorAdapter((Enumeration) collection);
         } else {
-            JspException e = new JspException(messages.getMessage("iterate.iterator"));
+            JspException e =
+                new JspException(messages.getMessage("iterate.iterator"));
+
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;
         }
@@ -274,7 +282,10 @@
             try {
                 offsetValue = Integer.parseInt(offset);
             } catch (NumberFormatException e) {
-                Integer offsetObject = (Integer) TagUtils.getInstance().lookup(pageContext, offset, null);
+                Integer offsetObject =
+                    (Integer) TagUtils.getInstance().lookup(pageContext,
+                        offset, null);
+
                 if (offsetObject == null) {
                     offsetValue = 0;
                 } else {
@@ -282,6 +293,7 @@
                 }
             }
         }
+
         if (offsetValue < 0) {
             offsetValue = 0;
         }
@@ -293,7 +305,10 @@
             try {
                 lengthValue = Integer.parseInt(length);
             } catch (NumberFormatException e) {
-                Integer lengthObject = (Integer) TagUtils.getInstance().lookup(pageContext, length, null);
+                Integer lengthObject =
+                    (Integer) TagUtils.getInstance().lookup(pageContext,
+                        length, null);
+
                 if (lengthObject == null) {
                     lengthValue = 0;
                 } else {
@@ -301,9 +316,11 @@
                 }
             }
         }
+
         if (lengthValue < 0) {
             lengthValue = 0;
         }
+
         lengthCount = 0;
 
         // Skip the leading elements up to the starting offset
@@ -316,34 +333,37 @@
         // Store the first value and evaluate, or skip the body if none
         if (iterator.hasNext()) {
             Object element = iterator.next();
+
             if (element == null) {
                 pageContext.removeAttribute(id);
             } else {
                 pageContext.setAttribute(id, element);
             }
+
             lengthCount++;
             started = true;
+
             if (indexId != null) {
                 pageContext.setAttribute(indexId, new Integer(getIndex()));
             }
+
             return (EVAL_BODY_TAG);
         } else {
             return (SKIP_BODY);
         }
-
     }
 
     /**
-     * Make the next collection element available and loop, or
-     * finish the iterations if there are no more elements.
+     * Make the next collection element available and loop, or finish the
+     * iterations if there are no more elements.
      *
-     * @exception JspException if a JSP exception has occurred
+     * @throws JspException if a JSP exception has occurred
      */
     public int doAfterBody() throws JspException {
-
         // Render the output from this iteration to the output stream
         if (bodyContent != null) {
-            TagUtils.getInstance().writePrevious(pageContext, bodyContent.getString());
+            TagUtils.getInstance().writePrevious(pageContext,
+                bodyContent.getString());
             bodyContent.clearBody();
         }
 
@@ -354,43 +374,43 @@
 
         if (iterator.hasNext()) {
             Object element = iterator.next();
+
             if (element == null) {
                 pageContext.removeAttribute(id);
             } else {
                 pageContext.setAttribute(id, element);
             }
+
             lengthCount++;
+
             if (indexId != null) {
                 pageContext.setAttribute(indexId, new Integer(getIndex()));
             }
+
             return (EVAL_BODY_TAG);
         } else {
             return (SKIP_BODY);
         }
-
     }
 
     /**
      * Clean up after processing this enumeration.
      *
-     * @exception JspException if a JSP exception has occurred
+     * @throws JspException if a JSP exception has occurred
      */
     public int doEndTag() throws JspException {
-
         // Clean up our started state
         started = false;
         iterator = null;
 
         // Continue processing this page
         return (EVAL_PAGE);
-
     }
 
     /**
      * Release all allocated resources.
      */
     public void release() {
-
         super.release();
 
         iterator = null;
@@ -406,7 +426,5 @@
         property = null;
         scope = null;
         started = false;
-
     }
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/IterateTei.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/IterateTei.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/IterateTei.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/IterateTei.java Fri Feb 10 13:02:03 2006
@@ -1,14 +1,14 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,52 +22,57 @@
 import javax.servlet.jsp.tagext.VariableInfo;
 
 /**
- * Implementation of <code>TagExtraInfo</code> for the <b>iterate</b>
- * tag, identifying the scripting object(s) to be made visible.
+ * Implementation of <code>TagExtraInfo</code> for the <b>iterate</b> tag,
+ * identifying the scripting object(s) to be made visible.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
 public class IterateTei extends TagExtraInfo {
+    /**
+     * Return information about the scripting variables to be created.
+     */
+    public VariableInfo[] getVariableInfo(TagData data) {
+        // prime this array with the maximum potential variables.
+        // will be arraycopy'd out to the final array based on results.
+        VariableInfo[] variables = new VariableInfo[2];
+
+        // counter for matched results.
+        int counter = 0;
+
+        /* id : object of the current iteration */
+        String id = data.getAttributeString("id");
+        String type = data.getAttributeString("type");
+
+        if (id != null) {
+            if (type == null) {
+                type = "java.lang.Object";
+            }
+
+            variables[counter++] =
+                new VariableInfo(data.getAttributeString("id"), type, true,
+                    VariableInfo.NESTED);
+        }
+
+        /* indexId : number value of the current iteration */
+        String indexId = data.getAttributeString("indexId");
+
+        if (indexId != null) {
+            variables[counter++] =
+                new VariableInfo(indexId, "java.lang.Integer", true,
+                    VariableInfo.NESTED);
+        }
+
+        /* create returning array, and copy results */
+        VariableInfo[] result;
+
+        if (counter > 0) {
+            result = new VariableInfo[counter];
+            System.arraycopy(variables, 0, result, 0, counter);
+        } else {
+            result = new VariableInfo[0];
+        }
 
-  /**
-   * Return information about the scripting variables to be created.
-   */
-  public VariableInfo[] getVariableInfo(TagData data) {
-
-    // prime this array with the maximum potential variables.
-    // will be arraycopy'd out to the final array based on results.
-    VariableInfo[] variables = new VariableInfo[2];
-
-    // counter for matched results.
-    int counter = 0;
-
-    /* id : object of the current iteration */
-    String id = data.getAttributeString("id");
-    String type = data.getAttributeString("type");
-    if (id != null) {
-      if (type == null) {
-        type = "java.lang.Object";
-      }
-      variables[counter++] = new VariableInfo(data.getAttributeString("id"),
-                                              type, true,
-                                              VariableInfo.NESTED);
-    }
-
-    /* indexId : number value of the current iteration */
-    String indexId = data.getAttributeString("indexId");
-    if (indexId != null) {
-      variables[counter++] = new VariableInfo(indexId, "java.lang.Integer",
-                                              true, VariableInfo.NESTED);
-    }
-
-    /* create returning array, and copy results */
-    VariableInfo[] result;
-    if (counter > 0) {
-      result = new VariableInfo[counter];
-      System.arraycopy(variables, 0, result, 0, counter);
-    } else {
-      result = new VariableInfo[0];
+        return result;
     }
-    return result;
-  }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/LessEqualTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/LessEqualTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/LessEqualTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/LessEqualTag.java Fri Feb 10 13:02:03 2006
@@ -1,51 +1,42 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
-
 import javax.servlet.jsp.JspException;
 
-
 /**
- * Evaluate the nested body content of this tag if the specified variable
- * is less than or equal to the specified value.
+ * Evaluate the nested body content of this tag if the specified variable is
+ * less than or equal to the specified value.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
-
 public class LessEqualTag extends CompareTagBase {
-
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(-1, 0));
-
     }
-
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/LessThanTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/LessThanTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/LessThanTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/LessThanTag.java Fri Feb 10 13:02:03 2006
@@ -1,51 +1,42 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
-
 import javax.servlet.jsp.JspException;
 
-
 /**
- * Evaluate the nested body content of this tag if the specified variable
- * is less than the specified value.
+ * Evaluate the nested body content of this tag if the specified variable is
+ * less than the specified value.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
-
 public class LessThanTag extends CompareTagBase {
-
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(-1, -1));
-
     }
-
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MatchTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MatchTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MatchTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MatchTag.java Fri Feb 10 13:02:03 2006
@@ -1,50 +1,50 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
+import org.apache.struts.taglib.TagUtils;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
-import org.apache.struts.taglib.TagUtils;
-
 
 /**
- * Evalute the nested body content of this tag if the specified value
- * is a substring of the specified variable.
+ * Evalute the nested body content of this tag if the specified value is a
+ * substring of the specified variable.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
-
 public class MatchTag extends ConditionalTagBase {
-
-
     // ------------------------------------------------------------- Properties
 
-
     /**
      * The location where the match must exist (<code>start</code> or
      * <code>end</code>), or <code>null</code> for anywhere.
      */
     protected String location = null;
 
+    /**
+     * The value to which the variable specified by other attributes of this
+     * tag will be matched.
+     */
+    protected String value = null;
+
     public String getLocation() {
         return (this.location);
     }
@@ -53,13 +53,6 @@
         this.location = location;
     }
 
-
-    /**
-     * The value to which the variable specified by other attributes of this
-     * tag will be matched.
-     */
-    protected String value = null;
-
     public String getValue() {
         return (this.value);
     }
@@ -68,92 +61,92 @@
         this.value = value;
     }
 
-
     // --------------------------------------------------------- Public Methods
 
-
     /**
      * Release all allocated resources.
      */
     public void release() {
-
         super.release();
         location = null;
         value = null;
-
     }
 
-
     // ------------------------------------------------------ Protected Methods
 
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(true));
-
     }
 
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
      * @param desired Desired value for a true result
-     *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition(boolean desired) throws JspException {
-
+    protected boolean condition(boolean desired)
+        throws JspException {
         // Acquire the specified variable
         String variable = null;
+
         if (cookie != null) {
-            Cookie cookies[] =
-                ((HttpServletRequest) pageContext.getRequest()).
-                getCookies();
-            if (cookies == null)
+            Cookie[] cookies =
+                ((HttpServletRequest) pageContext.getRequest()).getCookies();
+
+            if (cookies == null) {
                 cookies = new Cookie[0];
+            }
+
             for (int i = 0; i < cookies.length; i++) {
                 if (cookie.equals(cookies[i].getName())) {
                     variable = cookies[i].getValue();
+
                     break;
                 }
             }
         } else if (header != null) {
             variable =
-                ((HttpServletRequest) pageContext.getRequest()).
-                getHeader(header);
+                ((HttpServletRequest) pageContext.getRequest()).getHeader(header);
         } else if (name != null) {
             Object value =
                 TagUtils.getInstance().lookup(pageContext, name, property, scope);
-            if (value != null)
+
+            if (value != null) {
                 variable = value.toString();
+            }
         } else if (parameter != null) {
             variable = pageContext.getRequest().getParameter(parameter);
         } else {
-            JspException e = new JspException
-                (messages.getMessage("logic.selector"));
+            JspException e =
+                new JspException(messages.getMessage("logic.selector"));
+
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;
         }
+
         if (variable == null) {
-            JspException e = new JspException
-                (messages.getMessage("logic.variable", value));
+            JspException e =
+                new JspException(messages.getMessage("logic.variable", value));
+
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;
         }
 
         // Perform the comparison requested by the location attribute
         boolean matched = false;
+
         if (location == null) {
             matched = (variable.indexOf(value) >= 0);
         } else if (location.equals("start")) {
@@ -161,16 +154,14 @@
         } else if (location.equals("end")) {
             matched = variable.endsWith(value);
         } else {
-            JspException e = new JspException
-                (messages.getMessage("logic.location", location));
+            JspException e =
+                new JspException(messages.getMessage("logic.location", location));
+
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;
         }
 
         // Return the final result
         return (matched == desired);
-
     }
-
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MessagesNotPresentTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MessagesNotPresentTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MessagesNotPresentTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MessagesNotPresentTag.java Fri Feb 10 13:02:03 2006
@@ -1,55 +1,45 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
-
 import javax.servlet.jsp.JspException;
 
-
 /**
- * Evalute the nested body content of this tag if the specified value
- * is not present for this request.
+ * Evalute the nested body content of this tag if the specified value is not
+ * present for this request.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
  */
-
 public class MessagesNotPresentTag extends MessagesPresentTag {
-
-
     // ------------------------------------------------------ Protected Methods
 
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(false));
-
     }
-
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MessagesPresentTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MessagesPresentTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MessagesPresentTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/MessagesPresentTag.java Fri Feb 10 13:02:03 2006
@@ -1,49 +1,47 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.struts.taglib.logic;
 
-import java.util.Iterator;
-
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.Globals;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.taglib.TagUtils;
 
+import javax.servlet.jsp.JspException;
+
+import java.util.Iterator;
+
 /**
  * Evalute to <code>true</code> if an <code>ActionMessages</code> class or a
  * class that can be converted to an <code>ActionMessages</code> class is in
- * request scope under the specified key and there is at least one message in the
- * class or for the property specified.
+ * request scope under the specified key and there is at least one message in
+ * the class or for the property specified.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2005-11-19 12:36:20 -0500 (Sat, 19 Nov 2005)
+ *          $
  * @since Struts 1.1
  */
 public class MessagesPresentTag extends ConditionalTagBase {
-
     /**
-     * If this is set to 'true', then the <code>Globals.MESSAGE_KEY</code> will
-     * be used to retrieve the messages from scope.
-    */
+     * If this is set to 'true', then the <code>Globals.MESSAGE_KEY</code>
+     * will be used to retrieve the messages from scope.
+     */
     protected String message = null;
 
-
     public MessagesPresentTag() {
         name = Globals.ERROR_KEY;
     }
@@ -57,39 +55,37 @@
     }
 
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(true));
-
     }
 
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if there is at least one message in the
-     * class or for the property specified.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if there is at least one message in the class
+     * or for the property specified.
      *
      * @param desired Desired outcome for a true result
-     *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition(boolean desired) throws JspException {
+    protected boolean condition(boolean desired)
+        throws JspException {
         ActionMessages am = null;
 
         String key = name;
-        if (message != null && "true".equalsIgnoreCase(message)){
-           key = Globals.MESSAGE_KEY;
+
+        if ((message != null) && "true".equalsIgnoreCase(message)) {
+            key = Globals.MESSAGE_KEY;
         }
 
         try {
             am = TagUtils.getInstance().getActionMessages(pageContext, key);
-            
         } catch (JspException e) {
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;
@@ -98,7 +94,6 @@
         Iterator iterator = (property == null) ? am.get() : am.get(property);
 
         return (iterator.hasNext() == desired);
-
     }
 
     /**
@@ -109,5 +104,4 @@
         name = Globals.ERROR_KEY;
         message = null;
     }
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotEmptyTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotEmptyTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotEmptyTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotEmptyTag.java Fri Feb 10 13:02:03 2006
@@ -1,55 +1,45 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
-
 import javax.servlet.jsp.JspException;
 
-
 /**
- * Evalute the nested body content of this tag if the specified value
- * is not empty for this request.
+ * Evalute the nested body content of this tag if the specified value is not
+ * empty for this request.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
  */
-
 public class NotEmptyTag extends EmptyTag {
-
-
     // ------------------------------------------------------ Protected Methods
 
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(false));
-
     }
-
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotEqualTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotEqualTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotEqualTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotEqualTag.java Fri Feb 10 13:02:03 2006
@@ -1,51 +1,42 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
-
 import javax.servlet.jsp.JspException;
 
-
 /**
- * Evaluate the nested body content of this tag if the specified variable
- * and value are not equal.
+ * Evaluate the nested body content of this tag if the specified variable and
+ * value are not equal.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
-
 public class NotEqualTag extends CompareTagBase {
-
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(-1, +1));
-
     }
-
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotMatchTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotMatchTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotMatchTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotMatchTag.java Fri Feb 10 13:02:03 2006
@@ -1,54 +1,44 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
-
 import javax.servlet.jsp.JspException;
 
-
 /**
- * Evalute the nested body content of this tag if the specified value
- * is not a substring of the specified variable.
+ * Evalute the nested body content of this tag if the specified value is not a
+ * substring of the specified variable.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
-
 public class NotMatchTag extends MatchTag {
-
-
     // ------------------------------------------------------ Protected Methods
 
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(false));
-
     }
-
-
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotPresentTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotPresentTag.java?rev=376842&r1=376841&r2=376842&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotPresentTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/logic/NotPresentTag.java Fri Feb 10 13:02:03 2006
@@ -1,54 +1,44 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.taglib.logic;
 
-
 import javax.servlet.jsp.JspException;
 
-
 /**
- * Evalute the nested body content of this tag if the specified value
- * is not present for this request.
+ * Evalute the nested body content of this tag if the specified value is not
+ * present for this request.
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  */
-
 public class NotPresentTag extends PresentTag {
-
-
     // ------------------------------------------------------ Protected Methods
 
-
     /**
-     * Evaluate the condition that is being tested by this particular tag,
-     * and return <code>true</code> if the nested body content of this tag
-     * should be evaluated, or <code>false</code> if it should be skipped.
-     * This method must be implemented by concrete subclasses.
+     * Evaluate the condition that is being tested by this particular tag, and
+     * return <code>true</code> if the nested body content of this tag should
+     * be evaluated, or <code>false</code> if it should be skipped. This
+     * method must be implemented by concrete subclasses.
      *
-     * @exception JspException if a JSP exception occurs
+     * @throws JspException if a JSP exception occurs
      */
-    protected boolean condition() throws JspException {
-
+    protected boolean condition()
+        throws JspException {
         return (condition(false));
-
     }
-
-
 }



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


Mime
View raw message