You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/02/10 19:09:02 UTC

svn commit: r376779 [14/18] - /struts/el/trunk/src/java/org/apache/strutsel/taglib/html/

Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELResetTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELResetTag.java?rev=376779&r1=376778&r2=376779&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELResetTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELResetTag.java Fri Feb 10 10:08:58 2006
@@ -1,438 +1,613 @@
 /*
- * $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.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.ResetTag;
-import javax.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
+import javax.servlet.jsp.JspException;
+
 /**
- * Tag for input fields of type "reset".
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.html.ResetTag</code> which provides most of
- * the described functionality.  This subclass allows all attribute values to
- * be specified as expressions utilizing the JavaServer Pages Standard Library
- * expression language.
+ * Tag for input fields of type "reset". <p> This class is a subclass of the
+ * class <code>org.apache.struts.taglib.html.ResetTag</code> which provides
+ * most of the described functionality.  This subclass allows all attribute
+ * values to be specified as expressions utilizing the JavaServer Pages
+ * Standard Library expression language.
  *
  * @version $Rev$
  */
 public class ELResetTag extends ResetTag {
-
     /**
-     * Instance variable mapped to "accessKey" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "accessKey" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String accessKeyExpr;
+
     /**
-     * Instance variable mapped to "alt" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "alt" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String altExpr;
+
     /**
-     * Instance variable mapped to "altKey" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "altKey" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String altKeyExpr;
+
     /**
-     * Instance variable mapped to "bundle" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "bundle" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String bundleExpr;
+
     /**
-     * Instance variable mapped to "disabled" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "disabled" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String disabledExpr;
+
     /**
-     * Instance variable mapped to "onblur" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onblur" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String onblurExpr;
+
     /**
-     * Instance variable mapped to "onchange" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onchange" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String onchangeExpr;
+
     /**
-     * Instance variable mapped to "onclick" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onclick" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String onclickExpr;
+
     /**
-     * Instance variable mapped to "ondblclick" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "ondblclick" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String ondblclickExpr;
+
     /**
-     * Instance variable mapped to "onfocus" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onfocus" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String onfocusExpr;
+
     /**
-     * Instance variable mapped to "onkeydown" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onkeydown" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String onkeydownExpr;
+
     /**
-     * Instance variable mapped to "onkeypress" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onkeypress" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String onkeypressExpr;
+
     /**
-     * Instance variable mapped to "onkeyup" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onkeyup" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String onkeyupExpr;
+
     /**
-     * Instance variable mapped to "onmousedown" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onmousedown" tag attribute. (Mapping set
+     * in associated BeanInfo class.)
      */
     private String onmousedownExpr;
+
     /**
-     * Instance variable mapped to "onmousemove" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onmousemove" tag attribute. (Mapping set
+     * in associated BeanInfo class.)
      */
     private String onmousemoveExpr;
+
     /**
-     * Instance variable mapped to "onmouseout" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onmouseout" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String onmouseoutExpr;
+
     /**
-     * Instance variable mapped to "onmouseover" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onmouseover" tag attribute. (Mapping set
+     * in associated BeanInfo class.)
      */
     private String onmouseoverExpr;
+
     /**
-     * Instance variable mapped to "onmouseup" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onmouseup" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String onmouseupExpr;
+
     /**
-     * Instance variable mapped to "property" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "property" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String propertyExpr;
+
     /**
-     * Instance variable mapped to "style" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "style" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String styleExpr;
+
     /**
-     * Instance variable mapped to "styleClass" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "styleClass" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String styleClassExpr;
+
     /**
-     * Instance variable mapped to "styleId" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "styleId" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String styleIdExpr;
+
     /**
-     * Instance variable mapped to "tabindex" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "tabindex" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String tabindexExpr;
+
     /**
-     * Instance variable mapped to "title" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "title" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String titleExpr;
+
     /**
-     * Instance variable mapped to "titleKey" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "titleKey" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String titleKeyExpr;
+
     /**
-     * Instance variable mapped to "value" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "value" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String valueExpr;
 
     /**
-     * Getter method for "accessKey" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "accessKey" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getAccesskeyExpr() { return (accessKeyExpr); }
+    public String getAccesskeyExpr() {
+        return (accessKeyExpr);
+    }
+
     /**
-     * Getter method for "alt" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "alt" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getAltExpr() { return (altExpr); }
+    public String getAltExpr() {
+        return (altExpr);
+    }
+
     /**
-     * Getter method for "altKey" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "altKey" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getAltKeyExpr() { return (altKeyExpr); }
+    public String getAltKeyExpr() {
+        return (altKeyExpr);
+    }
+
     /**
-     * Getter method for "bundle" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "bundle" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getBundleExpr() { return (bundleExpr); }
+    public String getBundleExpr() {
+        return (bundleExpr);
+    }
+
     /**
-     * Getter method for "disabled" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "disabled" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getDisabledExpr() { return (disabledExpr); }
+    public String getDisabledExpr() {
+        return (disabledExpr);
+    }
+
     /**
-     * Getter method for "onblur" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onblur" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getOnblurExpr() { return (onblurExpr); }
+    public String getOnblurExpr() {
+        return (onblurExpr);
+    }
+
     /**
-     * Getter method for "onchange" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onchange" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getOnchangeExpr() { return (onchangeExpr); }
+    public String getOnchangeExpr() {
+        return (onchangeExpr);
+    }
+
     /**
-     * Getter method for "onclick" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onclick" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getOnclickExpr() { return (onclickExpr); }
+    public String getOnclickExpr() {
+        return (onclickExpr);
+    }
+
     /**
-     * Getter method for "ondblclick" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "ondblclick" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getOndblclickExpr() { return (ondblclickExpr); }
+    public String getOndblclickExpr() {
+        return (ondblclickExpr);
+    }
+
     /**
-     * Getter method for "onfocus" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onfocus" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getOnfocusExpr() { return (onfocusExpr); }
+    public String getOnfocusExpr() {
+        return (onfocusExpr);
+    }
+
     /**
-     * Getter method for "onkeydown" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onkeydown" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getOnkeydownExpr() { return (onkeydownExpr); }
+    public String getOnkeydownExpr() {
+        return (onkeydownExpr);
+    }
+
     /**
-     * Getter method for "onkeypress" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onkeypress" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getOnkeypressExpr() { return (onkeypressExpr); }
+    public String getOnkeypressExpr() {
+        return (onkeypressExpr);
+    }
+
     /**
-     * Getter method for "onkeyup" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onkeyup" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getOnkeyupExpr() { return (onkeyupExpr); }
+    public String getOnkeyupExpr() {
+        return (onkeyupExpr);
+    }
+
     /**
-     * Getter method for "onmousedown" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onmousedown" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getOnmousedownExpr() { return (onmousedownExpr); }
+    public String getOnmousedownExpr() {
+        return (onmousedownExpr);
+    }
+
     /**
-     * Getter method for "onmousemove" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onmousemove" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getOnmousemoveExpr() { return (onmousemoveExpr); }
+    public String getOnmousemoveExpr() {
+        return (onmousemoveExpr);
+    }
+
     /**
-     * Getter method for "onmouseout" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onmouseout" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getOnmouseoutExpr() { return (onmouseoutExpr); }
+    public String getOnmouseoutExpr() {
+        return (onmouseoutExpr);
+    }
+
     /**
-     * Getter method for "onmouseover" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onmouseover" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getOnmouseoverExpr() { return (onmouseoverExpr); }
+    public String getOnmouseoverExpr() {
+        return (onmouseoverExpr);
+    }
+
     /**
-     * Getter method for "onmouseup" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onmouseup" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getOnmouseupExpr() { return (onmouseupExpr); }
+    public String getOnmouseupExpr() {
+        return (onmouseupExpr);
+    }
+
     /**
-     * Getter method for "property" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "property" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getPropertyExpr() { return (propertyExpr); }
+    public String getPropertyExpr() {
+        return (propertyExpr);
+    }
+
     /**
-     * Getter method for "style" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "style" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getStyleExpr() { return (styleExpr); }
+    public String getStyleExpr() {
+        return (styleExpr);
+    }
+
     /**
-     * Getter method for "styleClass" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "styleClass" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getStyleClassExpr() { return (styleClassExpr); }
+    public String getStyleClassExpr() {
+        return (styleClassExpr);
+    }
+
     /**
-     * Getter method for "styleId" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "styleId" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getStyleIdExpr() { return (styleIdExpr); }
+    public String getStyleIdExpr() {
+        return (styleIdExpr);
+    }
+
     /**
-     * Getter method for "tabindex" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "tabindex" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getTabindexExpr() { return (tabindexExpr); }
+    public String getTabindexExpr() {
+        return (tabindexExpr);
+    }
+
     /**
-     * Getter method for "title" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "title" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getTitleExpr() { return (titleExpr); }
+    public String getTitleExpr() {
+        return (titleExpr);
+    }
+
     /**
-     * Getter method for "titleKey" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "titleKey" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getTitleKeyExpr() { return (titleKeyExpr); }
+    public String getTitleKeyExpr() {
+        return (titleKeyExpr);
+    }
+
     /**
-     * Getter method for "value" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "value" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getValueExpr() { return (valueExpr); }
+    public String getValueExpr() {
+        return (valueExpr);
+    }
 
     /**
-     * Setter method for "accessKey" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "accessKey" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setAccesskeyExpr(String accessKeyExpr) { this.accessKeyExpr = accessKeyExpr; }
+    public void setAccesskeyExpr(String accessKeyExpr) {
+        this.accessKeyExpr = accessKeyExpr;
+    }
+
     /**
-     * Setter method for "alt" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "alt" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setAltExpr(String altExpr) { this.altExpr = altExpr; }
+    public void setAltExpr(String altExpr) {
+        this.altExpr = altExpr;
+    }
+
     /**
-     * Setter method for "altKey" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "altKey" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setAltKeyExpr(String altKeyExpr) { this.altKeyExpr = altKeyExpr; }
+    public void setAltKeyExpr(String altKeyExpr) {
+        this.altKeyExpr = altKeyExpr;
+    }
+
     /**
-     * Setter method for "bundle" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "bundle" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setBundleExpr(String bundleExpr) { this.bundleExpr = bundleExpr; }
+    public void setBundleExpr(String bundleExpr) {
+        this.bundleExpr = bundleExpr;
+    }
+
     /**
-     * Setter method for "disabled" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "disabled" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setDisabledExpr(String disabledExpr) { this.disabledExpr = disabledExpr; }
+    public void setDisabledExpr(String disabledExpr) {
+        this.disabledExpr = disabledExpr;
+    }
+
     /**
-     * Setter method for "onblur" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onblur" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setOnblurExpr(String onblurExpr) { this.onblurExpr = onblurExpr; }
+    public void setOnblurExpr(String onblurExpr) {
+        this.onblurExpr = onblurExpr;
+    }
+
     /**
-     * Setter method for "onchange" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onchange" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setOnchangeExpr(String onchangeExpr) { this.onchangeExpr = onchangeExpr; }
+    public void setOnchangeExpr(String onchangeExpr) {
+        this.onchangeExpr = onchangeExpr;
+    }
+
     /**
-     * Setter method for "onclick" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onclick" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setOnclickExpr(String onclickExpr) { this.onclickExpr = onclickExpr; }
+    public void setOnclickExpr(String onclickExpr) {
+        this.onclickExpr = onclickExpr;
+    }
+
     /**
-     * Setter method for "ondblclick" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "ondblclick" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setOndblclickExpr(String ondblclickExpr) { this.ondblclickExpr = ondblclickExpr; }
+    public void setOndblclickExpr(String ondblclickExpr) {
+        this.ondblclickExpr = ondblclickExpr;
+    }
+
     /**
-     * Setter method for "onfocus" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onfocus" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setOnfocusExpr(String onfocusExpr) { this.onfocusExpr = onfocusExpr; }
+    public void setOnfocusExpr(String onfocusExpr) {
+        this.onfocusExpr = onfocusExpr;
+    }
+
     /**
-     * Setter method for "onkeydown" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onkeydown" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setOnkeydownExpr(String onkeydownExpr) { this.onkeydownExpr = onkeydownExpr; }
+    public void setOnkeydownExpr(String onkeydownExpr) {
+        this.onkeydownExpr = onkeydownExpr;
+    }
+
     /**
-     * Setter method for "onkeypress" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onkeypress" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setOnkeypressExpr(String onkeypressExpr) { this.onkeypressExpr = onkeypressExpr; }
+    public void setOnkeypressExpr(String onkeypressExpr) {
+        this.onkeypressExpr = onkeypressExpr;
+    }
+
     /**
-     * Setter method for "onkeyup" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onkeyup" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setOnkeyupExpr(String onkeyupExpr) { this.onkeyupExpr = onkeyupExpr; }
+    public void setOnkeyupExpr(String onkeyupExpr) {
+        this.onkeyupExpr = onkeyupExpr;
+    }
+
     /**
-     * Setter method for "onmousedown" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onmousedown" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setOnmousedownExpr(String onmousedownExpr) { this.onmousedownExpr = onmousedownExpr; }
+    public void setOnmousedownExpr(String onmousedownExpr) {
+        this.onmousedownExpr = onmousedownExpr;
+    }
+
     /**
-     * Setter method for "onmousemove" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onmousemove" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setOnmousemoveExpr(String onmousemoveExpr) { this.onmousemoveExpr = onmousemoveExpr; }
+    public void setOnmousemoveExpr(String onmousemoveExpr) {
+        this.onmousemoveExpr = onmousemoveExpr;
+    }
+
     /**
-     * Setter method for "onmouseout" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onmouseout" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setOnmouseoutExpr(String onmouseoutExpr) { this.onmouseoutExpr = onmouseoutExpr; }
+    public void setOnmouseoutExpr(String onmouseoutExpr) {
+        this.onmouseoutExpr = onmouseoutExpr;
+    }
+
     /**
-     * Setter method for "onmouseover" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onmouseover" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setOnmouseoverExpr(String onmouseoverExpr) { this.onmouseoverExpr = onmouseoverExpr; }
+    public void setOnmouseoverExpr(String onmouseoverExpr) {
+        this.onmouseoverExpr = onmouseoverExpr;
+    }
+
     /**
-     * Setter method for "onmouseup" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onmouseup" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setOnmouseupExpr(String onmouseupExpr) { this.onmouseupExpr = onmouseupExpr; }
+    public void setOnmouseupExpr(String onmouseupExpr) {
+        this.onmouseupExpr = onmouseupExpr;
+    }
+
     /**
-     * Setter method for "property" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "property" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setPropertyExpr(String propertyExpr) { this.propertyExpr = propertyExpr; }
+    public void setPropertyExpr(String propertyExpr) {
+        this.propertyExpr = propertyExpr;
+    }
+
     /**
-     * Setter method for "style" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "style" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setStyleExpr(String styleExpr) { this.styleExpr = styleExpr; }
+    public void setStyleExpr(String styleExpr) {
+        this.styleExpr = styleExpr;
+    }
+
     /**
-     * Setter method for "styleClass" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "styleClass" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setStyleClassExpr(String styleClassExpr) { this.styleClassExpr = styleClassExpr; }
+    public void setStyleClassExpr(String styleClassExpr) {
+        this.styleClassExpr = styleClassExpr;
+    }
+
     /**
-     * Setter method for "styleId" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "styleId" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setStyleIdExpr(String styleIdExpr) { this.styleIdExpr = styleIdExpr; }
+    public void setStyleIdExpr(String styleIdExpr) {
+        this.styleIdExpr = styleIdExpr;
+    }
+
     /**
-     * Setter method for "tabindex" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "tabindex" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setTabindexExpr(String tabindexExpr) { this.tabindexExpr = tabindexExpr; }
+    public void setTabindexExpr(String tabindexExpr) {
+        this.tabindexExpr = tabindexExpr;
+    }
+
     /**
-     * Setter method for "title" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "title" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setTitleExpr(String titleExpr) { this.titleExpr = titleExpr; }
+    public void setTitleExpr(String titleExpr) {
+        this.titleExpr = titleExpr;
+    }
+
     /**
-     * Setter method for "titleKey" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "titleKey" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setTitleKeyExpr(String titleKeyExpr) { this.titleKeyExpr = titleKeyExpr; }
+    public void setTitleKeyExpr(String titleKeyExpr) {
+        this.titleKeyExpr = titleKeyExpr;
+    }
+
     /**
-     * Setter method for "value" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "value" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setValueExpr(String valueExpr) { this.valueExpr = valueExpr; }
+    public void setValueExpr(String valueExpr) {
+        this.valueExpr = valueExpr;
+    }
 
     /**
      * Resets attribute values for tag reuse.
      */
-    public void release()
-    {
+    public void release() {
         super.release();
         setAccesskeyExpr(null);
         setAltExpr(null);
@@ -465,125 +640,175 @@
     /**
      * Process the start tag.
      *
-     * @exception JspException if a JSP exception has occurred
+     * @throws JspException if a JSP exception has occurred
      */
     public int doStartTag() throws JspException {
         evaluateExpressions();
-        return(super.doStartTag());
+
+        return (super.doStartTag());
     }
-    
+
     /**
      * Processes all attribute values which use the JSTL expression evaluation
      * engine to determine their values.
      *
-     * @exception JspException if a JSP exception has occurred
+     * @throws JspException if a JSP exception has occurred
      */
-    private void evaluateExpressions() throws JspException {
-        String  string  = null;
-        Boolean bool    = null;
-
-        if ((string = EvalHelper.evalString("accessKey", getAccesskeyExpr(),
-                                            this, pageContext)) != null)
+    private void evaluateExpressions()
+        throws JspException {
+        String string = null;
+        Boolean bool = null;
+
+        if ((string =
+                EvalHelper.evalString("accessKey", getAccesskeyExpr(), this,
+                    pageContext)) != null) {
             setAccesskey(string);
+        }
 
-        if ((string = EvalHelper.evalString("alt", getAltExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("alt", getAltExpr(), this, pageContext)) != null) {
             setAlt(string);
+        }
 
-        if ((string = EvalHelper.evalString("altKey", getAltKeyExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("altKey", getAltKeyExpr(), this,
+                    pageContext)) != null) {
             setAltKey(string);
+        }
 
-        if ((string = EvalHelper.evalString("bundle", getBundleExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("bundle", getBundleExpr(), this,
+                    pageContext)) != null) {
             setBundle(string);
+        }
 
-        if ((bool = EvalHelper.evalBoolean("disabled", getDisabledExpr(),
-                                           this, pageContext)) != null)
+        if ((bool =
+                EvalHelper.evalBoolean("disabled", getDisabledExpr(), this,
+                    pageContext)) != null) {
             setDisabled(bool.booleanValue());
+        }
 
-        if ((string = EvalHelper.evalString("onblur", getOnblurExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onblur", getOnblurExpr(), this,
+                    pageContext)) != null) {
             setOnblur(string);
+        }
 
-        if ((string = EvalHelper.evalString("onchange", getOnchangeExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onchange", getOnchangeExpr(), this,
+                    pageContext)) != null) {
             setOnchange(string);
+        }
 
-        if ((string = EvalHelper.evalString("onclick", getOnclickExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onclick", getOnclickExpr(), this,
+                    pageContext)) != null) {
             setOnclick(string);
+        }
 
-        if ((string = EvalHelper.evalString("ondblclick", getOndblclickExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("ondblclick", getOndblclickExpr(), this,
+                    pageContext)) != null) {
             setOndblclick(string);
+        }
 
-        if ((string = EvalHelper.evalString("onfocus", getOnfocusExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onfocus", getOnfocusExpr(), this,
+                    pageContext)) != null) {
             setOnfocus(string);
+        }
 
-        if ((string = EvalHelper.evalString("onkeydown", getOnkeydownExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onkeydown", getOnkeydownExpr(), this,
+                    pageContext)) != null) {
             setOnkeydown(string);
+        }
 
-        if ((string = EvalHelper.evalString("onkeypress", getOnkeypressExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onkeypress", getOnkeypressExpr(), this,
+                    pageContext)) != null) {
             setOnkeypress(string);
+        }
 
-        if ((string = EvalHelper.evalString("onkeyup", getOnkeyupExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onkeyup", getOnkeyupExpr(), this,
+                    pageContext)) != null) {
             setOnkeyup(string);
+        }
 
-        if ((string = EvalHelper.evalString("onmousedown", getOnmousedownExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onmousedown", getOnmousedownExpr(),
+                    this, pageContext)) != null) {
             setOnmousedown(string);
+        }
 
-        if ((string = EvalHelper.evalString("onmousemove", getOnmousemoveExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onmousemove", getOnmousemoveExpr(),
+                    this, pageContext)) != null) {
             setOnmousemove(string);
+        }
 
-        if ((string = EvalHelper.evalString("onmouseout", getOnmouseoutExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onmouseout", getOnmouseoutExpr(), this,
+                    pageContext)) != null) {
             setOnmouseout(string);
+        }
 
-        if ((string = EvalHelper.evalString("onmouseover", getOnmouseoverExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onmouseover", getOnmouseoverExpr(),
+                    this, pageContext)) != null) {
             setOnmouseover(string);
+        }
 
-        if ((string = EvalHelper.evalString("onmouseup", getOnmouseupExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onmouseup", getOnmouseupExpr(), this,
+                    pageContext)) != null) {
             setOnmouseup(string);
+        }
 
-        if ((string = EvalHelper.evalString("property", getPropertyExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("property", getPropertyExpr(), this,
+                    pageContext)) != null) {
             setProperty(string);
+        }
 
-        if ((string = EvalHelper.evalString("style", getStyleExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("style", getStyleExpr(), this, pageContext)) != null) {
             setStyle(string);
+        }
 
-        if ((string = EvalHelper.evalString("styleClass", getStyleClassExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("styleClass", getStyleClassExpr(), this,
+                    pageContext)) != null) {
             setStyleClass(string);
+        }
 
-        if ((string = EvalHelper.evalString("styleId", getStyleIdExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("styleId", getStyleIdExpr(), this,
+                    pageContext)) != null) {
             setStyleId(string);
+        }
 
-        if ((string = EvalHelper.evalString("tabindex", getTabindexExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("tabindex", getTabindexExpr(), this,
+                    pageContext)) != null) {
             setTabindex(string);
+        }
 
-        if ((string = EvalHelper.evalString("title", getTitleExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("title", getTitleExpr(), this, pageContext)) != null) {
             setTitle(string);
+        }
 
-        if ((string = EvalHelper.evalString("titleKey", getTitleKeyExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("titleKey", getTitleKeyExpr(), this,
+                    pageContext)) != null) {
             setTitleKey(string);
+        }
 
-        if ((string = EvalHelper.evalString("value", getValueExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("value", getValueExpr(), this, pageContext)) != null) {
             setValue(string);
+        }
     }
 }

Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELResetTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELResetTagBeanInfo.java?rev=376779&r1=376778&r2=376779&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELResetTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELResetTagBeanInfo.java Fri Feb 10 10:08:58 2006
@@ -1,157 +1,203 @@
 /*
- * $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.strutsel.taglib.html;
 
-import java.beans.PropertyDescriptor;
 import java.beans.IntrospectionException;
-import java.util.ArrayList;
+import java.beans.PropertyDescriptor;
 import java.beans.SimpleBeanInfo;
 
+import java.util.ArrayList;
+
 /**
  * This is the <code>BeanInfo</code> descriptor for the
- * <code>org.apache.strutsel.taglib.html.ELResetTag</code> class.  It is needed
- * to override the default mapping of custom tag attribute names to class
- * attribute names.
- *<p>
- * In particular, it provides for the mapping of the custom tag attribute
- * <code>disabled</code> to the instance variable <code>disabledExpr</code>.
- *<p>
- * This is because the value of the unevaluated EL expression has to be kept
- * separately from the evaluated value, which is stored in the base class. This
- * is related to the fact that the JSP compiler can choose to reuse different
- * tag instances if they received the same original attribute values, and the
- * JSP compiler can choose to not re-call the setter methods, because it can
- * assume the same values are already set.
+ * <code>org.apache.strutsel.taglib.html.ELResetTag</code> class.  It is
+ * needed to override the default mapping of custom tag attribute names to
+ * class attribute names. <p> In particular, it provides for the mapping of
+ * the custom tag attribute <code>disabled</code> to the instance variable
+ * <code>disabledExpr</code>. <p> This is because the value of the unevaluated
+ * EL expression has to be kept separately from the evaluated value, which is
+ * stored in the base class. This is related to the fact that the JSP compiler
+ * can choose to reuse different tag instances if they received the same
+ * original attribute values, and the JSP compiler can choose to not re-call
+ * the setter methods, because it can assume the same values are already set.
  */
-public class ELResetTagBeanInfo extends SimpleBeanInfo
-{
-    public  PropertyDescriptor[] getPropertyDescriptors()
-    {
+public class ELResetTagBeanInfo extends SimpleBeanInfo {
+    public PropertyDescriptor[] getPropertyDescriptors() {
         ArrayList proplist = new ArrayList();
 
         try {
             proplist.add(new PropertyDescriptor("accesskey", ELResetTag.class,
-                                                null, "setAccesskeyExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setAccesskeyExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("alt", ELResetTag.class,
-                                                null, "setAltExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("alt", ELResetTag.class, null,
+                    "setAltExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("altKey", ELResetTag.class,
-                                                null, "setAltKeyExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setAltKeyExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("bundle", ELResetTag.class,
-                                                null, "setBundleExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setBundleExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("disabled", ELResetTag.class,
-                                                null, "setDisabledExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setDisabledExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("onblur", ELResetTag.class,
-                                                null, "setOnblurExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOnblurExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("onchange", ELResetTag.class,
-                                                null, "setOnchangeExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOnchangeExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("onclick", ELResetTag.class,
-                                                null, "setOnclickExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOnclickExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("ondblclick", ELResetTag.class,
-                                                null, "setOndblclickExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOndblclickExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("onfocus", ELResetTag.class,
-                                                null, "setOnfocusExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOnfocusExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("onkeydown", ELResetTag.class,
-                                                null, "setOnkeydownExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOnkeydownExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("onkeypress", ELResetTag.class,
-                                                null, "setOnkeypressExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOnkeypressExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("onkeyup", ELResetTag.class,
-                                                null, "setOnkeyupExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOnkeyupExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("onmousedown", ELResetTag.class,
-                                                null, "setOnmousedownExpr"));
-        } catch (IntrospectionException ex) {}
-        try {
-            proplist.add(new PropertyDescriptor("onmousemove", ELResetTag.class,
-                                                null, "setOnmousemoveExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("onmousedown",
+                    ELResetTag.class, null, "setOnmousedownExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        try {
+            proplist.add(new PropertyDescriptor("onmousemove",
+                    ELResetTag.class, null, "setOnmousemoveExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("onmouseout", ELResetTag.class,
-                                                null, "setOnmouseoutExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOnmouseoutExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("onmouseover", ELResetTag.class,
-                                                null, "setOnmouseoverExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("onmouseover",
+                    ELResetTag.class, null, "setOnmouseoverExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("onmouseup", ELResetTag.class,
-                                                null, "setOnmouseupExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOnmouseupExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("property", ELResetTag.class,
-                                                null, "setPropertyExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setPropertyExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("style", ELResetTag.class,
-                                                null, "setStyleExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setStyleExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("styleClass", ELResetTag.class,
-                                                null, "setStyleClassExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setStyleClassExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("styleId", ELResetTag.class,
-                                                null, "setStyleIdExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setStyleIdExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("tabindex", ELResetTag.class,
-                                                null, "setTabindexExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setTabindexExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("title", ELResetTag.class,
-                                                null, "setTitleExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setTitleExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("titleKey", ELResetTag.class,
-                                                null, "setTitleKeyExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setTitleKeyExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("value", ELResetTag.class,
-                                                null, "setValueExpr"));
-        } catch (IntrospectionException ex) {}
-        
-        PropertyDescriptor[] result =
-            new PropertyDescriptor[proplist.size()];
+                    null, "setValueExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()];
+
         return ((PropertyDescriptor[]) proplist.toArray(result));
     }
 }

Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELRewriteTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELRewriteTag.java?rev=376779&r1=376778&r2=376779&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELRewriteTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELRewriteTag.java Fri Feb 10 10:08:58 2006
@@ -1,273 +1,371 @@
 /*
- * $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.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.RewriteTag;
-import javax.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
+import javax.servlet.jsp.JspException;
+
 /**
- * Generate a URL-encoded URI as a string.
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.html.RewriteTag</code> which provides most of
- * the described functionality.  This subclass allows all attribute values to
- * be specified as expressions utilizing the JavaServer Pages Standard Library
- * expression language.
+ * Generate a URL-encoded URI as a string. <p> This class is a subclass of the
+ * class <code>org.apache.struts.taglib.html.RewriteTag</code> which provides
+ * most of the described functionality.  This subclass allows all attribute
+ * values to be specified as expressions utilizing the JavaServer Pages
+ * Standard Library expression language.
  *
  * @version $Rev$
  */
 public class ELRewriteTag extends RewriteTag {
-
     /**
-     * Instance variable mapped to "action" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "action" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String actionExpr;
+
     /**
-     * Instance variable mapped to "module" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "module" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String moduleExpr;
+
     /**
-     * Instance variable mapped to "anchor" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "anchor" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String anchorExpr;
+
     /**
-     * Instance variable mapped to "forward" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "forward" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String forwardExpr;
+
     /**
-     * Instance variable mapped to "href" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "href" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String hrefExpr;
+
     /**
-     * Instance variable mapped to "name" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "name" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String nameExpr;
+
     /**
-     * Instance variable mapped to "page" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "page" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String pageExpr;
+
     /**
-     * Instance variable mapped to "paramId" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "paramId" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String paramIdExpr;
+
     /**
-     * Instance variable mapped to "paramName" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "paramName" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String paramNameExpr;
+
     /**
-     * Instance variable mapped to "paramProperty" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "paramProperty" tag attribute. (Mapping set
+     * in associated BeanInfo class.)
      */
     private String paramPropertyExpr;
+
     /**
-     * Instance variable mapped to "paramScope" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "paramScope" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String paramScopeExpr;
+
     /**
-     * Instance variable mapped to "property" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "property" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String propertyExpr;
+
     /**
-     * Instance variable mapped to "scope" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "scope" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String scopeExpr;
+
     /**
-     * Instance variable mapped to "transaction" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "transaction" tag attribute. (Mapping set
+     * in associated BeanInfo class.)
      */
     private String transactionExpr;
+
     /**
-     * Instance variable mapped to "useLocalEncoding" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "useLocalEncoding" tag attribute. (Mapping
+     * set in associated BeanInfo class.)
      */
     private String useLocalEncodingExpr;
 
     /**
-     * Getter method for "action" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "action" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getActionExpr() { return (actionExpr); }
+    public String getActionExpr() {
+        return (actionExpr);
+    }
+
     /**
-     * Getter method for "module" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "module" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getModuleExpr() { return (moduleExpr); }
+    public String getModuleExpr() {
+        return (moduleExpr);
+    }
+
     /**
-     * Getter method for "anchor" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "anchor" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getAnchorExpr() { return (anchorExpr); }
+    public String getAnchorExpr() {
+        return (anchorExpr);
+    }
+
     /**
-     * Getter method for "forward" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "forward" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getForwardExpr() { return (forwardExpr); }
+    public String getForwardExpr() {
+        return (forwardExpr);
+    }
+
     /**
-     * Getter method for "href" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "href" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getHrefExpr() { return (hrefExpr); }
+    public String getHrefExpr() {
+        return (hrefExpr);
+    }
+
     /**
-     * Getter method for "name" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "name" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getNameExpr() { return (nameExpr); }
+    public String getNameExpr() {
+        return (nameExpr);
+    }
+
     /**
-     * Getter method for "page" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "page" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getPageExpr() { return (pageExpr); }
+    public String getPageExpr() {
+        return (pageExpr);
+    }
+
     /**
-     * Getter method for "paramId" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "paramId" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getParamIdExpr() { return (paramIdExpr); }
+    public String getParamIdExpr() {
+        return (paramIdExpr);
+    }
+
     /**
-     * Getter method for "paramName" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "paramName" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getParamNameExpr() { return (paramNameExpr); }
+    public String getParamNameExpr() {
+        return (paramNameExpr);
+    }
+
     /**
-     * Getter method for "paramProperty" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "paramProperty" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getParamPropertyExpr() { return (paramPropertyExpr); }
+    public String getParamPropertyExpr() {
+        return (paramPropertyExpr);
+    }
+
     /**
-     * Getter method for "paramScope" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "paramScope" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getParamScopeExpr() { return (paramScopeExpr); }
+    public String getParamScopeExpr() {
+        return (paramScopeExpr);
+    }
+
     /**
-     * Getter method for "property" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "property" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getPropertyExpr() { return (propertyExpr); }
+    public String getPropertyExpr() {
+        return (propertyExpr);
+    }
+
     /**
-     * Getter method for "scope" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "scope" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getScopeExpr() { return (scopeExpr); }
+    public String getScopeExpr() {
+        return (scopeExpr);
+    }
+
     /**
-     * Getter method for "transaction" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "transaction" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getTransactionExpr() { return (transactionExpr); }
+    public String getTransactionExpr() {
+        return (transactionExpr);
+    }
+
     /**
-     * Getter method for "useLocalEncoding" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "useLocalEncoding" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getUseLocalEncodingExpr() { return (useLocalEncodingExpr); }
+    public String getUseLocalEncodingExpr() {
+        return (useLocalEncodingExpr);
+    }
 
     /**
-     * Setter method for "action" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "action" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setActionExpr(String actionExpr) { this.actionExpr = actionExpr; }
+    public void setActionExpr(String actionExpr) {
+        this.actionExpr = actionExpr;
+    }
+
     /**
-     * Setter method for "module" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "module" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setModuleExpr(String moduleExpr) { this.moduleExpr = moduleExpr; }
+    public void setModuleExpr(String moduleExpr) {
+        this.moduleExpr = moduleExpr;
+    }
+
     /**
-     * Setter method for "anchor" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "anchor" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setAnchorExpr(String anchorExpr) { this.anchorExpr = anchorExpr; }
+    public void setAnchorExpr(String anchorExpr) {
+        this.anchorExpr = anchorExpr;
+    }
+
     /**
-     * Setter method for "forward" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "forward" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setForwardExpr(String forwardExpr) { this.forwardExpr = forwardExpr; }
+    public void setForwardExpr(String forwardExpr) {
+        this.forwardExpr = forwardExpr;
+    }
+
     /**
-     * Setter method for "href" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "href" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setHrefExpr(String hrefExpr) { this.hrefExpr = hrefExpr; }
+    public void setHrefExpr(String hrefExpr) {
+        this.hrefExpr = hrefExpr;
+    }
+
     /**
-     * Setter method for "name" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "name" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setNameExpr(String nameExpr) { this.nameExpr = nameExpr; }
+    public void setNameExpr(String nameExpr) {
+        this.nameExpr = nameExpr;
+    }
+
     /**
-     * Setter method for "page" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "page" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setPageExpr(String pageExpr) { this.pageExpr = pageExpr; }
+    public void setPageExpr(String pageExpr) {
+        this.pageExpr = pageExpr;
+    }
+
     /**
-     * Setter method for "paramId" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "paramId" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setParamIdExpr(String paramIdExpr) { this.paramIdExpr = paramIdExpr; }
+    public void setParamIdExpr(String paramIdExpr) {
+        this.paramIdExpr = paramIdExpr;
+    }
+
     /**
-     * Setter method for "paramName" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "paramName" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setParamNameExpr(String paramNameExpr) { this.paramNameExpr = paramNameExpr; }
+    public void setParamNameExpr(String paramNameExpr) {
+        this.paramNameExpr = paramNameExpr;
+    }
+
     /**
-     * Setter method for "paramProperty" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "paramProperty" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setParamPropertyExpr(String paramPropertyExpr) { this.paramPropertyExpr = paramPropertyExpr; }
+    public void setParamPropertyExpr(String paramPropertyExpr) {
+        this.paramPropertyExpr = paramPropertyExpr;
+    }
+
     /**
-     * Setter method for "paramScope" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "paramScope" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setParamScopeExpr(String paramScopeExpr) { this.paramScopeExpr = paramScopeExpr; }
+    public void setParamScopeExpr(String paramScopeExpr) {
+        this.paramScopeExpr = paramScopeExpr;
+    }
+
     /**
-     * Setter method for "property" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "property" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setPropertyExpr(String propertyExpr) { this.propertyExpr = propertyExpr; }
+    public void setPropertyExpr(String propertyExpr) {
+        this.propertyExpr = propertyExpr;
+    }
+
     /**
-     * Setter method for "scope" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "scope" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setScopeExpr(String scopeExpr) { this.scopeExpr = scopeExpr; }
+    public void setScopeExpr(String scopeExpr) {
+        this.scopeExpr = scopeExpr;
+    }
+
     /**
-     * Setter method for "transaction" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "transaction" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setTransactionExpr(String transactionExpr) { this.transactionExpr = transactionExpr; }
+    public void setTransactionExpr(String transactionExpr) {
+        this.transactionExpr = transactionExpr;
+    }
+
     /**
-     * Setter method for "useLocalEncoding" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "useLocalEncoding" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setUseLocalEncodingExpr(String useLocalEncodingExpr) { this.useLocalEncodingExpr = useLocalEncodingExpr; }
+    public void setUseLocalEncodingExpr(String useLocalEncodingExpr) {
+        this.useLocalEncodingExpr = useLocalEncodingExpr;
+    }
 
     /**
      * Resets attribute values for tag reuse.
      */
-    public void release()
-    {
+    public void release() {
         super.release();
         setActionExpr(null);
         setModuleExpr(null);
@@ -289,81 +387,109 @@
     /**
      * Process the start tag.
      *
-     * @exception JspException if a JSP exception has occurred
+     * @throws JspException if a JSP exception has occurred
      */
     public int doStartTag() throws JspException {
         evaluateExpressions();
-        return(super.doStartTag());
+
+        return (super.doStartTag());
     }
 
     /**
      * Processes all attribute values which use the JSTL expression evaluation
      * engine to determine their values.
      *
-     * @exception JspException if a JSP exception has occurred
+     * @throws JspException if a JSP exception has occurred
      */
-    private void evaluateExpressions() throws JspException {
-        String  string  = null;
-        Boolean bool    = null;
-
-        if ((string = EvalHelper.evalString("action", getActionExpr(),
-                                            this, pageContext)) != null)
+    private void evaluateExpressions()
+        throws JspException {
+        String string = null;
+        Boolean bool = null;
+
+        if ((string =
+                EvalHelper.evalString("action", getActionExpr(), this,
+                    pageContext)) != null) {
             setAction(string);
+        }
 
-        if ((string = EvalHelper.evalString("module", getModuleExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("module", getModuleExpr(), this,
+                    pageContext)) != null) {
             setModule(string);
+        }
 
-        if ((string = EvalHelper.evalString("anchor", getAnchorExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("anchor", getAnchorExpr(), this,
+                    pageContext)) != null) {
             setAnchor(string);
+        }
 
-        if ((string = EvalHelper.evalString("forward", getForwardExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("forward", getForwardExpr(), this,
+                    pageContext)) != null) {
             setForward(string);
+        }
 
-        if ((string = EvalHelper.evalString("href", getHrefExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("href", getHrefExpr(), this, pageContext)) != null) {
             setHref(string);
+        }
 
-        if ((string = EvalHelper.evalString("name", getNameExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("name", getNameExpr(), this, pageContext)) != null) {
             setName(string);
+        }
 
-        if ((string = EvalHelper.evalString("page", getPageExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("page", getPageExpr(), this, pageContext)) != null) {
             setPage(string);
+        }
 
-        if ((string = EvalHelper.evalString("paramId", getParamIdExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("paramId", getParamIdExpr(), this,
+                    pageContext)) != null) {
             setParamId(string);
+        }
 
-        if ((string = EvalHelper.evalString("paramName", getParamNameExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("paramName", getParamNameExpr(), this,
+                    pageContext)) != null) {
             setParamName(string);
+        }
 
-        if ((string = EvalHelper.evalString("paramProperty", getParamPropertyExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("paramProperty", getParamPropertyExpr(),
+                    this, pageContext)) != null) {
             setParamProperty(string);
+        }
 
-        if ((string = EvalHelper.evalString("paramScope", getParamScopeExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("paramScope", getParamScopeExpr(), this,
+                    pageContext)) != null) {
             setParamScope(string);
+        }
 
-        if ((string = EvalHelper.evalString("property", getPropertyExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("property", getPropertyExpr(), this,
+                    pageContext)) != null) {
             setProperty(string);
+        }
 
-        if ((string = EvalHelper.evalString("scope", getScopeExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("scope", getScopeExpr(), this, pageContext)) != null) {
             setScope(string);
+        }
 
-        if ((bool = EvalHelper.evalBoolean("transaction", getTransactionExpr(),
-                                           this, pageContext)) != null)
+        if ((bool =
+                EvalHelper.evalBoolean("transaction", getTransactionExpr(),
+                    this, pageContext)) != null) {
             setTransaction(bool.booleanValue());
+        }
 
-        if ((bool = EvalHelper.evalBoolean("useLocalEncoding", getUseLocalEncodingExpr(),
-                                           this, pageContext)) != null)
+        if ((bool =
+                EvalHelper.evalBoolean("useLocalEncoding",
+                    getUseLocalEncodingExpr(), this, pageContext)) != null) {
             setUseLocalEncoding(bool.booleanValue());
+        }
     }
 }

Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELRewriteTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELRewriteTagBeanInfo.java?rev=376779&r1=376778&r2=376779&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELRewriteTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELRewriteTagBeanInfo.java Fri Feb 10 10:08:58 2006
@@ -1,110 +1,135 @@
 /*
- * $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.strutsel.taglib.html;
 
-import java.beans.PropertyDescriptor;
 import java.beans.IntrospectionException;
-import java.util.ArrayList;
+import java.beans.PropertyDescriptor;
 import java.beans.SimpleBeanInfo;
 
+import java.util.ArrayList;
+
 /**
  * This is the <code>BeanInfo</code> descriptor for the
  * <code>org.apache.strutsel.taglib.html.ELRewriteTag</code> class.  It is
  * needed to override the default mapping of custom tag attribute names to
- * class attribute names.
- *<p>
- * This is because the value of the unevaluated EL expression has to be kept
- * separately from the evaluated value, which is stored in the base class. This
- * is related to the fact that the JSP compiler can choose to reuse different
- * tag instances if they received the same original attribute values, and the
- * JSP compiler can choose to not re-call the setter methods, because it can
- * assume the same values are already set.
+ * class attribute names. <p> This is because the value of the unevaluated EL
+ * expression has to be kept separately from the evaluated value, which is
+ * stored in the base class. This is related to the fact that the JSP compiler
+ * can choose to reuse different tag instances if they received the same
+ * original attribute values, and the JSP compiler can choose to not re-call
+ * the setter methods, because it can assume the same values are already set.
  */
-public class ELRewriteTagBeanInfo extends SimpleBeanInfo
-{
-    public  PropertyDescriptor[] getPropertyDescriptors()
-    {
+public class ELRewriteTagBeanInfo extends SimpleBeanInfo {
+    public PropertyDescriptor[] getPropertyDescriptors() {
         ArrayList proplist = new ArrayList();
 
         try {
             proplist.add(new PropertyDescriptor("action", ELRewriteTag.class,
-                                                null, "setActionExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setActionExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("module", ELRewriteTag.class,
-                                                null, "setModuleExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setModuleExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("anchor", ELRewriteTag.class,
-                                                null, "setAnchorExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setAnchorExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("forward", ELRewriteTag.class,
-                                                null, "setForwardExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setForwardExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("href", ELRewriteTag.class,
-                                                null, "setHrefExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setHrefExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("name", ELRewriteTag.class,
-                                                null, "setNameExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setNameExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("page", ELRewriteTag.class,
-                                                null, "setPageExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setPageExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("paramId", ELRewriteTag.class,
-                                                null, "setParamIdExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setParamIdExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        try {
+            proplist.add(new PropertyDescriptor("paramName",
+                    ELRewriteTag.class, null, "setParamNameExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        try {
+            proplist.add(new PropertyDescriptor("paramProperty",
+                    ELRewriteTag.class, null, "setParamPropertyExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("paramName", ELRewriteTag.class,
-                                                null, "setParamNameExpr"));
-        } catch (IntrospectionException ex) {}
-        try {
-            proplist.add(new PropertyDescriptor("paramProperty", ELRewriteTag.class,
-                                                null, "setParamPropertyExpr"));
-        } catch (IntrospectionException ex) {}
-        try {
-            proplist.add(new PropertyDescriptor("paramScope", ELRewriteTag.class,
-                                                null, "setParamScopeExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("paramScope",
+                    ELRewriteTag.class, null, "setParamScopeExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("property", ELRewriteTag.class,
-                                                null, "setPropertyExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setPropertyExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("scope", ELRewriteTag.class,
-                                                null, "setScopeExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setScopeExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("transaction", ELRewriteTag.class,
-                                                null, "setTransactionExpr"));
-        } catch (IntrospectionException ex) {}
-        try {
-            proplist.add(new PropertyDescriptor("useLocalEncoding", ELRewriteTag.class,
-                                                null, "setUseLocalEncodingExpr"));
-        } catch (IntrospectionException ex) {}
-        
-        PropertyDescriptor[] result =
-            new PropertyDescriptor[proplist.size()];
+            proplist.add(new PropertyDescriptor("transaction",
+                    ELRewriteTag.class, null, "setTransactionExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        try {
+            proplist.add(new PropertyDescriptor("useLocalEncoding",
+                    ELRewriteTag.class, null, "setUseLocalEncodingExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()];
+
         return ((PropertyDescriptor[]) proplist.toArray(result));
     }
 }



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