cmlenz 2002/07/31 06:39:25
Modified: src/taglib/jstl/org/apache/slide/taglib/tag/jstl
JstlTagUtils.java
Log:
- Throw JspTagException instead of JspException for the
"findXXX"-methods
- Cleaned up imports
Revision Changes Path
1.6 +19 -16
jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java
Index: JstlTagUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JstlTagUtils.java 28 Mar 2002 06:12:05 -0000 1.5
+++ JstlTagUtils.java 31 Jul 2002 13:39:25 -0000 1.6
@@ -67,19 +67,22 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.jstl.core.ExpressionException;
import javax.servlet.jsp.jstl.core.LoopTag;
+import javax.servlet.jsp.tagext.Tag;
import org.apache.slide.authenticate.CredentialsToken;
-import org.apache.slide.authenticate.SecurityToken;
-import org.apache.slide.common.Domain;
-import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.SlideToken;
import org.apache.slide.common.SlideTokenImpl;
-import org.apache.slide.taglib.bean.*;
-import org.apache.slide.taglib.tag.*;
+import org.apache.slide.taglib.bean.DomainBean;
+import org.apache.slide.taglib.bean.NamespaceBean;
+import org.apache.slide.taglib.bean.NodeBean;
+import org.apache.slide.taglib.bean.RevisionBean;
+import org.apache.slide.taglib.tag.DomainTagSupport;
+import org.apache.slide.taglib.tag.NamespaceTagSupport;
+import org.apache.slide.taglib.tag.NodeTagSupport;
+import org.apache.slide.taglib.tag.RevisionTagSupport;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
@@ -119,7 +122,7 @@
ExpressionEvaluatorManager.evaluate(attributeName, expression,
expectedType, tag,
pageContext);
- } catch (ExpressionException e) {
+ } catch (JspException e) {
// ignore, the attribute is optional
}
@@ -159,7 +162,7 @@
* none was found.
*/
public static DomainBean findDomain(Tag from, PageContext context)
- throws JspException {
+ throws JspTagException {
DomainBean bean = null;
@@ -193,7 +196,7 @@
* default namespace if none was found.
*/
public static NamespaceBean findNamespace(Tag from, PageContext context)
- throws JspException {
+ throws JspTagException {
NamespaceBean bean = null;
@@ -246,7 +249,7 @@
* found, return <code>null</code>.
*/
public static NodeBean findNode(Tag from, PageContext context)
- throws JspException {
+ throws JspTagException {
NodeBean bean = null;
@@ -279,7 +282,7 @@
* can be found, return <code>null</code>.
*/
public static RevisionBean findRevision(Tag from, PageContext context)
- throws JspException {
+ throws JspTagException {
RevisionBean bean = null;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
