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 [5/18] - /struts/el/trunk/src/java/org/apache/strutsel/taglib/html/

Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFormTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFormTag.java?rev=376779&r1=376778&r2=376779&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFormTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFormTag.java Fri Feb 10 10:08:58 2006
@@ -1,274 +1,372 @@
 /*
- * $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.FormTag;
-import javax.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
+import javax.servlet.jsp.JspException;
+
 /**
  * Custom tag that represents an input form, associated with a bean whose
- * properties correspond to the various fields of the form.
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.html.FormTag</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.
+ * properties correspond to the various fields of the form. <p> This class is
+ * a subclass of the class <code>org.apache.struts.taglib.html.FormTag</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 ELFormTag extends FormTag {
-
     /**
-     * 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 "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 "enctype" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "enctype" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String enctypeExpr;
+
     /**
-     * Instance variable mapped to "focus" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "focus" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String focusExpr;
+
     /**
-     * Instance variable mapped to "focusIndex" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "focusIndex" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String focusIndexExpr;
+
     /**
-     * Instance variable mapped to "method" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "method" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String methodExpr;
+
     /**
-     * Instance variable mapped to "onreset" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onreset" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String onresetExpr;
+
     /**
-     * Instance variable mapped to "onsubmit" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "onsubmit" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String onsubmitExpr;
+
     /**
-     * Instance variable mapped to "readonly" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "readonly" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String readonlyExpr;
+
     /**
-     * Instance variable mapped to "scriptLanguage" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "scriptLanguage" tag attribute. (Mapping
+     * set in associated BeanInfo class.)
      */
     private String scriptLanguageExpr;
+
     /**
-     * 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 "target" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "target" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String targetExpr;
+
     /**
-     * Instance variable mapped to "acceptCharset" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "acceptCharset" tag attribute. (Mapping set
+     * in associated BeanInfo class.)
      */
     private String acceptCharsetExpr;
 
     /**
-     * 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 "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 "enctype" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "enctype" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getEnctypeExpr() { return (enctypeExpr); }
+    public String getEnctypeExpr() {
+        return (enctypeExpr);
+    }
+
     /**
-     * Getter method for "focus" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "focus" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getFocusExpr() { return (focusExpr); }
+    public String getFocusExpr() {
+        return (focusExpr);
+    }
+
     /**
-     * Getter method for "focusIndex" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "focusIndex" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getFocusIndexExpr() { return (focusIndexExpr); }
+    public String getFocusIndexExpr() {
+        return (focusIndexExpr);
+    }
+
     /**
-     * Getter method for "method" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "method" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getMethodExpr() { return (methodExpr); }
+    public String getMethodExpr() {
+        return (methodExpr);
+    }
+
     /**
-     * Getter method for "onreset" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onreset" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getOnresetExpr() { return (onresetExpr); }
+    public String getOnresetExpr() {
+        return (onresetExpr);
+    }
+
     /**
-     * Getter method for "onsubmit" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "onsubmit" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getOnsubmitExpr() { return (onsubmitExpr); }
+    public String getOnsubmitExpr() {
+        return (onsubmitExpr);
+    }
+
     /**
-     * Getter method for "readonly" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "readonly" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getReadonlyExpr() { return (readonlyExpr); }
+    public String getReadonlyExpr() {
+        return (readonlyExpr);
+    }
+
     /**
-     * Getter method for "scriptLanguage" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "scriptLanguage" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getScriptLanguageExpr() { return (scriptLanguageExpr); }
+    public String getScriptLanguageExpr() {
+        return (scriptLanguageExpr);
+    }
+
     /**
-     * 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 "target" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "target" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getTargetExpr() { return (targetExpr); }
+    public String getTargetExpr() {
+        return (targetExpr);
+    }
+
     /**
-     * Getter method for "acceptCharset" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "acceptCharset" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getAcceptCharsetExpr() { return (acceptCharsetExpr); }
+    public String getAcceptCharsetExpr() {
+        return (acceptCharsetExpr);
+    }
 
     /**
-     * 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 "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 "enctype" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "enctype" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setEnctypeExpr(String enctypeExpr) { this.enctypeExpr = enctypeExpr; }
+    public void setEnctypeExpr(String enctypeExpr) {
+        this.enctypeExpr = enctypeExpr;
+    }
+
     /**
-     * Setter method for "focus" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "focus" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setFocusExpr(String focusExpr) { this.focusExpr = focusExpr; }
+    public void setFocusExpr(String focusExpr) {
+        this.focusExpr = focusExpr;
+    }
+
     /**
-     * Setter method for "focusIndex" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "focusIndex" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setFocusIndexExpr(String focusIndexExpr) { this.focusIndexExpr = focusIndexExpr; }
+    public void setFocusIndexExpr(String focusIndexExpr) {
+        this.focusIndexExpr = focusIndexExpr;
+    }
+
     /**
-     * Setter method for "method" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "method" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setMethodExpr(String methodExpr) { this.methodExpr = methodExpr; }
+    public void setMethodExpr(String methodExpr) {
+        this.methodExpr = methodExpr;
+    }
+
     /**
-     * Setter method for "onreset" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onreset" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setOnresetExpr(String onresetExpr) { this.onresetExpr = onresetExpr; }
+    public void setOnresetExpr(String onresetExpr) {
+        this.onresetExpr = onresetExpr;
+    }
+
     /**
-     * Setter method for "onsubmit" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "onsubmit" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setOnsubmitExpr(String onsubmitExpr) { this.onsubmitExpr = onsubmitExpr; }
+    public void setOnsubmitExpr(String onsubmitExpr) {
+        this.onsubmitExpr = onsubmitExpr;
+    }
+
     /**
-     * Setter method for "readonly" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "readonly" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setReadonlyExpr(String readonlyExpr) { this.readonlyExpr = readonlyExpr; }
+    public void setReadonlyExpr(String readonlyExpr) {
+        this.readonlyExpr = readonlyExpr;
+    }
+
     /**
-     * Setter method for "scriptLanguage" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "scriptLanguage" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setScriptLanguageExpr(String scriptLanguageExpr) { this.scriptLanguageExpr = scriptLanguageExpr; }
+    public void setScriptLanguageExpr(String scriptLanguageExpr) {
+        this.scriptLanguageExpr = scriptLanguageExpr;
+    }
+
     /**
-     * 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 "target" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "target" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setTargetExpr(String targetExpr) { this.targetExpr = targetExpr; }
+    public void setTargetExpr(String targetExpr) {
+        this.targetExpr = targetExpr;
+    }
+
     /**
-     * Setter method for "acceptCharset" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "acceptCharset" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setAcceptCharsetExpr(String acceptCharsetExpr) { this.acceptCharsetExpr = acceptCharsetExpr; }
+    public void setAcceptCharsetExpr(String acceptCharsetExpr) {
+        this.acceptCharsetExpr = acceptCharsetExpr;
+    }
 
     /**
      * Resets attribute values for tag reuse.
      */
-    public void release()
-    {
+    public void release() {
         super.release();
         setActionExpr(null);
         setDisabledExpr(null);
@@ -286,86 +384,115 @@
         setTargetExpr(null);
         setAcceptCharsetExpr(null);
     }
-    
+
     /**
      * 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 ((bool = EvalHelper.evalBoolean("disabled", getDisabledExpr(),
-                                           this, pageContext)) != null)
+        if ((bool =
+                EvalHelper.evalBoolean("disabled", getDisabledExpr(), this,
+                    pageContext)) != null) {
             setDisabled(bool.booleanValue());
+        }
 
-        if ((string = EvalHelper.evalString("enctype", getEnctypeExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("enctype", getEnctypeExpr(), this,
+                    pageContext)) != null) {
             setEnctype(string);
+        }
 
-        if ((string = EvalHelper.evalString("focus", getFocusExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("focus", getFocusExpr(), this, pageContext)) != null) {
             setFocus(string);
+        }
 
-        if ((string = EvalHelper.evalString("focusIndex", getFocusIndexExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("focusIndex", getFocusIndexExpr(), this,
+                    pageContext)) != null) {
             setFocusIndex(string);
+        }
 
-        if ((string = EvalHelper.evalString("method", getMethodExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("method", getMethodExpr(), this,
+                    pageContext)) != null) {
             setMethod(string);
+        }
 
-        if ((string = EvalHelper.evalString("onreset", getOnresetExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onreset", getOnresetExpr(), this,
+                    pageContext)) != null) {
             setOnreset(string);
+        }
 
-        if ((string = EvalHelper.evalString("onsubmit", getOnsubmitExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("onsubmit", getOnsubmitExpr(), this,
+                    pageContext)) != null) {
             setOnsubmit(string);
+        }
 
-        if ((bool = EvalHelper.evalBoolean("readonly", getReadonlyExpr(),
-                                           this, pageContext)) != null)
+        if ((bool =
+                EvalHelper.evalBoolean("readonly", getReadonlyExpr(), this,
+                    pageContext)) != null) {
             setReadonly(bool.booleanValue());
+        }
 
-       if ((bool = EvalHelper.evalBoolean("scriptLanguage", getScriptLanguageExpr(),
-                                          this, pageContext)) != null)
-           setScriptLanguage(bool.booleanValue());
+        if ((bool =
+                EvalHelper.evalBoolean("scriptLanguage",
+                    getScriptLanguageExpr(), this, pageContext)) != null) {
+            setScriptLanguage(bool.booleanValue());
+        }
 
-        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("target", getTargetExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("target", getTargetExpr(), this,
+                    pageContext)) != null) {
             setTarget(string);
+        }
 
-        if ((string = EvalHelper.evalString("acceptCharset", getAcceptCharsetExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("acceptCharset", getAcceptCharsetExpr(),
+                    this, pageContext)) != null) {
             setAcceptCharset(string);
-
+        }
     }
 }

Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFormTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFormTagBeanInfo.java?rev=376779&r1=376778&r2=376779&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFormTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFormTagBeanInfo.java Fri Feb 10 10:08:58 2006
@@ -1,115 +1,148 @@
 /*
- * $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.ELFormTag</code> class.  It is
- * needed to override the default mapping of custom tag attribute names to
- * class attribute names.
+ * <code>org.apache.strutsel.taglib.html.ELFormTag</code> class.  It is needed
+ * to override the default mapping of custom tag attribute names to class
+ * attribute names.
  */
-public class ELFormTagBeanInfo extends SimpleBeanInfo
-{
-    public  PropertyDescriptor[] getPropertyDescriptors()
-    {
+public class ELFormTagBeanInfo extends SimpleBeanInfo {
+    public PropertyDescriptor[] getPropertyDescriptors() {
         ArrayList proplist = new ArrayList();
 
         try {
             proplist.add(new PropertyDescriptor("action", ELFormTag.class,
-                                                null, "setActionExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setActionExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("disabled", ELTextTag.class,
-                                                null, "setDisabledExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setDisabledExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("enctype", ELFormTag.class,
-                                                null, "setEnctypeExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setEnctypeExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("focus", ELFormTag.class,
-                                                null, "setFocusExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("focus", ELFormTag.class, null,
+                    "setFocusExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("focusIndex", ELFormTag.class,
-                                                null, "setFocusIndexExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setFocusIndexExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("method", ELFormTag.class,
-                                                null, "setMethodExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setMethodExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("name", ELFormTag.class,
-                                                null, "setNameExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("name", ELFormTag.class, null,
+                    "setNameExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("onreset", ELFormTag.class,
-                                                null, "setOnresetExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOnresetExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("onsubmit", ELFormTag.class,
-                                                null, "setOnsubmitExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setOnsubmitExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("readonly", ELTextTag.class,
-                                                null, "setReadonlyExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setReadonlyExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        try {
+            proplist.add(new PropertyDescriptor("scope", ELFormTag.class, null,
+                    "setScopeExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        try {
+            proplist.add(new PropertyDescriptor("scriptLanguage",
+                    ELFormTag.class, null, "setScriptLanguageExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("scope", ELFormTag.class,
-                                                null, "setScopeExpr"));
-        } catch (IntrospectionException ex) {}
-        try {
-            proplist.add(new PropertyDescriptor("scriptLanguage", ELFormTag.class,
-                                                null, "setScriptLanguageExpr"));
-        } catch (IntrospectionException ex) {}
-        try {
-            proplist.add(new PropertyDescriptor("style", ELFormTag.class,
-                                                null, "setStyleExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("style", ELFormTag.class, null,
+                    "setStyleExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("styleClass", ELFormTag.class,
-                                                null, "setStyleClassExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setStyleClassExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("styleId", ELFormTag.class,
-                                                null, "setStyleIdExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setStyleIdExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("target", ELFormTag.class,
-                                                null, "setTargetExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setTargetExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("type", ELFormTag.class,
-                                                null, "setTypeExpr"));
-        } catch (IntrospectionException ex) {}
-        try {
-            proplist.add(new PropertyDescriptor("acceptCharset", ELFormTag.class,
-                                                null, "setAcceptCharsetExpr"));
-        } catch (IntrospectionException ex) {}
-        
-        PropertyDescriptor[] result =
-            new PropertyDescriptor[proplist.size()];
+            proplist.add(new PropertyDescriptor("type", ELFormTag.class, null,
+                    "setTypeExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        try {
+            proplist.add(new PropertyDescriptor("acceptCharset",
+                    ELFormTag.class, null, "setAcceptCharsetExpr"));
+        } 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/ELFrameTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFrameTag.java?rev=376779&r1=376778&r2=376779&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFrameTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFrameTag.java Fri Feb 10 10:08:58 2006
@@ -1,466 +1,646 @@
 /*
- * $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.FrameTag;
-import javax.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
+import javax.servlet.jsp.JspException;
+
 /**
- * Generate an HTML <code>&lt;frame&gt;</code> tag with similar capabilities as
- * those the <code>&lt;html:link&gt;</code> tag provides for hyperlink
- * elements.  The <code>src</code> element is rendered using the same technique
- * that {@link org.apache.struts.taglib.html.LinkTag LinkTag} uses to render
- * the <code>href</code> attribute of a hyperlink.  Additionally, the HTML 4.0
- * frame tag attributes <code>noresize</code>, <code>scrolling</code>,
- * <code>marginheight</code>, <code>marginwidth</code>,
+ * Generate an HTML <code>&lt;frame&gt;</code> tag with similar capabilities
+ * as those the <code>&lt;html:link&gt;</code> tag provides for hyperlink
+ * elements.  The <code>src</code> element is rendered using the same
+ * technique that {@link org.apache.struts.taglib.html.LinkTag LinkTag} uses
+ * to render the <code>href</code> attribute of a hyperlink.  Additionally,
+ * the HTML 4.0 frame tag attributes <code>noresize</code>,
+ * <code>scrolling</code>, <code>marginheight</code>, <code>marginwidth</code>,
  * <code>frameborder</code>, and <code>longdesc</code> are supported.  The
  * frame <code>name</code> attribute is rendered based on the
- * <code>frameName</code> property.
- *<p>
- * Note that the value of <code>longdesc</code> is intended to be a URI, but
- * currently no rewriting is supported.  The attribute is set directly from
- * the property value.
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.html.FrameTag</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.
+ * <code>frameName</code> property. <p> Note that the value of
+ * <code>longdesc</code> is intended to be a URI, but currently no rewriting
+ * is supported.  The attribute is set directly from the property value. <p>
+ * This class is a subclass of the class <code>org.apache.struts.taglib.html.FrameTag</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 ELFrameTag extends FrameTag {
-
     /**
-     * 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 "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 "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 "frameborder" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "frameborder" tag attribute. (Mapping set
+     * in associated BeanInfo class.)
      */
     private String frameborderExpr;
+
     /**
-     * Instance variable mapped to "frameName" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "frameName" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String frameNameExpr;
+
     /**
-     * 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 "longdesc" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "longdesc" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String longdescExpr;
+
     /**
-     * Instance variable mapped to "marginheight" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "marginheight" tag attribute. (Mapping set
+     * in associated BeanInfo class.)
      */
     private String marginheightExpr;
+
     /**
-     * Instance variable mapped to "marginwidth" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "marginwidth" tag attribute. (Mapping set
+     * in associated BeanInfo class.)
      */
     private String marginwidthExpr;
+
     /**
-     * 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 "noresize" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "noresize" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String noresizeExpr;
+
     /**
-     * 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 "scrolling" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Instance variable mapped to "scrolling" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
     private String scrollingExpr;
+
     /**
-     * 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 "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 "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;
 
     /**
-     * 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 "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 "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 "frameborder" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "frameborder" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getFrameborderExpr() { return (frameborderExpr); }
+    public String getFrameborderExpr() {
+        return (frameborderExpr);
+    }
+
     /**
-     * Getter method for "frameName" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "frameName" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getFrameNameExpr() { return (frameNameExpr); }
+    public String getFrameNameExpr() {
+        return (frameNameExpr);
+    }
+
     /**
-     * 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 "longdesc" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "longdesc" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getLongdescExpr() { return (longdescExpr); }
+    public String getLongdescExpr() {
+        return (longdescExpr);
+    }
+
     /**
-     * Getter method for "marginheight" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "marginheight" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getMarginheightExpr() { return (marginheightExpr); }
+    public String getMarginheightExpr() {
+        return (marginheightExpr);
+    }
+
     /**
-     * Getter method for "marginwidth" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "marginwidth" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public String getMarginwidthExpr() { return (marginwidthExpr); }
+    public String getMarginwidthExpr() {
+        return (marginwidthExpr);
+    }
+
     /**
-     * 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 "noresize" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "noresize" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getNoresizeExpr() { return (noresizeExpr); }
+    public String getNoresizeExpr() {
+        return (noresizeExpr);
+    }
+
     /**
-     * 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 "scrolling" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Getter method for "scrolling" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public String getScrollingExpr() { return (scrollingExpr); }
+    public String getScrollingExpr() {
+        return (scrollingExpr);
+    }
+
     /**
-     * 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 "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 "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);
+    }
 
     /**
-     * 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 "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 "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 "frameborder" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "frameborder" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setFrameborderExpr(String frameborderExpr) { this.frameborderExpr = frameborderExpr; }
+    public void setFrameborderExpr(String frameborderExpr) {
+        this.frameborderExpr = frameborderExpr;
+    }
+
     /**
-     * Setter method for "frameName" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "frameName" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setFrameNameExpr(String frameNameExpr) { this.frameNameExpr = frameNameExpr; }
+    public void setFrameNameExpr(String frameNameExpr) {
+        this.frameNameExpr = frameNameExpr;
+    }
+
     /**
-     * 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 "longdesc" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "longdesc" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setLongdescExpr(String longdescExpr) { this.longdescExpr = longdescExpr; }
+    public void setLongdescExpr(String longdescExpr) {
+        this.longdescExpr = longdescExpr;
+    }
+
     /**
-     * Setter method for "marginheight" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "marginheight" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setMarginheightExpr(String marginheightExpr) { this.marginheightExpr = marginheightExpr; }
+    public void setMarginheightExpr(String marginheightExpr) {
+        this.marginheightExpr = marginheightExpr;
+    }
+
     /**
-     * Setter method for "marginwidth" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "marginwidth" tag attribute. (Mapping set in
+     * associated BeanInfo class.)
      */
-    public void setMarginwidthExpr(String marginwidthExpr) { this.marginwidthExpr = marginwidthExpr; }
+    public void setMarginwidthExpr(String marginwidthExpr) {
+        this.marginwidthExpr = marginwidthExpr;
+    }
+
     /**
-     * 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 "noresize" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "noresize" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setNoresizeExpr(String noresizeExpr) { this.noresizeExpr = noresizeExpr; }
+    public void setNoresizeExpr(String noresizeExpr) {
+        this.noresizeExpr = noresizeExpr;
+    }
+
     /**
-     * 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 "scrolling" tag attribute.
-     * (Mapping set in associated BeanInfo class.)
+     * Setter method for "scrolling" tag attribute. (Mapping set in associated
+     * BeanInfo class.)
      */
-    public void setScrollingExpr(String scrollingExpr) { this.scrollingExpr = scrollingExpr; }
+    public void setScrollingExpr(String scrollingExpr) {
+        this.scrollingExpr = scrollingExpr;
+    }
+
     /**
-     * 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 "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 "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;
+    }
 
     /**
      * Resets attribute values for tag reuse.
      */
-    public void release()
-    {
+    public void release() {
         super.release();
         setActionExpr(null);
         setModuleExpr(null);
@@ -494,10 +674,11 @@
     /**
      * 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());
     }
 
@@ -505,119 +686,168 @@
      * 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;
+    private void evaluateExpressions()
+        throws JspException {
+        String string = null;
         Integer integer = null;
-        Boolean bool    = null;
+        Boolean bool = null;
 
-        if ((string = EvalHelper.evalString("action", getActionExpr(),
-                                            this, pageContext)) != 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("bundle", getBundleExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("bundle", getBundleExpr(), this,
+                    pageContext)) != null) {
             setBundle(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("frameborder", getFrameborderExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("frameborder", getFrameborderExpr(),
+                    this, pageContext)) != null) {
             setFrameborder(string);
+        }
 
-        if ((string = EvalHelper.evalString("frameName", getFrameNameExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("frameName", getFrameNameExpr(), this,
+                    pageContext)) != null) {
             setFrameName(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("longdesc", getLongdescExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("longdesc", getLongdescExpr(), this,
+                    pageContext)) != null) {
             setLongdesc(string);
+        }
 
-        if ((integer = EvalHelper.evalInteger("marginheight", getMarginheightExpr(),
-                                              this, pageContext)) != null)
+        if ((integer =
+                EvalHelper.evalInteger("marginheight", getMarginheightExpr(),
+                    this, pageContext)) != null) {
             setMarginheight(integer);
+        }
 
-        if ((integer = EvalHelper.evalInteger("marginwidth", getMarginwidthExpr(),
-                                              this, pageContext)) != null)
+        if ((integer =
+                EvalHelper.evalInteger("marginwidth", getMarginwidthExpr(),
+                    this, pageContext)) != null) {
             setMarginwidth(integer);
+        }
 
-        if ((string = EvalHelper.evalString("name", getNameExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("name", getNameExpr(), this, pageContext)) != null) {
             setName(string);
+        }
 
-        if ((bool = EvalHelper.evalBoolean("noresize", getNoresizeExpr(),
-                                           this, pageContext)) != null)
+        if ((bool =
+                EvalHelper.evalBoolean("noresize", getNoresizeExpr(), this,
+                    pageContext)) != null) {
             setNoresize(bool.booleanValue());
+        }
 
-        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 ((string = EvalHelper.evalString("scrolling", getScrollingExpr(),
-                                            this, pageContext)) != null)
+        if ((string =
+                EvalHelper.evalString("scrolling", getScrollingExpr(), this,
+                    pageContext)) != null) {
             setScrolling(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("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 ((bool = EvalHelper.evalBoolean("transaction", getTransactionExpr(),
-                                           this, pageContext)) != null)
+        if ((bool =
+                EvalHelper.evalBoolean("transaction", getTransactionExpr(),
+                    this, pageContext)) != null) {
             setTransaction(bool.booleanValue());
+        }
     }
 }

Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFrameTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFrameTagBeanInfo.java?rev=376779&r1=376778&r2=376779&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFrameTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/html/ELFrameTagBeanInfo.java Fri Feb 10 10:08:58 2006
@@ -1,158 +1,207 @@
 /*
- * $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.ELFrameTag</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.
+ * <code>org.apache.strutsel.taglib.html.ELFrameTag</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.
  */
-public class ELFrameTagBeanInfo extends SimpleBeanInfo
-{
-    public  PropertyDescriptor[] getPropertyDescriptors()
-    {
+public class ELFrameTagBeanInfo extends SimpleBeanInfo {
+    public PropertyDescriptor[] getPropertyDescriptors() {
         ArrayList proplist = new ArrayList();
 
         try {
             proplist.add(new PropertyDescriptor("action", ELFrameTag.class,
-                                                null, "setActionExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setActionExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("module", ELFrameTag.class,
-                                                null, "setModuleExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setModuleExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("anchor", ELFrameTag.class,
-                                                null, "setAnchorExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setAnchorExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("bundle", ELFrameTag.class,
-                                                null, "setBundleExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setBundleExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("forward", ELFrameTag.class,
-                                                null, "setForwardExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setForwardExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("frameborder", ELFrameTag.class,
-                                                null, "setFrameborderExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("frameborder",
+                    ELFrameTag.class, null, "setFrameborderExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("frameName", ELFrameTag.class,
-                                                null, "setFrameNameExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setFrameNameExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("href", ELFrameTag.class,
-                                                null, "setHrefExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("href", ELFrameTag.class, null,
+                    "setHrefExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("longdesc", ELFrameTag.class,
-                                                null, "setLongdescExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setLongdescExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("marginheight", ELFrameTag.class,
-                                                null, "setMarginheightExpr"));
-        } catch (IntrospectionException ex) {}
-        try {
-            proplist.add(new PropertyDescriptor("marginwidth", ELFrameTag.class,
-                                                null, "setMarginwidthExpr"));
-        } catch (IntrospectionException ex) {}
-        try {
-            proplist.add(new PropertyDescriptor("name", ELFrameTag.class,
-                                                null, "setNameExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("marginheight",
+                    ELFrameTag.class, null, "setMarginheightExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        try {
+            proplist.add(new PropertyDescriptor("marginwidth",
+                    ELFrameTag.class, null, "setMarginwidthExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
+        try {
+            proplist.add(new PropertyDescriptor("name", ELFrameTag.class, null,
+                    "setNameExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("noresize", ELFrameTag.class,
-                                                null, "setNoresizeExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setNoresizeExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("page", ELFrameTag.class,
-                                                null, "setPageExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("page", ELFrameTag.class, null,
+                    "setPageExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("paramId", ELFrameTag.class,
-                                                null, "setParamIdExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setParamIdExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("paramName", ELFrameTag.class,
-                                                null, "setParamNameExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setParamNameExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("paramProperty", ELFrameTag.class,
-                                                null, "setParamPropertyExpr"));
-        } catch (IntrospectionException ex) {}
+            proplist.add(new PropertyDescriptor("paramProperty",
+                    ELFrameTag.class, null, "setParamPropertyExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("paramScope", ELFrameTag.class,
-                                                null, "setParamScopeExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setParamScopeExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("property", ELFrameTag.class,
-                                                null, "setPropertyExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setPropertyExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("scope", ELFrameTag.class,
-                                                null, "setScopeExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setScopeExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("scrolling", ELFrameTag.class,
-                                                null, "setScrollingExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setScrollingExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("style", ELFrameTag.class,
-                                                null, "setStyleExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setStyleExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("styleClass", ELFrameTag.class,
-                                                null, "setStyleClassExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setStyleClassExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("styleId", ELFrameTag.class,
-                                                null, "setStyleIdExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setStyleIdExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("title", ELFrameTag.class,
-                                                null, "setTitleExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setTitleExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
             proplist.add(new PropertyDescriptor("titleKey", ELFrameTag.class,
-                                                null, "setTitleKeyExpr"));
-        } catch (IntrospectionException ex) {}
+                    null, "setTitleKeyExpr"));
+        } catch (IntrospectionException ex) {
+        }
+
         try {
-            proplist.add(new PropertyDescriptor("transaction", ELFrameTag.class,
-                                                null, "setTransactionExpr"));
-        } catch (IntrospectionException ex) {}
-        
-        PropertyDescriptor[] result =
-            new PropertyDescriptor[proplist.size()];
+            proplist.add(new PropertyDescriptor("transaction",
+                    ELFrameTag.class, null, "setTransactionExpr"));
+        } 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