dmkarr 2003/02/25 22:12:26
Modified: contrib/struts-el/src/share/org/apache/strutsel/taglib/bean
ELMessageTag.java ELPageTag.java ELResourceTag.java
ELSizeTag.java ELStrutsTag.java
contrib/struts-el/src/share/org/apache/strutsel/taglib/html
ELBaseTag.java ELErrorsTag.java ELFormTag.java
ELImgTag.java ELMessagesTag.java
contrib/struts-el/src/share/org/apache/strutsel/taglib/logic
ELForwardTag.java ELIterateTag.java ELMatchTag.java
ELMessagesNotPresentTag.java
ELMessagesPresentTag.java ELNotMatchTag.java
Log:
Changed some leftover ExpressionUtil.evalNotNull() calls into EvalHelper.eval()
calls. This fixed a problem in ELErrorsTag because the "name" attribute of
ErrorsTag has a non-null default value. Using EvalHelper lets me easily avoid
calling the setter if the value is null.
PR: 17375
Revision Changes Path
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELMessageTag.java
Index: ELMessageTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELMessageTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELMessageTag.java 19 Feb 2003 03:49:50 -0000 1.4
+++ ELMessageTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -63,7 +63,7 @@
import javax.servlet.jsp.JspException;
import org.apache.struts.taglib.bean.MessageTag;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -297,8 +297,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("message", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("message", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELPageTag.java
Index: ELPageTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELPageTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELPageTag.java 19 Feb 2003 03:49:50 -0000 1.4
+++ ELPageTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.bean.PageTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -150,8 +150,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("page", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("page", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELResourceTag.java
Index: ELResourceTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELResourceTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELResourceTag.java 19 Feb 2003 03:49:50 -0000 1.4
+++ ELResourceTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.bean.ResourceTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -166,8 +166,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("resource", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("resource", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELSizeTag.java
Index: ELSizeTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELSizeTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELSizeTag.java 19 Feb 2003 03:49:50 -0000 1.4
+++ ELSizeTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.bean.SizeTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -198,8 +198,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("size", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("size", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELStrutsTag.java
Index: ELStrutsTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELStrutsTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELStrutsTag.java 19 Feb 2003 03:49:50 -0000 1.4
+++ ELStrutsTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.bean.StrutsTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -182,8 +182,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("struts", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("struts", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.6 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELBaseTag.java
Index: ELBaseTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELBaseTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ELBaseTag.java 19 Feb 2003 03:52:49 -0000 1.5
+++ ELBaseTag.java 26 Feb 2003 06:12:25 -0000 1.6
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.html.BaseTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -154,8 +154,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("base", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("base", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELErrorsTag.java
Index: ELErrorsTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELErrorsTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELErrorsTag.java 19 Feb 2003 03:52:49 -0000 1.4
+++ ELErrorsTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.html.ErrorsTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -198,8 +198,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("errors", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("errors", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.6 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTag.java
Index: ELFormTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ELFormTag.java 19 Feb 2003 03:52:49 -0000 1.5
+++ ELFormTag.java 26 Feb 2003 06:12:25 -0000 1.6
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.html.FormTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -342,8 +342,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("form", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("form", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.7 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTag.java
Index: ELImgTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ELImgTag.java 19 Feb 2003 03:53:49 -0000 1.6
+++ ELImgTag.java 26 Feb 2003 06:12:25 -0000 1.7
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.html.ImgTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -783,8 +783,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("img", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("img", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELMessagesTag.java
Index: ELMessagesTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELMessagesTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELMessagesTag.java 19 Feb 2003 03:53:49 -0000 1.4
+++ ELMessagesTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.html.MessagesTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -249,8 +249,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("messages", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("messages", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELForwardTag.java
Index: ELForwardTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELForwardTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELForwardTag.java 19 Feb 2003 03:54:38 -0000 1.4
+++ ELForwardTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.logic.ForwardTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -134,8 +134,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("forward", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("forward", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELIterateTag.java
Index: ELIterateTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELIterateTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELIterateTag.java 19 Feb 2003 03:54:38 -0000 1.4
+++ ELIterateTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.logic.IterateTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -265,8 +265,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("iterate", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("iterate", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMatchTag.java
Index: ELMatchTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMatchTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELMatchTag.java 19 Feb 2003 03:54:38 -0000 1.4
+++ ELMatchTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.logic.MatchTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -289,8 +289,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("match", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("match", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTag.java
Index: ELMessagesNotPresentTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELMessagesNotPresentTag.java 19 Feb 2003 03:54:38 -0000 1.4
+++ ELMessagesNotPresentTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.logic.MessagesNotPresentTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -168,8 +168,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("messagesNotPresent", attrName,
- attrValue, attrType,
+ return (EvalHelper.eval("messagesNotPresent", attrName,
+ attrValue, attrType,
this, pageContext));
}
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMessagesPresentTag.java
Index: ELMessagesPresentTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMessagesPresentTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELMessagesPresentTag.java 19 Feb 2003 03:54:38 -0000 1.4
+++ ELMessagesPresentTag.java 26 Feb 2003 06:12:25 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.logic.MessagesPresentTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -168,8 +168,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("messagesPresent", attrName,
- attrValue, attrType,
+ return (EvalHelper.eval("messagesPresent", attrName,
+ attrValue, attrType,
this, pageContext));
}
1.5 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELNotMatchTag.java
Index: ELNotMatchTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELNotMatchTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELNotMatchTag.java 19 Feb 2003 03:54:38 -0000 1.4
+++ ELNotMatchTag.java 26 Feb 2003 06:12:26 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.struts.taglib.logic.NotMatchTag;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
+import org.apache.strutsel.taglib.utils.EvalHelper;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
/**
@@ -289,8 +289,8 @@
Class attrType)
throws JspException, NullAttributeException
{
- return (ExpressionUtil.evalNotNull("notMatch", attrName, attrValue,
- attrType, this, pageContext));
+ return (EvalHelper.eval("notMatch", attrName, attrValue,
+ attrType, this, pageContext));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
