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:49 UTC
svn commit: r376781 [1/2] -
/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/
Author: husted
Date: Fri Feb 10 10:09:48 2006
New Revision: 376781
URL: http://svn.apache.org/viewcvs?rev=376781&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/tiles/ELAddTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELAddTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELDefinitionTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELDefinitionTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetAttributeTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetAttributeTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELImportAttributeTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELImportAttributeTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInsertTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInsertTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELPutListTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELPutListTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELPutTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELPutTagBeanInfo.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELUseAttributeTag.java
struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELUseAttributeTagBeanInfo.java
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELAddTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELAddTag.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELAddTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELAddTag.java Fri Feb 10 10:09:48 2006
@@ -1,32 +1,30 @@
/*
- * $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.tiles;
import org.apache.struts.tiles.taglib.AddTag;
-import javax.servlet.jsp.JspException;
import org.apache.strutsel.taglib.utils.EvalHelper;
+import javax.servlet.jsp.JspException;
+
/**
* Adds an element to the surrounding list tag. Same syntax as
- * <code><put></code>.
- *<p>
- * This class is a subclass of the class
+ * <code><put></code>. <p> This class is a subclass of the class
* <code>org.apache.struts.taglib.tiles.AddTag</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
@@ -35,135 +33,186 @@
* @version $Rev$
*/
public class ELAddTag extends AddTag {
-
/**
- * 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;
+
/**
- * Instance variable mapped to "content" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "content" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String contentExpr;
+
/**
- * Instance variable mapped to "direct" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "direct" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String directExpr;
+
/**
- * 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;
+
/**
- * Instance variable mapped to "beanName" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "beanName" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String beanNameExpr;
+
/**
- * Instance variable mapped to "beanProperty" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "beanProperty" tag attribute. (Mapping set
+ * in associated BeanInfo class.)
*/
private String beanPropertyExpr;
+
/**
- * Instance variable mapped to "beanScope" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "beanScope" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String beanScopeExpr;
+
/**
- * Instance variable mapped to "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "role" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String roleExpr;
/**
- * Getter method for "value" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "value" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getValueExpr() { return (valueExpr); }
+ public String getValueExpr() {
+ return (valueExpr);
+ }
+
/**
- * Getter method for "content" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "content" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getContentExpr() { return (contentExpr); }
+ public String getContentExpr() {
+ return (contentExpr);
+ }
+
/**
- * Getter method for "direct" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "direct" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getDirectExpr() { return (directExpr); }
+ public String getDirectExpr() {
+ return (directExpr);
+ }
+
/**
- * 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);
+ }
+
/**
- * Getter method for "beanName" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "beanName" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getBeanNameExpr() { return (beanNameExpr); }
+ public String getBeanNameExpr() {
+ return (beanNameExpr);
+ }
+
/**
- * Getter method for "beanProperty" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "beanProperty" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
- public String getBeanPropertyExpr() { return (beanPropertyExpr); }
+ public String getBeanPropertyExpr() {
+ return (beanPropertyExpr);
+ }
+
/**
- * Getter method for "beanScope" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "beanScope" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getBeanScopeExpr() { return (beanScopeExpr); }
+ public String getBeanScopeExpr() {
+ return (beanScopeExpr);
+ }
+
/**
- * Getter method for "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "role" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getRoleExpr() { return (roleExpr); }
+ public String getRoleExpr() {
+ return (roleExpr);
+ }
/**
- * Setter method for "value" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "value" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setValueExpr(String valueExpr) { this.valueExpr = valueExpr; }
+ public void setValueExpr(String valueExpr) {
+ this.valueExpr = valueExpr;
+ }
+
/**
- * Setter method for "content" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "content" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setContentExpr(String contentExpr) { this.contentExpr = contentExpr; }
+ public void setContentExpr(String contentExpr) {
+ this.contentExpr = contentExpr;
+ }
+
/**
- * Setter method for "direct" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "direct" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setDirectExpr(String directExpr) { this.directExpr = directExpr; }
+ public void setDirectExpr(String directExpr) {
+ this.directExpr = directExpr;
+ }
+
/**
- * 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;
+ }
+
/**
- * Setter method for "beanName" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "beanName" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setBeanNameExpr(String beanNameExpr) { this.beanNameExpr = beanNameExpr; }
+ public void setBeanNameExpr(String beanNameExpr) {
+ this.beanNameExpr = beanNameExpr;
+ }
+
/**
- * Setter method for "beanProperty" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "beanProperty" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
- public void setBeanPropertyExpr(String beanPropertyExpr) { this.beanPropertyExpr = beanPropertyExpr; }
+ public void setBeanPropertyExpr(String beanPropertyExpr) {
+ this.beanPropertyExpr = beanPropertyExpr;
+ }
+
/**
- * Setter method for "beanScope" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "beanScope" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setBeanScopeExpr(String beanScopeExpr) { this.beanScopeExpr = beanScopeExpr; }
+ public void setBeanScopeExpr(String beanScopeExpr) {
+ this.beanScopeExpr = beanScopeExpr;
+ }
+
/**
- * Setter method for "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "role" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setRoleExpr(String roleExpr) { this.roleExpr = roleExpr; }
+ public void setRoleExpr(String roleExpr) {
+ this.roleExpr = roleExpr;
+ }
/**
* Resets attribute values for tag reuse.
*/
- public void release()
- {
+ public void release() {
super.release();
setValueExpr(null);
setContentExpr(null);
@@ -174,49 +223,71 @@
setBeanScopeExpr(null);
setRoleExpr(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("value", getValueExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("value", getValueExpr(), this, pageContext)) != null) {
setValue(string);
- if ((string = EvalHelper.evalString("content", getContentExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("content", getContentExpr(), this,
+ pageContext)) != null) {
setContent(string);
- if ((string = EvalHelper.evalString("direct", getDirectExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("direct", getDirectExpr(), this,
+ pageContext)) != null) {
setDirect(string);
- if ((string = EvalHelper.evalString("type", getTypeExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("type", getTypeExpr(), this, pageContext)) != null) {
setType(string);
- if ((string = EvalHelper.evalString("beanName", getBeanNameExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("beanName", getBeanNameExpr(), this,
+ pageContext)) != null) {
setBeanName(string);
- if ((string = EvalHelper.evalString("beanProperty", getBeanPropertyExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("beanProperty", getBeanPropertyExpr(),
+ this, pageContext)) != null) {
setBeanProperty(string);
- if ((string = EvalHelper.evalString("beanScope", getBeanScopeExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("beanScope", getBeanScopeExpr(), this,
+ pageContext)) != null) {
setBeanScope(string);
- if ((string = EvalHelper.evalString("role", getRoleExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("role", getRoleExpr(), this, pageContext)) != null) {
setRole(string);
+ }
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELAddTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELAddTagBeanInfo.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELAddTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELAddTagBeanInfo.java Fri Feb 10 10:09:48 2006
@@ -1,75 +1,88 @@
/*
- * $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.tiles;
-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.tiles.ELAddTag</code> class. It is
- * needed to override the default mapping of custom tag attribute names to
- * class attribute names.
+ * <code>org.apache.strutsel.taglib.tiles.ELAddTag</code> class. It is needed
+ * to override the default mapping of custom tag attribute names to class
+ * attribute names.
*/
-public class ELAddTagBeanInfo extends SimpleBeanInfo
-{
- public PropertyDescriptor[] getPropertyDescriptors()
- {
+public class ELAddTagBeanInfo extends SimpleBeanInfo {
+ public PropertyDescriptor[] getPropertyDescriptors() {
ArrayList proplist = new ArrayList();
try {
- proplist.add(new PropertyDescriptor("value", ELAddTag.class,
- null, "setValueExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("value", ELAddTag.class, null,
+ "setValueExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("content", ELAddTag.class,
- null, "setContentExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setContentExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("direct", ELAddTag.class,
- null, "setDirectExpr"));
- } catch (IntrospectionException ex) {}
- try {
- proplist.add(new PropertyDescriptor("type", ELAddTag.class,
- null, "setTypeExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("direct", ELAddTag.class, null,
+ "setDirectExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ try {
+ proplist.add(new PropertyDescriptor("type", ELAddTag.class, null,
+ "setTypeExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("beanName", ELAddTag.class,
- null, "setBeanNameExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setBeanNameExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("beanProperty", ELAddTag.class,
- null, "setBeanPropertyExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setBeanPropertyExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("beanScope", ELAddTag.class,
- null, "setBeanScopeExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setBeanScopeExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("role", ELAddTag.class,
- null, "setRoleExpr"));
- } catch (IntrospectionException ex) {}
-
- PropertyDescriptor[] result =
- new PropertyDescriptor[proplist.size()];
+ proplist.add(new PropertyDescriptor("role", ELAddTag.class, null,
+ "setRoleExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()];
+
return ((PropertyDescriptor[]) proplist.toArray(result));
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELDefinitionTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELDefinitionTag.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELDefinitionTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELDefinitionTag.java Fri Feb 10 10:09:48 2006
@@ -1,140 +1,175 @@
/*
- * $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.tiles;
import org.apache.struts.tiles.taglib.DefinitionTag;
-import javax.servlet.jsp.JspException;
import org.apache.strutsel.taglib.utils.EvalHelper;
+import javax.servlet.jsp.JspException;
+
/**
- * This is the tag handler for <tiles:definition>, which defines
- * a tiles (or template / component). Definition is put in requested context and can be
- * used in <tiles:insert>.
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.tiles.DefinitionTag</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.
+ * This is the tag handler for <tiles:definition>, which defines a tiles
+ * (or template / component). Definition is put in requested context and can
+ * be used in <tiles:insert>. <p> This class is a subclass of the class
+ * <code>org.apache.struts.taglib.tiles.DefinitionTag</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 ELDefinitionTag extends DefinitionTag {
-
/**
- * 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 "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 "template" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "template" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String templateExpr;
+
/**
- * 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 "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "role" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String roleExpr;
+
/**
- * Instance variable mapped to "extends" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "extends" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String extendsExpr;
/**
- * 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 "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 "template" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "template" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getTemplateExpr() { return (templateExpr); }
+ public String getTemplateExpr() {
+ return (templateExpr);
+ }
+
/**
- * 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 "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "role" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getRoleExpr() { return (roleExpr); }
+ public String getRoleExpr() {
+ return (roleExpr);
+ }
+
/**
- * Getter method for "extends" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "extends" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getExtendsExpr() { return (extendsExpr); }
+ public String getExtendsExpr() {
+ return (extendsExpr);
+ }
/**
- * 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 "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 "template" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "template" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setTemplateExpr(String templateExpr) { this.templateExpr = templateExpr; }
+ public void setTemplateExpr(String templateExpr) {
+ this.templateExpr = templateExpr;
+ }
+
/**
- * 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 "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "role" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setRoleExpr(String roleExpr) { this.roleExpr = roleExpr; }
+ public void setRoleExpr(String roleExpr) {
+ this.roleExpr = roleExpr;
+ }
+
/**
- * Setter method for "extends" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "extends" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setExtendsExpr(String extendsExpr) { this.extendsExpr = extendsExpr; }
+ public void setExtendsExpr(String extendsExpr) {
+ this.extendsExpr = extendsExpr;
+ }
/**
* Resets attribute values for tag reuse.
*/
- public void release()
- {
+ public void release() {
super.release();
setIdExpr(null);
setScopeExpr(null);
@@ -143,43 +178,58 @@
setRoleExpr(null);
setExtendsExpr(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("id", getIdExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("id", getIdExpr(), this, pageContext)) != null) {
setId(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("template", getTemplateExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("template", getTemplateExpr(), this,
+ pageContext)) != null) {
setTemplate(string);
- if ((string = EvalHelper.evalString("page", getPageExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("page", getPageExpr(), this, pageContext)) != null) {
setPage(string);
- if ((string = EvalHelper.evalString("role", getRoleExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("role", getRoleExpr(), this, pageContext)) != null) {
setRole(string);
- if ((string = EvalHelper.evalString("extends", getExtendsExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("extends", getExtendsExpr(), this,
+ pageContext)) != null) {
setExtends(string);
+ }
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELDefinitionTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELDefinitionTagBeanInfo.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELDefinitionTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELDefinitionTagBeanInfo.java Fri Feb 10 10:09:48 2006
@@ -1,67 +1,76 @@
/*
- * $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.tiles;
-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.tiles.ELDefinitionTag</code> class. It is
* needed to override the default mapping of custom tag attribute names to
* class attribute names.
*/
-public class ELDefinitionTagBeanInfo extends SimpleBeanInfo
-{
- public PropertyDescriptor[] getPropertyDescriptors()
- {
+public class ELDefinitionTagBeanInfo extends SimpleBeanInfo {
+ public PropertyDescriptor[] getPropertyDescriptors() {
ArrayList proplist = new ArrayList();
try {
proplist.add(new PropertyDescriptor("id", ELDefinitionTag.class,
- null, "setIdExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setIdExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("scope", ELDefinitionTag.class,
- null, "setScopeExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setScopeExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("template", ELDefinitionTag.class,
- null, "setTemplateExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("template",
+ ELDefinitionTag.class, null, "setTemplateExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("page", ELDefinitionTag.class,
- null, "setPageExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setPageExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
proplist.add(new PropertyDescriptor("role", ELDefinitionTag.class,
- null, "setRoleExpr"));
- } catch (IntrospectionException ex) {}
+ null, "setRoleExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("extends", ELDefinitionTag.class,
- null, "setExtendsExpr"));
- } catch (IntrospectionException ex) {}
-
- PropertyDescriptor[] result =
- new PropertyDescriptor[proplist.size()];
+ proplist.add(new PropertyDescriptor("extends",
+ ELDefinitionTag.class, null, "setExtendsExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()];
+
return ((PropertyDescriptor[]) proplist.toArray(result));
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetAttributeTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetAttributeTag.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetAttributeTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetAttributeTag.java Fri Feb 10 10:09:48 2006
@@ -1,135 +1,156 @@
/*
- * $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.tiles;
import org.apache.struts.tiles.taglib.GetAttributeTag;
-import javax.servlet.jsp.JspException;
import org.apache.strutsel.taglib.utils.EvalHelper;
+import javax.servlet.jsp.JspException;
+
/**
- * This is the tag handler for <tiles-el:get>, which gets
- * content from the request scope and either includes the content or prints
- * it, depending upon the value of the content's <code>direct</code> attribute.
- *<p>
- * This tag is intended to be compatible with the same tag from Templates
- * (David Geary). Implementation extends InsertTag for facility (no so well).
- * The only difference is the default value of attribute 'ignore', which is
+ * This is the tag handler for <tiles-el:get>, which gets content from
+ * the request scope and either includes the content or prints it, depending
+ * upon the value of the content's <code>direct</code> attribute. <p> This tag
+ * is intended to be compatible with the same tag from Templates (David
+ * Geary). Implementation extends InsertTag for facility (no so well). The
+ * only difference is the default value of attribute 'ignore', which is
* <code>true</code> for this tag (default behavior of David Geary's
- * templates).
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.tiles.GetAttributeTag</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.
+ * templates). <p> This class is a subclass of the class
+ * <code>org.apache.struts.taglib.tiles.GetAttributeTag</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 ELGetAttributeTag extends GetAttributeTag {
-
/**
- * 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 "ignore" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "ignore" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String ignoreExpr;
+
/**
- * Instance variable mapped to "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "role" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String roleExpr;
/**
- * 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 "ignore" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "ignore" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getIgnoreExpr() { return (ignoreExpr); }
+ public String getIgnoreExpr() {
+ return (ignoreExpr);
+ }
+
/**
- * Getter method for "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "role" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getRoleExpr() { return (roleExpr); }
+ public String getRoleExpr() {
+ return (roleExpr);
+ }
/**
- * 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 "ignore" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "ignore" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setIgnoreExpr(String ignoreExpr) { this.ignoreExpr = ignoreExpr; }
+ public void setIgnoreExpr(String ignoreExpr) {
+ this.ignoreExpr = ignoreExpr;
+ }
+
/**
- * Setter method for "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "role" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setRoleExpr(String roleExpr) { this.roleExpr = roleExpr; }
+ public void setRoleExpr(String roleExpr) {
+ this.roleExpr = roleExpr;
+ }
/**
* Resets attribute values for tag reuse.
*/
- public void release()
- {
+ public void release() {
super.release();
setNameExpr(null);
setIgnoreExpr(null);
setRoleExpr(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;
- Boolean bool = null;
+ private void evaluateExpressions()
+ throws JspException {
+ String string = null;
+ Boolean bool = null;
- if ((string = EvalHelper.evalString("name", getNameExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("name", getNameExpr(), this, pageContext)) != null) {
setName(string);
- if ((bool = EvalHelper.evalBoolean("ignore", getIgnoreExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((bool =
+ EvalHelper.evalBoolean("ignore", getIgnoreExpr(), this,
+ pageContext)) != null) {
setIgnore(bool.booleanValue());
- if ((string = EvalHelper.evalString("role", getRoleExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("role", getRoleExpr(), this, pageContext)) != null) {
setRole(string);
+ }
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetAttributeTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetAttributeTagBeanInfo.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetAttributeTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetAttributeTagBeanInfo.java Fri Feb 10 10:09:48 2006
@@ -1,55 +1,58 @@
/*
- * $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.tiles;
-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.tiles.ELGetAttributeTag</code> class. It is
- * needed to override the default mapping of custom tag attribute names to
+ * <code>org.apache.strutsel.taglib.tiles.ELGetAttributeTag</code> class. It
+ * is needed to override the default mapping of custom tag attribute names to
* class attribute names.
*/
-public class ELGetAttributeTagBeanInfo extends SimpleBeanInfo
-{
- public PropertyDescriptor[] getPropertyDescriptors()
- {
+public class ELGetAttributeTagBeanInfo extends SimpleBeanInfo {
+ public PropertyDescriptor[] getPropertyDescriptors() {
ArrayList proplist = new ArrayList();
try {
- proplist.add(new PropertyDescriptor("name", ELGetAttributeTag.class,
- null, "setNameExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("name",
+ ELGetAttributeTag.class, null, "setNameExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("ignore", ELGetAttributeTag.class,
- null, "setIgnoreExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("ignore",
+ ELGetAttributeTag.class, null, "setIgnoreExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("role", ELGetAttributeTag.class,
- null, "setRoleExpr"));
- } catch (IntrospectionException ex) {}
-
- PropertyDescriptor[] result =
- new PropertyDescriptor[proplist.size()];
+ proplist.add(new PropertyDescriptor("role",
+ ELGetAttributeTag.class, null, "setRoleExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()];
+
return ((PropertyDescriptor[]) proplist.toArray(result));
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetTag.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetTag.java Fri Feb 10 10:09:48 2006
@@ -1,39 +1,36 @@
/*
- * $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.tiles;
import org.apache.struts.tiles.taglib.GetTag;
-import javax.servlet.jsp.JspException;
import org.apache.strutsel.taglib.utils.EvalHelper;
+import javax.servlet.jsp.JspException;
+
/**
- * This is the tag handler for <tiles-el:get>, which gets
- * content from the request scope and either includes the content or prints
- * it, depending upon the value of the content's <code>direct</code> attribute.
- *<p>
- * This tag is intended to be compatible with the same tag from Templates
- * (David Geary). Implementation extends InsertTag for facility (no so well).
- * The only difference is the default value of attribute 'ignore', which is
+ * This is the tag handler for <tiles-el:get>, which gets content from
+ * the request scope and either includes the content or prints it, depending
+ * upon the value of the content's <code>direct</code> attribute. <p> This tag
+ * is intended to be compatible with the same tag from Templates (David
+ * Geary). Implementation extends InsertTag for facility (no so well). The
+ * only difference is the default value of attribute 'ignore', which is
* <code>true</code> for this tag (default behavior of David Geary's
- * templates).
- *<p>
- * This class is a subclass of the class
+ * templates). <p> This class is a subclass of the class
* <code>org.apache.struts.taglib.tiles.GetTag</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
@@ -42,113 +39,146 @@
* @version $Rev$
*/
public class ELGetTag extends GetTag {
-
/**
- * 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 "ignore" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "ignore" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String ignoreExpr;
+
/**
- * Instance variable mapped to "flush" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "flush" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String flushExpr;
+
/**
- * Instance variable mapped to "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "role" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String roleExpr;
/**
- * 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 "ignore" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "ignore" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getIgnoreExpr() { return (ignoreExpr); }
+ public String getIgnoreExpr() {
+ return (ignoreExpr);
+ }
+
/**
- * Getter method for "flush" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "flush" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getFlushExpr() { return (flushExpr); }
+ public String getFlushExpr() {
+ return (flushExpr);
+ }
+
/**
- * Getter method for "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "role" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getRoleExpr() { return (roleExpr); }
+ public String getRoleExpr() {
+ return (roleExpr);
+ }
/**
- * 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 "ignore" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "ignore" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setIgnoreExpr(String ignoreExpr) { this.ignoreExpr = ignoreExpr; }
+ public void setIgnoreExpr(String ignoreExpr) {
+ this.ignoreExpr = ignoreExpr;
+ }
+
/**
- * Setter method for "flush" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "flush" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setFlushExpr(String flushExpr) { this.flushExpr = flushExpr; }
+ public void setFlushExpr(String flushExpr) {
+ this.flushExpr = flushExpr;
+ }
+
/**
- * Setter method for "role" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "role" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setRoleExpr(String roleExpr) { this.roleExpr = roleExpr; }
+ public void setRoleExpr(String roleExpr) {
+ this.roleExpr = roleExpr;
+ }
/**
* Resets attribute values for tag reuse.
*/
- public void release()
- {
+ public void release() {
super.release();
setNameExpr(null);
setIgnoreExpr(null);
setFlushExpr(null);
setRoleExpr(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;
- Boolean bool = null;
+ private void evaluateExpressions()
+ throws JspException {
+ String string = null;
+ Boolean bool = null;
- if ((string = EvalHelper.evalString("name", getNameExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("name", getNameExpr(), this, pageContext)) != null) {
setName(string);
- if ((bool = EvalHelper.evalBoolean("ignore", getIgnoreExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((bool =
+ EvalHelper.evalBoolean("ignore", getIgnoreExpr(), this,
+ pageContext)) != null) {
setIgnore(bool.booleanValue());
- if ((string = EvalHelper.evalString("flush", getFlushExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("flush", getFlushExpr(), this, pageContext)) != null) {
setFlush(string);
- if ((string = EvalHelper.evalString("role", getRoleExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("role", getRoleExpr(), this, pageContext)) != null) {
setRole(string);
+ }
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetTagBeanInfo.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELGetTagBeanInfo.java Fri Feb 10 10:09:48 2006
@@ -1,59 +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.tiles;
-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.tiles.ELGetTag</code> class. It is
- * needed to override the default mapping of custom tag attribute names to
- * class attribute names.
+ * <code>org.apache.strutsel.taglib.tiles.ELGetTag</code> class. It is needed
+ * to override the default mapping of custom tag attribute names to class
+ * attribute names.
*/
-public class ELGetTagBeanInfo extends SimpleBeanInfo
-{
- public PropertyDescriptor[] getPropertyDescriptors()
- {
+public class ELGetTagBeanInfo extends SimpleBeanInfo {
+ public PropertyDescriptor[] getPropertyDescriptors() {
ArrayList proplist = new ArrayList();
try {
- proplist.add(new PropertyDescriptor("name", ELGetTag.class,
- null, "setNameExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("name", ELGetTag.class, null,
+ "setNameExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("ignore", ELGetTag.class,
- null, "setIgnoreExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("ignore", ELGetTag.class, null,
+ "setIgnoreExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("flush", ELGetTag.class,
- null, "setFlushExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("flush", ELGetTag.class, null,
+ "setFlushExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("role", ELGetTag.class,
- null, "setRoleExpr"));
- } catch (IntrospectionException ex) {}
-
- PropertyDescriptor[] result =
- new PropertyDescriptor[proplist.size()];
+ proplist.add(new PropertyDescriptor("role", ELGetTag.class, null,
+ "setRoleExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()];
+
return ((PropertyDescriptor[]) proplist.toArray(result));
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELImportAttributeTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELImportAttributeTag.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELImportAttributeTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELImportAttributeTag.java Fri Feb 10 10:09:48 2006
@@ -1,129 +1,151 @@
/*
- * $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.tiles;
import org.apache.struts.tiles.taglib.ImportAttributeTag;
-import javax.servlet.jsp.JspException;
import org.apache.strutsel.taglib.utils.EvalHelper;
+import javax.servlet.jsp.JspException;
+
/**
- * Import attribute from component to requested scope.
- * Attribute name and scope are optional. If not specified, all component
- * attributes are imported in page scope.
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.tiles.ImportAttributeTag</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.
+ * Import attribute from component to requested scope. Attribute name and
+ * scope are optional. If not specified, all component attributes are imported
+ * in page scope. <p> This class is a subclass of the class
+ * <code>org.apache.struts.taglib.tiles.ImportAttributeTag</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 ELImportAttributeTag extends ImportAttributeTag {
-
/**
- * 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 "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 "ignore" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "ignore" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String ignoreExpr;
/**
- * 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 "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 "ignore" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "ignore" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getIgnoreExpr() { return (ignoreExpr); }
+ public String getIgnoreExpr() {
+ return (ignoreExpr);
+ }
/**
- * 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 "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 "ignore" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "ignore" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setIgnoreExpr(String ignoreExpr) { this.ignoreExpr = ignoreExpr; }
+ public void setIgnoreExpr(String ignoreExpr) {
+ this.ignoreExpr = ignoreExpr;
+ }
/**
* Resets attribute values for tag reuse.
*/
- public void release()
- {
+ public void release() {
super.release();
setScopeExpr(null);
setNameExpr(null);
setIgnoreExpr(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;
- Boolean bool = null;
+ private void evaluateExpressions()
+ throws JspException {
+ String string = null;
+ Boolean bool = null;
- if ((string = EvalHelper.evalString("scope", getScopeExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("scope", getScopeExpr(), this, pageContext)) != null) {
setScope(string);
- if ((string = EvalHelper.evalString("name", getNameExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("name", getNameExpr(), this, pageContext)) != null) {
setName(string);
- if ((bool = EvalHelper.evalBoolean("ignore", getIgnoreExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((bool =
+ EvalHelper.evalBoolean("ignore", getIgnoreExpr(), this,
+ pageContext)) != null) {
setIgnore(bool.booleanValue());
+ }
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELImportAttributeTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELImportAttributeTagBeanInfo.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELImportAttributeTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELImportAttributeTagBeanInfo.java Fri Feb 10 10:09:48 2006
@@ -1,55 +1,58 @@
/*
- * $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.tiles;
-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.tiles.ELImportAttributeTag</code> class. It is
- * needed to override the default mapping of custom tag attribute names to
- * class attribute names.
+ * <code>org.apache.strutsel.taglib.tiles.ELImportAttributeTag</code> class.
+ * It is needed to override the default mapping of custom tag attribute names
+ * to class attribute names.
*/
-public class ELImportAttributeTagBeanInfo extends SimpleBeanInfo
-{
- public PropertyDescriptor[] getPropertyDescriptors()
- {
+public class ELImportAttributeTagBeanInfo extends SimpleBeanInfo {
+ public PropertyDescriptor[] getPropertyDescriptors() {
ArrayList proplist = new ArrayList();
try {
- proplist.add(new PropertyDescriptor("scope", ELImportAttributeTag.class,
- null, "setScopeExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("scope",
+ ELImportAttributeTag.class, null, "setScopeExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("name", ELImportAttributeTag.class,
- null, "setNameExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("name",
+ ELImportAttributeTag.class, null, "setNameExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("ignore", ELImportAttributeTag.class,
- null, "setIgnoreExpr"));
- } catch (IntrospectionException ex) {}
-
- PropertyDescriptor[] result =
- new PropertyDescriptor[proplist.size()];
+ proplist.add(new PropertyDescriptor("ignore",
+ ELImportAttributeTag.class, null, "setIgnoreExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()];
+
return ((PropertyDescriptor[]) proplist.toArray(result));
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTag.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTag.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTag.java Fri Feb 10 10:09:48 2006
@@ -1,107 +1,120 @@
/*
- * $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.tiles;
import org.apache.struts.tiles.taglib.InitDefinitionsTag;
-import javax.servlet.jsp.JspException;
import org.apache.strutsel.taglib.utils.EvalHelper;
+import javax.servlet.jsp.JspException;
+
/**
- * Init definitions factory.
- *<p>
- * This class is a subclass of the class
- * <code>org.apache.struts.taglib.tiles.InitDefinitionsTag</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.
+ * Init definitions factory. <p> This class is a subclass of the class
+ * <code>org.apache.struts.taglib.tiles.InitDefinitionsTag</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 ELInitDefinitionsTag extends InitDefinitionsTag {
-
/**
- * Instance variable mapped to "file" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "file" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String fileExpr;
+
/**
- * Instance variable mapped to "classname" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Instance variable mapped to "classname" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
*/
private String classnameExpr;
/**
- * Getter method for "file" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "file" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getFileExpr() { return (fileExpr); }
+ public String getFileExpr() {
+ return (fileExpr);
+ }
+
/**
- * Getter method for "classname" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Getter method for "classname" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public String getClassnameExpr() { return (classnameExpr); }
+ public String getClassnameExpr() {
+ return (classnameExpr);
+ }
/**
- * Setter method for "file" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "file" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setFileExpr(String fileExpr) { this.fileExpr = fileExpr; }
+ public void setFileExpr(String fileExpr) {
+ this.fileExpr = fileExpr;
+ }
+
/**
- * Setter method for "classname" tag attribute.
- * (Mapping set in associated BeanInfo class.)
+ * Setter method for "classname" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
*/
- public void setClassnameExpr(String classnameExpr) { this.classnameExpr = classnameExpr; }
+ public void setClassnameExpr(String classnameExpr) {
+ this.classnameExpr = classnameExpr;
+ }
/**
* Resets attribute values for tag reuse.
*/
- public void release()
- {
+ public void release() {
super.release();
setFileExpr(null);
setClassnameExpr(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("file", getFileExpr(),
- this, pageContext)) != null)
+ if ((string =
+ EvalHelper.evalString("file", getFileExpr(), this, pageContext)) != null) {
setFile(string);
- if ((string = EvalHelper.evalString("classname", getClassnameExpr(),
- this, pageContext)) != null)
+ }
+
+ if ((string =
+ EvalHelper.evalString("classname", getClassnameExpr(), this,
+ pageContext)) != null) {
setClassname(string);
+ }
}
}
Modified: struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTagBeanInfo.java?rev=376781&r1=376780&r2=376781&view=diff
==============================================================================
--- struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTagBeanInfo.java (original)
+++ struts/el/trunk/src/java/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTagBeanInfo.java Fri Feb 10 10:09:48 2006
@@ -1,51 +1,52 @@
/*
- * $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.tiles;
-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.tiles.ELInitDefinitionsTag</code> class. It is
- * needed to override the default mapping of custom tag attribute names to
- * class attribute names.
+ * <code>org.apache.strutsel.taglib.tiles.ELInitDefinitionsTag</code> class.
+ * It is needed to override the default mapping of custom tag attribute names
+ * to class attribute names.
*/
-public class ELInitDefinitionsTagBeanInfo extends SimpleBeanInfo
-{
- public PropertyDescriptor[] getPropertyDescriptors()
- {
+public class ELInitDefinitionsTagBeanInfo extends SimpleBeanInfo {
+ public PropertyDescriptor[] getPropertyDescriptors() {
ArrayList proplist = new ArrayList();
try {
- proplist.add(new PropertyDescriptor("file", ELInitDefinitionsTag.class,
- null, "setFileExpr"));
- } catch (IntrospectionException ex) {}
+ proplist.add(new PropertyDescriptor("file",
+ ELInitDefinitionsTag.class, null, "setFileExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
try {
- proplist.add(new PropertyDescriptor("classname", ELInitDefinitionsTag.class,
- null, "setClassnameExpr"));
- } catch (IntrospectionException ex) {}
-
- PropertyDescriptor[] result =
- new PropertyDescriptor[proplist.size()];
+ proplist.add(new PropertyDescriptor("classname",
+ ELInitDefinitionsTag.class, null, "setClassnameExpr"));
+ } 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