svn commit: r376843 [3/4] - in /struts/taglib/trunk/src/java/org/apache/struts/taglib/nested: ./ bean/ html/ logic/

[hu...@apache.org]

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/NestedTextTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/NestedTextTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/NestedTextTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/NestedTextTag.java Fri Feb 10 13:02:56 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.
@@ -17,69 +17,76 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.html.TextTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedTextTag.
+ *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedTextTag extends TextTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/NestedTextareaTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/NestedTextareaTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/NestedTextareaTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/NestedTextareaTag.java Fri Feb 10 13:02:56 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.
@@ -17,69 +17,76 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.html.TextareaTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedTextareaTag.
+ *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedTextareaTag extends TextareaTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/package.html
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/package.html?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/package.html (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/html/package.html Fri Feb 10 13:02:56 2006
@@ -1,18 +1,20 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <title>Package Documentation for org.apache.struts.taglib.nested.html Package</title>
-   
+    <title>Package Documentation for org.apache.struts.taglib.nested.html
+        Package</title>
+
 </head>
-  <body bgcolor="white">
- The nested html tags extend the <code>org.apache.struts.taglib.html</code>
- tags to allow   them to relate to each other in a nested nature. The fundamental
-logic of   the html tags don't change, except in that all references to beans
-and  bean properties will be managed in a nested context. <br>
+
+<body bgcolor="white">
+The nested html tags extend the <code>org.apache.struts.taglib.html</code>
+tags to allow them to relate to each other in a nested nature. The fundamental
+logic of the html tags don't change, except in that all references to beans
+and bean properties will be managed in a nested context. <br>
 <br>
 <img src="doc-files/nested-html.gif" alt="Nested html taglib">
 <br>
-<br /="">
+<br/="">
 <br>
 <br>
 </body>

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java Fri Feb 10 13:02:56 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.
@@ -17,70 +17,76 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.EmptyTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedEmptyTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedEmptyTag extends EmptyTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedEqualTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedEqualTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedEqualTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedEqualTag.java Fri Feb 10 13:02:56 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.
@@ -17,70 +17,76 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.EqualTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedEqualTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedEqualTag extends EqualTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java Fri Feb 10 13:02:56 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.
@@ -17,70 +17,77 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.GreaterEqualTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedGreaterEqualTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
-public class NestedGreaterEqualTag extends GreaterEqualTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+public class NestedGreaterEqualTag extends GreaterEqualTag
+    implements NestedNameSupport {
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java Fri Feb 10 13:02:56 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.
@@ -17,70 +17,77 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.GreaterThanTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedGreaterThanTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
-public class NestedGreaterThanTag extends GreaterThanTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+public class NestedGreaterThanTag extends GreaterThanTag
+    implements NestedNameSupport {
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedIterateTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedIterateTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedIterateTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedIterateTag.java Fri Feb 10 13:02:56 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.
@@ -17,149 +17,165 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import java.util.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.IterateTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
+import java.util.Map;
+
 /**
- * NestedIterateTag.
- * Slightly more complex that the other extensions. This one has to yield a
- * proper index property. Very taxing.
+ * NestedIterateTag. Slightly more complex that the other extensions. This one
+ * has to yield a proper index property. Very taxing.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedIterateTag extends IterateTag implements NestedNameSupport {
+    // The current nesting
+    private String nesting = null;
+
+    // original tag properties
+    private String originalName = null;
+    private String originalProperty = null;
+
+    // original nesting environment
+    private String originalNesting = null;
+    private String originalNestingName = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // original values
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // set the ID to make the super tag happy
+        if ((id == null) || (id.trim().length() == 0)) {
+            id = property;
+        }
+
+        // the request object
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // original nesting details
+        originalNesting = NestedPropertyHelper.getCurrentProperty(request);
+        originalNestingName =
+            NestedPropertyHelper.getCurrentName(request, this);
+
+        // set the bean if it's been provided
+        // (the bean that's been provided! get it!?... nevermind)
+        if (getName() == null) {
+            // the qualified nesting value
+            nesting =
+                NestedPropertyHelper.getAdjustedProperty(request, getProperty());
+        } else {
+            // it's just the property
+            nesting = getProperty();
+        }
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // get the original result
+        int temp = super.doStartTag();
+
+        // set the new reference (including the index etc)
+        NestedPropertyHelper.setName(request, getName());
+        NestedPropertyHelper.setProperty(request, deriveNestedProperty());
 
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // original values
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // set the ID to make the super tag happy
-    if (id == null || id.trim().length() == 0) { id = property; }
-
-    // the request object
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-
-    // original nesting details
-    originalNesting = NestedPropertyHelper.getCurrentProperty(request);
-    originalNestingName = NestedPropertyHelper.getCurrentName(request, this);
-
-    // set the bean if it's been provided
-    // (the bean that's been provided! get it!?... nevermind)
-    if (getName() == null) {
-      // the qualified nesting value
-      nesting = NestedPropertyHelper.getAdjustedProperty(request, getProperty());
-    } else {
-      // it's just the property
-      nesting = getProperty();
+        // return the result
+        return temp;
     }
 
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
+    /**
+     * The only added property to the class. For use in proper nesting.
+     *
+     * @return String value of the property and the current index or mapping.
+     */
+    private String deriveNestedProperty() {
+        Object idObj = pageContext.getAttribute(id);
+
+        if (idObj instanceof Map.Entry) {
+            return nesting + "(" + ((Map.Entry) idObj).getKey() + ")";
+        } else {
+            return nesting + "[" + this.getIndex() + "]";
+        }
+    }
 
-    // get the original result
-    int temp = super.doStartTag();
+    /**
+     * This is only overriden as the include reference will need it's index
+     * updated.
+     *
+     * @return int JSP continuation directive.
+     */
+    public int doAfterBody() throws JspException {
+        // store original result
+        int temp = super.doAfterBody();
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        if (temp != SKIP_BODY) {
+            // set the new reference
+            NestedPropertyHelper.setProperty(request, deriveNestedProperty());
+        }
 
-    // set the new reference (including the index etc)
-    NestedPropertyHelper.setName(request, getName());
-    NestedPropertyHelper.setProperty(request, deriveNestedProperty());
-
-    // return the result
-    return temp;
-  }
-
-  /**
-   * The only added property to the class. For use in proper nesting.
-   * @return String value of the property and the current index or mapping.
-   */
-  private String deriveNestedProperty() {
-    Object idObj = pageContext.getAttribute(id);
-    if (idObj instanceof Map.Entry) {
-      return nesting + "("+ ((Map.Entry)idObj).getKey() +")";
-    } else {
-      return nesting + "["+ this.getIndex() +"]";
+        // return super result
+        return temp;
     }
-  }
 
-  /**
-   * This is only overriden as the include reference will need it's index
-   * updated.
-   *
-   * @return int JSP continuation directive.
-   */
-  public int doAfterBody() throws JspException {
-    // store original result
-    int temp = super.doAfterBody();
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    if (temp != SKIP_BODY) {
-      // set the new reference
-      NestedPropertyHelper.setProperty(request, deriveNestedProperty());
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // the super's thing
+        int i = super.doEndTag();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // reset the original tag values
+        super.setName(originalName);
+        super.setProperty(originalProperty);
+
+        // reset the original nesting values
+        if (originalNesting == null) {
+            NestedPropertyHelper.deleteReference(request);
+        } else {
+            NestedPropertyHelper.setProperty(request, originalNesting);
+            NestedPropertyHelper.setName(request, originalNestingName);
+        }
+
+        // job done
+        return i;
     }
-    // return super result
-    return temp;
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // the super's thing
-    int i = super.doEndTag();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // reset the original tag values
-    super.setName(originalName);
-    super.setProperty(originalProperty);
-
-    // reset the original nesting values
-    if (originalNesting == null) {
-      NestedPropertyHelper.deleteReference(request);
-    } else {
-      NestedPropertyHelper.setProperty(request, originalNesting);
-      NestedPropertyHelper.setName(request, originalNestingName);
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        // let the super release
+        super.release();
+
+        // reset the original value place holders
+        originalName = null;
+        originalProperty = null;
+        originalNesting = null;
+        originalNestingName = null;
     }
-    // job done
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    // let the super release
-    super.release();
-    // reset the original value place holders
-    originalName = null;
-    originalProperty = null;
-    originalNesting = null;
-    originalNestingName = null;
-  }
-
-
-  // The current nesting
-  private String nesting = null;
-
-  // original tag properties
-  private String originalName = null;
-  private String originalProperty = null;
-
-  // original nesting environment
-  private String originalNesting = null;
-  private String originalNestingName = null;
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedIterateTei.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedIterateTei.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedIterateTei.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedIterateTei.java Fri Feb 10 13:02:56 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.
@@ -17,35 +17,31 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
+import org.apache.struts.taglib.logic.IterateTei;
+
 import javax.servlet.jsp.tagext.TagData;
 import javax.servlet.jsp.tagext.VariableInfo;
 
-import org.apache.struts.taglib.logic.IterateTei;
-
 /**
- * NestedIterateTei
- * Extending the original tag's tei class, so that we can make the "id"
- * attribute optional, so that those who want to script can add it if they need
- * it otherwise we can maintain the nice lean tag markup.
- *
- *  TODO - Look at deleting this class. Potentially a pointless existance now
- *         that the super class is towing the line. Left alone because it's not
- *         hurting anything as-is.
- *         Note: When done, it requires pointing the tei reference in the
- *               struts-nested.tld to org.apache.struts.taglib.logic.IterateTei
+ * NestedIterateTei Extending the original tag's tei class, so that we can
+ * make the "id" attribute optional, so that those who want to script can add
+ * it if they need it otherwise we can maintain the nice lean tag markup.
  *
+ * TODO - Look at deleting this class. Potentially a pointless existance now
+ * that the super class is towing the line. Left alone because it's not
+ * hurting anything as-is. Note: When done, it requires pointing the tei
+ * reference in the struts-nested.tld to org.apache.struts.taglib.logic.IterateTei
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
-
 public class NestedIterateTei extends IterateTei {
-
-  /**
-   * Return information about the scripting variables to be created.
-   */
-  public VariableInfo[] getVariableInfo(TagData data) {
-    /* It just lets the result through. */
-    return super.getVariableInfo(data);
-  }
+    /**
+     * Return information about the scripting variables to be created.
+     */
+    public VariableInfo[] getVariableInfo(TagData data) {
+        /* It just lets the result through. */
+        return super.getVariableInfo(data);
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedLessEqualTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedLessEqualTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedLessEqualTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedLessEqualTag.java Fri Feb 10 13:02:56 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.
@@ -17,70 +17,77 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.LessEqualTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedLessEqualTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
-public class NestedLessEqualTag extends LessEqualTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+public class NestedLessEqualTag extends LessEqualTag
+    implements NestedNameSupport {
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedLessThanTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedLessThanTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedLessThanTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedLessThanTag.java Fri Feb 10 13:02:56 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.
@@ -17,70 +17,76 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.LessThanTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedLessThanTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedLessThanTag extends LessThanTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMatchTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMatchTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMatchTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMatchTag.java Fri Feb 10 13:02:56 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.
@@ -17,70 +17,76 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.MatchTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedMatchTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedMatchTag extends MatchTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMessagesNotPresentTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMessagesNotPresentTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMessagesNotPresentTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMessagesNotPresentTag.java Fri Feb 10 13:02:56 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.
@@ -17,71 +17,77 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.MessagesNotPresentTag;
-import org.apache.struts.taglib.nested.NestedPropertySupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
+import org.apache.struts.taglib.nested.NestedPropertySupport;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
 
 /**
  * NestedMessagesNotPresentTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedMessagesNotPresentTag extends MessagesNotPresentTag
-                                                  implements NestedPropertySupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+    implements NestedPropertySupport {
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMessagesPresentTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMessagesPresentTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMessagesPresentTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedMessagesPresentTag.java Fri Feb 10 13:02:56 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.
@@ -17,71 +17,77 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.MessagesPresentTag;
-import org.apache.struts.taglib.nested.NestedPropertySupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
+import org.apache.struts.taglib.nested.NestedPropertySupport;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
 
 /**
  * NestedMessagesPresentTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedMessagesPresentTag extends MessagesPresentTag
-                                                  implements NestedPropertySupport  {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+    implements NestedPropertySupport {
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotEmptyTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotEmptyTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotEmptyTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotEmptyTag.java Fri Feb 10 13:02:56 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.
@@ -17,70 +17,76 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.NotEmptyTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedNotEmptyTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedNotEmptyTag extends NotEmptyTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotEqualTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotEqualTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotEqualTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotEqualTag.java Fri Feb 10 13:02:56 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.
@@ -17,70 +17,76 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.NotEqualTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedNotEqualTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedNotEqualTag extends NotEqualTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }

Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotMatchTag.java
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotMatchTag.java?rev=376843&r1=376842&r2=376843&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotMatchTag.java (original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/nested/logic/NestedNotMatchTag.java Fri Feb 10 13:02:56 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.
@@ -17,70 +17,76 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
 import org.apache.struts.taglib.logic.NotMatchTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
 /**
  * NestedNotMatchTag.
  *
+ * @version $Rev$ $Date: 2004-10-16 12:38:42 -0400 (Sat, 16 Oct 2004)
+ *          $
  * @since Struts 1.1
- * @version $Rev$ $Date$
  */
 public class NestedNotMatchTag extends NotMatchTag implements NestedNameSupport {
-
-  /**
-   * Overriding method of the heart of the matter. Gets the relative property
-   * and leaves the rest up to the original tag implementation. Sweet.
-   * @return int JSP continuation directive.
-   *             This is in the hands of the super class.
-   */
-  public int doStartTag() throws JspException {
-    // get the original properties
-    originalName = getName();
-    originalProperty = getProperty();
-
-    // request
-    HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
-    // set the properties
-    NestedPropertyHelper.setNestedProperties(request, this);
-
-    // let the super do it's thing
-    return super.doStartTag();
-  }
-
-  /**
-   * Complete the processing of the tag. The nested tags here will restore
-   * all the original value for the tag itself and the nesting context.
-   * @return int to describe the next step for the JSP processor
-   * @throws JspException for the bad things JSP's do
-   */
-  public int doEndTag() throws JspException {
-    // do the super's ending part
-    int i = super.doEndTag();
-
-    // reset the properties
-    setName(originalName);
-    setProperty(originalProperty);
-
-    // continue
-    return i;
-  }
-
-  /**
-   * Release the tag's resources and reset the values.
-   */
-  public void release() {
-    super.release();
-    // reset the originals
-    originalName = null;
-    originalProperty = null;
-  }
-
-  /* the usual private member variables */
-  private String originalName = null;
-  private String originalProperty = null;
+    /* the usual private member variables */
+    private String originalName = null;
+    private String originalProperty = null;
+
+    /**
+     * Overriding method of the heart of the matter. Gets the relative
+     * property and leaves the rest up to the original tag implementation.
+     * Sweet.
+     *
+     * @return int JSP continuation directive. This is in the hands of the
+     *         super class.
+     */
+    public int doStartTag() throws JspException {
+        // get the original properties
+        originalName = getName();
+        originalProperty = getProperty();
+
+        // request
+        HttpServletRequest request =
+            (HttpServletRequest) pageContext.getRequest();
+
+        // set the properties
+        NestedPropertyHelper.setNestedProperties(request, this);
+
+        // let the super do it's thing
+        return super.doStartTag();
+    }
+
+    /**
+     * Complete the processing of the tag. The nested tags here will restore
+     * all the original value for the tag itself and the nesting context.
+     *
+     * @return int to describe the next step for the JSP processor
+     * @throws JspException for the bad things JSP's do
+     */
+    public int doEndTag() throws JspException {
+        // do the super's ending part
+        int i = super.doEndTag();
+
+        // reset the properties
+        setName(originalName);
+        setProperty(originalProperty);
+
+        // continue
+        return i;
+    }
+
+    /**
+     * Release the tag's resources and reset the values.
+     */
+    public void release() {
+        super.release();
+
+        // reset the originals
+        originalName = null;
+        originalProperty = null;
+    }
 }



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