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:25 UTC
svn commit: r376780 [1/3] -
/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/
Author: husted
Date: Fri Feb 10 10:09:22 2006
New Revision: 376780
URL: http://svn.apache.org/viewcvs?rev=376780&view=rev
Log:
Checkstyle Roundup
* EL package reformatted with latest Jalopy settings. Stylistic changes only.
Modified:
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELForwardTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELForwardTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELIterateTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELIterateTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchSupport.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesPresentTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesPresentTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELNotMatchTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELNotMatchTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELNotPresentTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELNotPresentTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELPresentTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELPresentTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELRedirectTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELRedirectTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/package.html
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELForwardTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELForwardTag.java?rev=376780&r1=376779&r2=376780&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELForwardTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELForwardTag.java Fri Feb 10 10:09:22 2006
@@ -1,89 +1,92 @@
/*
- * $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.logic;
import org.apache.struts.taglib.logic.ForwardTag;
-import javax.servlet.jsp.JspException;
import org.apache.strutsel.taglib.utils.EvalHelper;
+import javax.servlet.jsp.JspException;
+
/**
* Perform a forward or redirect to a page that is looked up in the
- * configuration information associated with our application.
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.logix.ForwardTag</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.
+ * configuration information associated with our application. <p> This class
+ * is a subclass of the class <code>org.apache.struts.taglib.logix.ForwardTag</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 ELForwardTag extends ForwardTag {
-
/**
- * 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;
/**
- * 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);
+ }
/**
- * 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;
+ }
/**
* Resets attribute values for tag reuse.
*/
- public void release()
- {
+ public void release() {
super.release();
setNameExpr(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;
+ private void evaluateExpressions()
+ throws JspException {
+ String string = null;
- if ((string = EvalHelper.evalString("name", getNameExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("name", getNameExpr(), this, pageContext)) != null) {
setName(string);
+ }
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELForwardTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELForwardTagBeanInfo.java?rev=376780&r1=376779&r2=376780&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELForwardTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELForwardTagBeanInfo.java Fri Feb 10 10:09:22 2006
@@ -1,54 +1,51 @@
/*
- * $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.logic;
import java.beans.IntrospectionException;
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.logic.ELForwardTag</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 ELForwardTagBeanInfo extends SimpleBeanInfo
-{
- public PropertyDescriptor[] getPropertyDescriptors()
- {
+public class ELForwardTagBeanInfo extends SimpleBeanInfo {
+ public PropertyDescriptor[] getPropertyDescriptors() {
ArrayList proplist = new ArrayList();
try {
proplist.add(new PropertyDescriptor("name", ELForwardTag.class,
- null, "setNameExpr"));
- } catch (IntrospectionException ex) {}
-
- PropertyDescriptor[] result =
- new PropertyDescriptor[proplist.size()];
+ null, "setNameExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()];
+
return ((PropertyDescriptor[]) proplist.toArray(result));
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELIterateTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELIterateTag.java?rev=376780&r1=376779&r2=376780&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELIterateTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELIterateTag.java Fri Feb 10 10:09:22 2006
@@ -1,187 +1,243 @@
/*
- * $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.logic;
import org.apache.struts.taglib.logic.IterateTag;
-import javax.servlet.jsp.JspException;
import org.apache.strutsel.taglib.utils.EvalHelper;
+import javax.servlet.jsp.JspException;
+
/**
- * Custom tag that iterates the elements of a collection, which can be
- * either an attribute or the property of an attribute. The collection
- * can be any of the following: an array of objects, an Enumeration,
- * an Iterator, a Collection (which includes Lists, Sets and Vectors),
- * or a Map (which includes Hashtables) whose elements will be iterated over.
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.logic.IterateTag</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.
+ * Custom tag that iterates the elements of a collection, which can be either
+ * an attribute or the property of an attribute. The collection can be any of
+ * the following: an array of objects, an Enumeration, an Iterator, a
+ * Collection (which includes Lists, Sets and Vectors), or a Map (which
+ * includes Hashtables) whose elements will be iterated over. <p> This class
+ * is a subclass of the class <code>org.apache.struts.taglib.logic.IterateTag</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 ELIterateTag extends IterateTag {
-
/**
- * Instance variable mapped to "collection" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "collection" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String collectionExpr;
+
/**
- * Instance variable mapped to "id" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "id" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String idExpr;
+
/**
- * Instance variable mapped to "indexId" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "indexId" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String indexIdExpr;
+
/**
- * Instance variable mapped to "length" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "length" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String lengthExpr;
+
/**
- * 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 "offset" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "offset" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String offsetExpr;
+
/**
- * 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 "type" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "type" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String typeExpr;
/**
- * Getter method for "collection" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "collection" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
- public String getCollectionExpr() { return (collectionExpr); }
+ public String getCollectionExpr() {
+ return (collectionExpr);
+ }
+
/**
- * Getter method for "id" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "id" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getIdExpr() { return (idExpr); }
+ public String getIdExpr() {
+ return (idExpr);
+ }
+
/**
- * Getter method for "indexId" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "indexId" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getIndexIdExpr() { return (indexIdExpr); }
+ public String getIndexIdExpr() {
+ return (indexIdExpr);
+ }
+
/**
- * Getter method for "length" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "length" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getLengthExpr() { return (lengthExpr); }
+ public String getLengthExpr() {
+ return (lengthExpr);
+ }
+
/**
- * 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 "offset" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "offset" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getOffsetExpr() { return (offsetExpr); }
+ public String getOffsetExpr() {
+ return (offsetExpr);
+ }
+
/**
- * 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 "type" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "type" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getTypeExpr() { return (typeExpr); }
+ public String getTypeExpr() {
+ return (typeExpr);
+ }
/**
- * Setter method for "collection" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "collection" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
- public void setCollectionExpr(String collectionExpr) { this.collectionExpr = collectionExpr; }
+ public void setCollectionExpr(String collectionExpr) {
+ this.collectionExpr = collectionExpr;
+ }
+
/**
- * Setter method for "id" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "id" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setIdExpr(String idExpr) { this.idExpr = idExpr; }
+ public void setIdExpr(String idExpr) {
+ this.idExpr = idExpr;
+ }
+
/**
- * Setter method for "indexId" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "indexId" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setIndexIdExpr(String indexIdExpr) { this.indexIdExpr = indexIdExpr; }
+ public void setIndexIdExpr(String indexIdExpr) {
+ this.indexIdExpr = indexIdExpr;
+ }
+
/**
- * Setter method for "length" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "length" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setLengthExpr(String lengthExpr) { this.lengthExpr = lengthExpr; }
+ public void setLengthExpr(String lengthExpr) {
+ this.lengthExpr = lengthExpr;
+ }
+
/**
- * 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 "offset" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "offset" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setOffsetExpr(String offsetExpr) { this.offsetExpr = offsetExpr; }
+ public void setOffsetExpr(String offsetExpr) {
+ this.offsetExpr = offsetExpr;
+ }
+
/**
- * 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 "type" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "type" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setTypeExpr(String typeExpr) { this.typeExpr = typeExpr; }
+ public void setTypeExpr(String typeExpr) {
+ this.typeExpr = typeExpr;
+ }
/**
* Releases state of custom tag so this instance can be reused.
*/
- public void release()
- {
+ public void release() {
super.release();
setCollectionExpr(null);
setIdExpr(null);
@@ -197,57 +253,73 @@
/**
* 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;
- Object object = null;
-
- if ((object = EvalHelper.eval("collection", getCollectionExpr(),
- this, pageContext)) != null)
+ private void evaluateExpressions()
+ throws JspException {
+ String string = null;
+ Object object = null;
+
+ if ((object =
+ EvalHelper.eval("collection", getCollectionExpr(), this,
+ pageContext)) != null) {
setCollection(object);
+ }
- if ((string = EvalHelper.evalString("id", getIdExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("id", getIdExpr(), this, pageContext)) != null) {
setId(string);
+ }
- if ((string = EvalHelper.evalString("indexId", getIndexIdExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("indexId", getIndexIdExpr(), this,
+ pageContext)) != null) {
setIndexId(string);
+ }
- if ((string = EvalHelper.evalString("length", getLengthExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("length", getLengthExpr(), this,
+ pageContext)) != null) {
setLength(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("offset", getOffsetExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("offset", getOffsetExpr(), this,
+ pageContext)) != null) {
setOffset(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("type", getTypeExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("type", getTypeExpr(), this, pageContext)) != null) {
setType(string);
+ }
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELIterateTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELIterateTagBeanInfo.java?rev=376780&r1=376779&r2=376780&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELIterateTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELIterateTagBeanInfo.java Fri Feb 10 10:09:22 2006
@@ -1,86 +1,99 @@
/*
- * $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.logic;
import java.beans.IntrospectionException;
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.bean.ELIterateTag</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 ELIterateTagBeanInfo extends SimpleBeanInfo
-{
- public PropertyDescriptor[] getPropertyDescriptors()
- {
+public class ELIterateTagBeanInfo extends SimpleBeanInfo {
+ public PropertyDescriptor[] getPropertyDescriptors() {
ArrayList proplist = new ArrayList();
try {
- proplist.add(new PropertyDescriptor("collection", ELIterateTag.class,
- null, "setCollectionExpr"));
- } catch (IntrospectionException ex) {}
- try {
- proplist.add(new PropertyDescriptor("id", ELIterateTag.class,
- null, "setIdExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("collection",
+ ELIterateTag.class, null, "setCollectionExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ try {
+ proplist.add(new PropertyDescriptor("id", ELIterateTag.class, null,
+ "setIdExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("indexId", ELIterateTag.class,
- null, "setIndexIdExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setIndexIdExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("length", ELIterateTag.class,
- null, "setLengthExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setLengthExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("name", ELIterateTag.class,
- null, "setNameExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setNameExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("offset", ELIterateTag.class,
- null, "setOffsetExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setOffsetExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("property", ELIterateTag.class,
- null, "setPropertyExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setPropertyExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("scope", ELIterateTag.class,
- null, "setScopeExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setScopeExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("type", ELIterateTag.class,
- null, "setTypeExpr"));
- } catch (IntrospectionException ex) {}
-
- PropertyDescriptor[] result =
- new PropertyDescriptor[proplist.size()];
+ null, "setTypeExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()];
+
return ((PropertyDescriptor[]) proplist.toArray(result));
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchSupport.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchSupport.java?rev=376780&r1=376779&r2=376780&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchSupport.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchSupport.java Fri Feb 10 10:09:22 2006
@@ -1,33 +1,32 @@
/*
- * $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.logic;
+import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
+
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
-import org.apache.struts.taglib.TagUtils;
/**
- * This class is used as a helper class for both the
- * <code>org.apache.strutsel.taglib.logic.ELMatchTag</code> and
- * <code>org.apache.strutsel.taglib.logic.ELNotMatchTag</code> classes. It's
- * <code>condition</code> method encapsulates the common logic needed to
+ * This class is used as a helper class for both the <code>org.apache.strutsel.taglib.logic.ELMatchTag</code>
+ * and <code>org.apache.strutsel.taglib.logic.ELNotMatchTag</code> classes.
+ * It's <code>condition</code> method encapsulates the common logic needed to
* examine the <code>location</code> attribute to determine how to do the
* comparison.
*/
@@ -36,32 +35,29 @@
* Performs a comparison of an expression and a value, with an optional
* location specifier in the expression (start or end).
*
- * @param desired Indication of whether the "truth" value of the comparison
- * is whether the expression and value are equal, or not equal.
- * @param expr Expression to test against a value.
- * @param value Value to test against an expression.
- * @param location if set, is "start" or "end" to indicate to look at the
- * start or end of the expression for the value. If null, look anywhere in
- * the expression.
- * @param messages <code>MessageResources</code> object to reference for
- * error message text.
+ * @param desired Indication of whether the "truth" value of the
+ * comparison is whether the expression and value are
+ * equal, or not equal.
+ * @param expr Expression to test against a value.
+ * @param value Value to test against an expression.
+ * @param location if set, is "start" or "end" to indicate to look at
+ * the start or end of the expression for the value.
+ * If null, look anywhere in the expression.
+ * @param messages <code>MessageResources</code> object to reference
+ * for error message text.
* @param pageContext used to save exception information, if needed.
* @return true if comparison result equals desired value, false
- * otherwise.
+ * otherwise.
*/
- public static boolean condition(boolean desired,
- String expr,
- String value,
- String location,
- MessageResources messages,
- PageContext pageContext)
- throws JspException
- {
- boolean result = false;
+ public static boolean condition(boolean desired, String expr, String value,
+ String location, MessageResources messages, PageContext pageContext)
+ throws JspException {
+ boolean result = false;
if (expr != null) {
// Perform the comparison requested by the location attribute
boolean matched = false;
+
if (location == null) {
matched = (expr.indexOf(value) >= 0);
} else if (location.equals("start")) {
@@ -69,13 +65,15 @@
} else if (location.equals("end")) {
matched = expr.endsWith(value);
} else {
- JspException e = new JspException
- (messages.getMessage("logic.location", location));
+ JspException e =
+ new JspException(messages.getMessage("logic.location",
+ location));
+
TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
- result = (matched == desired);
+ result = (matched == desired);
}
return (result);
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchTag.java?rev=376780&r1=376779&r2=376780&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchTag.java Fri Feb 10 10:09:22 2006
@@ -1,209 +1,258 @@
/*
- * $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.logic;
import org.apache.struts.taglib.logic.MatchTag;
-import javax.servlet.jsp.JspException;
import org.apache.strutsel.taglib.utils.EvalHelper;
+import javax.servlet.jsp.JspException;
+
/**
- * Evalute the nested body content of this tag if the specified value
- * is a substring of the specified variable.
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.logic.MatchTag</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.
+ * Evalute the nested body content of this tag if the specified value is a
+ * substring of the specified variable. <p> This class is a subclass of the
+ * class <code>org.apache.struts.taglib.logic.MatchTag</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 ELMatchTag extends MatchTag {
-
/**
- * Instance variable mapped to "cookie" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "cookie" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String cookieExpr;
+
/**
- * Instance variable mapped to "header" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "header" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String headerExpr;
+
/**
- * Instance variable mapped to "location" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "location" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String locationExpr;
+
/**
- * 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 "parameter" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "parameter" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String parameterExpr;
+
/**
- * 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 "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 "cookie" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * String value of expression to be evaluated.
*/
- public String getCookieExpr() { return (cookieExpr); }
+ private String expr;
+
/**
- * Getter method for "header" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Evaluated value of expression.
*/
- public String getHeaderExpr() { return (headerExpr); }
+ private String exprValue;
+
/**
- * Getter method for "location" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "cookie" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getLocationExpr() { return (locationExpr); }
+ public String getCookieExpr() {
+ return (cookieExpr);
+ }
+
/**
- * Getter method for "name" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "header" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getNameExpr() { return (nameExpr); }
+ public String getHeaderExpr() {
+ return (headerExpr);
+ }
+
/**
- * Getter method for "parameter" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "location" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getParameterExpr() { return (parameterExpr); }
+ public String getLocationExpr() {
+ return (locationExpr);
+ }
+
/**
- * Getter method for "property" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "name" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getPropertyExpr() { return (propertyExpr); }
+ public String getNameExpr() {
+ return (nameExpr);
+ }
+
/**
- * Getter method for "scope" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "parameter" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getScopeExpr() { return (scopeExpr); }
+ public String getParameterExpr() {
+ return (parameterExpr);
+ }
+
/**
- * Getter method for "value" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "property" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getValueExpr() { return (valueExpr); }
+ public String getPropertyExpr() {
+ return (propertyExpr);
+ }
/**
- * Setter method for "cookie" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "scope" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setCookieExpr(String cookieExpr) { this.cookieExpr = cookieExpr; }
+ public String getScopeExpr() {
+ return (scopeExpr);
+ }
+
/**
- * Setter method for "header" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "value" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setHeaderExpr(String headerExpr) { this.headerExpr = headerExpr; }
+ public String getValueExpr() {
+ return (valueExpr);
+ }
+
/**
- * Setter method for "location" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "cookie" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setLocationExpr(String locationExpr) { this.locationExpr = locationExpr; }
+ public void setCookieExpr(String cookieExpr) {
+ this.cookieExpr = cookieExpr;
+ }
+
/**
- * Setter method for "name" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "header" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setNameExpr(String nameExpr) { this.nameExpr = nameExpr; }
+ public void setHeaderExpr(String headerExpr) {
+ this.headerExpr = headerExpr;
+ }
+
/**
- * Setter method for "parameter" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "location" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setParameterExpr(String parameterExpr) { this.parameterExpr = parameterExpr; }
+ public void setLocationExpr(String locationExpr) {
+ this.locationExpr = locationExpr;
+ }
+
/**
- * Setter method for "property" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "name" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setPropertyExpr(String propertyExpr) { this.propertyExpr = propertyExpr; }
+ public void setNameExpr(String nameExpr) {
+ this.nameExpr = nameExpr;
+ }
+
/**
- * Setter method for "scope" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "parameter" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setScopeExpr(String scopeExpr) { this.scopeExpr = scopeExpr; }
+ public void setParameterExpr(String parameterExpr) {
+ this.parameterExpr = parameterExpr;
+ }
+
/**
- * Setter method for "value" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "property" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setValueExpr(String valueExpr) { this.valueExpr = valueExpr; }
+ public void setPropertyExpr(String propertyExpr) {
+ this.propertyExpr = propertyExpr;
+ }
/**
- * String value of expression to be evaluated.
+ * Setter method for "scope" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- private String expr;
+ public void setScopeExpr(String scopeExpr) {
+ this.scopeExpr = scopeExpr;
+ }
+
+ /**
+ * Setter method for "value" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
+ */
+ public void setValueExpr(String valueExpr) {
+ this.valueExpr = valueExpr;
+ }
/**
* Returns the string value of the expression. This value will be
* evaluated by the JSTL EL engine.
*/
- public String getExpr() {
+ public String getExpr() {
return (expr);
}
-
+
/**
* Sets the string value of the expression. This expression will be
* evaluated by the JSTL EL engine.
*/
- public void setExpr(String expr) {
+ public void setExpr(String expr) {
this.expr = expr;
}
/**
- * Evaluated value of expression.
- */
- private String exprValue;
-
- /**
* Returns the evaluated expression.
*/
- public String getExprValue() {
+ public String getExprValue() {
return (exprValue);
}
/**
* Sets the evaluated expression.
*/
- public void setExprValue(String exprValue) {
- this.exprValue = exprValue;
+ public void setExprValue(String exprValue) {
+ this.exprValue = exprValue;
}
-
+
/**
* Releases state of custom tag so this instance can be reused.
*/
- public void release()
- {
+ public void release() {
super.release();
setCookieExpr(null);
setHeaderExpr(null);
@@ -216,14 +265,15 @@
setExpr(null);
setExprValue(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());
}
@@ -233,64 +283,81 @@
* should be evaluated, or <code>false</code> if it should be skipped.
*
* @param desired Desired value for a true result
- * @exception JspException if a JSP exception occurs
+ * @throws JspException if a JSP exception occurs
*/
- protected boolean condition(boolean desired) throws JspException {
- boolean result = false;
+ protected boolean condition(boolean desired)
+ throws JspException {
+ boolean result = false;
+
if (getExprValue() != null) {
- result =
+ result =
ELMatchSupport.condition(desired, getExprValue(), value,
- location, messages, pageContext);
- }
- else {
- result = super.condition(desired);
+ location, messages, pageContext);
+ } else {
+ result = super.condition(desired);
}
+
return (result);
}
-
+
/**
* 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;
-
- if ((string = EvalHelper.evalString("cookie", getCookieExpr(),
- this, pageContext)) != null)
+ private void evaluateExpressions()
+ throws JspException {
+ String string = null;
+
+ if ((string =
+ EvalHelper.evalString("cookie", getCookieExpr(), this,
+ pageContext)) != null) {
setCookie(string);
+ }
- if ((string = EvalHelper.evalString("expr", getExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("expr", getExpr(), this, pageContext)) != null) {
setExprValue(string);
+ }
- if ((string = EvalHelper.evalString("header", getHeaderExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("header", getHeaderExpr(), this,
+ pageContext)) != null) {
setHeader(string);
+ }
- if ((string = EvalHelper.evalString("location", getLocationExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("location", getLocationExpr(), this,
+ pageContext)) != null) {
setLocation(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("parameter", getParameterExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("parameter", getParameterExpr(), this,
+ pageContext)) != null) {
setParameter(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("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/logic/ELMatchTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchTagBeanInfo.java?rev=376780&r1=376779&r2=376780&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMatchTagBeanInfo.java Fri Feb 10 10:09:22 2006
@@ -1,86 +1,99 @@
/*
- * $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.logic;
import java.beans.IntrospectionException;
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.logic.ELMatchTag</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 ELMatchTagBeanInfo extends SimpleBeanInfo
-{
- public PropertyDescriptor[] getPropertyDescriptors()
- {
+public class ELMatchTagBeanInfo extends SimpleBeanInfo {
+ public PropertyDescriptor[] getPropertyDescriptors() {
ArrayList proplist = new ArrayList();
try {
proplist.add(new PropertyDescriptor("cookie", ELMatchTag.class,
- null, "setCookieExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setCookieExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("header", ELMatchTag.class,
- null, "setHeaderExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setHeaderExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("location", ELMatchTag.class,
- null, "setLocationExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setLocationExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("name", ELMatchTag.class,
- null, "setNameExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("name", ELMatchTag.class, null,
+ "setNameExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("parameter", ELMatchTag.class,
- null, "setParameterExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setParameterExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("property", ELMatchTag.class,
- null, "setPropertyExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setPropertyExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("scope", ELMatchTag.class,
- null, "setScopeExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setScopeExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("value", ELMatchTag.class,
- null, "setValueExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setValueExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("expr", ELMatchTag.class,
- null, "setExpr"));
- } catch (IntrospectionException ex) {}
-
- PropertyDescriptor[] result =
- new PropertyDescriptor[proplist.size()];
+ proplist.add(new PropertyDescriptor("expr", ELMatchTag.class, null,
+ "setExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()];
+
return ((PropertyDescriptor[]) proplist.toArray(result));
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTag.java?rev=376780&r1=376779&r2=376780&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTag.java Fri Feb 10 10:09:22 2006
@@ -1,131 +1,152 @@
/*
- * $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.logic;
import org.apache.struts.taglib.logic.MessagesNotPresentTag;
-import javax.servlet.jsp.JspException;
import org.apache.strutsel.taglib.utils.EvalHelper;
+import javax.servlet.jsp.JspException;
+
/**
* Evalute to <code>false</code> if an <code>ActionMessages</code> class or a
* class that can be converted to an <code>ActionMessages</code> class is in
* request scope under the specified key and there is at least one message in
- * the class or for the property specified.
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.logic.MessagesNotPresentTag</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.
+ * the class or for the property specified. <p> This class is a subclass of
+ * the class <code>org.apache.struts.taglib.logic.MessagesNotPresentTag</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 ELMessagesNotPresentTag extends MessagesNotPresentTag {
-
/**
- * 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 "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 "message" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "message" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String messageExpr;
/**
- * 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 "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 "message" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "message" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getMessageExpr() { return (messageExpr); }
+ public String getMessageExpr() {
+ return (messageExpr);
+ }
/**
- * 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 "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 "message" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "message" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setMessageExpr(String messageExpr) { this.messageExpr = messageExpr; }
+ public void setMessageExpr(String messageExpr) {
+ this.messageExpr = messageExpr;
+ }
/**
* Releases state of custom tag so this instance can be reused.
*/
- public void release()
- {
+ public void release() {
super.release();
setNameExpr(null);
setPropertyExpr(null);
setMessageExpr(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());
}
-
+
/**
* 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;
- if ((string = EvalHelper.evalString("name", getNameExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("name", getNameExpr(), this, pageContext)) != null) {
setName(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("message", getMessageExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("message", getMessageExpr(), this,
+ pageContext)) != null) {
setMessage(string);
+ }
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTagBeanInfo.java?rev=376780&r1=376779&r2=376780&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTagBeanInfo.java Fri Feb 10 10:09:22 2006
@@ -1,62 +1,64 @@
/*
- * $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.logic;
import java.beans.IntrospectionException;
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.logic.ELMessagesNotPresentTag</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.logic.ELMessagesNotPresentTag</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 ELMessagesNotPresentTagBeanInfo extends SimpleBeanInfo
-{
- public PropertyDescriptor[] getPropertyDescriptors()
- {
+public class ELMessagesNotPresentTagBeanInfo extends SimpleBeanInfo {
+ public PropertyDescriptor[] getPropertyDescriptors() {
ArrayList proplist = new ArrayList();
try {
- proplist.add(new PropertyDescriptor("name", ELMessagesNotPresentTag.class,
- null, "setNameExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("name",
+ ELMessagesNotPresentTag.class, null, "setNameExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("property", ELMessagesNotPresentTag.class,
- null, "setPropertyExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("property",
+ ELMessagesNotPresentTag.class, null, "setPropertyExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("message", ELMessagesNotPresentTag.class,
- null, "setMessageExpr"));
- } catch (IntrospectionException ex) {}
-
- PropertyDescriptor[] result =
- new PropertyDescriptor[proplist.size()];
+ proplist.add(new PropertyDescriptor("message",
+ ELMessagesNotPresentTag.class, null, "setMessageExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()];
+
return ((PropertyDescriptor[]) proplist.toArray(result));
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesPresentTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesPresentTag.java?rev=376780&r1=376779&r2=376780&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesPresentTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesPresentTag.java Fri Feb 10 10:09:22 2006
@@ -1,131 +1,152 @@
/*
- * $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.logic;
import org.apache.struts.taglib.logic.MessagesPresentTag;
-import javax.servlet.jsp.JspException;
import org.apache.strutsel.taglib.utils.EvalHelper;
+import javax.servlet.jsp.JspException;
+
/**
* Evalute to <code>true</code> if an <code>ActionMessages</code> class or a
* class that can be converted to an <code>ActionMessages</code> class is in
* request scope under the specified key and there is at least one message in
- * the class or for the property specified.
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.logic.MessagesPresentTag</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.
+ * the class or for the property specified. <p> This class is a subclass of
+ * the class <code>org.apache.struts.taglib.logic.MessagesPresentTag</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 ELMessagesPresentTag extends MessagesPresentTag {
-
/**
- * 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 "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 "message" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "message" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String messageExpr;
/**
- * 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 "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 "message" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "message" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getMessageExpr() { return (messageExpr); }
+ public String getMessageExpr() {
+ return (messageExpr);
+ }
/**
- * 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 "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 "message" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "message" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setMessageExpr(String messageExpr) { this.messageExpr = messageExpr; }
+ public void setMessageExpr(String messageExpr) {
+ this.messageExpr = messageExpr;
+ }
/**
* Releases state of custom tag so this instance can be reused.
*/
- public void release()
- {
+ public void release() {
super.release();
setNameExpr(null);
setPropertyExpr(null);
setMessageExpr(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());
}
-
+
/**
* 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;
- if ((string = EvalHelper.evalString("name", getNameExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("name", getNameExpr(), this, pageContext)) != null) {
setName(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("message", getMessageExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("message", getMessageExpr(), this,
+ pageContext)) != null) {
setMessage(string);
+ }
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesPresentTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesPresentTagBeanInfo.java?rev=376780&r1=376779&r2=376780&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesPresentTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/logic/ELMessagesPresentTagBeanInfo.java Fri Feb 10 10:09:22 2006
@@ -1,62 +1,63 @@
/*
- * $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.logic;
import java.beans.IntrospectionException;
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.logic.ELMessagesPresentTag</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.logic.ELMessagesPresentTag</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 ELMessagesPresentTagBeanInfo extends SimpleBeanInfo
-{
- public PropertyDescriptor[] getPropertyDescriptors()
- {
+public class ELMessagesPresentTagBeanInfo extends SimpleBeanInfo {
+ public PropertyDescriptor[] getPropertyDescriptors() {
ArrayList proplist = new ArrayList();
try {
- proplist.add(new PropertyDescriptor("name", ELMessagesPresentTag.class,
- null, "setNameExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("name",
+ ELMessagesPresentTag.class, null, "setNameExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("property", ELMessagesPresentTag.class,
- null, "setPropertyExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("property",
+ ELMessagesPresentTag.class, null, "setPropertyExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("message", ELMessagesPresentTag.class,
- null, "setMessageExpr"));
- } catch (IntrospectionException ex) {}
-
- PropertyDescriptor[] result =
- new PropertyDescriptor[proplist.size()];
+ proplist.add(new PropertyDescriptor("message",
+ ELMessagesPresentTag.class, null, "setMessageExpr"));
+ } 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