dmkarr 2003/08/10 14:42:21 Modified: contrib/struts-el/doc/userGuide struts-html-el.xml contrib/struts-el/src/share/org/apache/strutsel/taglib/html ELRewriteTag.java ELRewriteTagBeanInfo.java Log: Added action attribute added in base class Revision Changes Path 1.21 +17 -0 jakarta-struts/contrib/struts-el/doc/userGuide/struts-html-el.xml Index: struts-html-el.xml =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/doc/userGuide/struts-html-el.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- struts-html-el.xml 10 Aug 2003 09:14:04 -0000 1.20 +++ struts-html-el.xml 10 Aug 2003 21:42:21 -0000 1.21 @@ -5557,6 +5557,23 @@ </info> <attribute> + <name>action</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + <info> + <p>Logical name of a <code>Action</code> that + contains the actual content-relative URI of the destination + of this transfer. This hyperlink may be dynamically + modified by the inclusion of query parameters, as described + in the tag description. You <strong>must</strong> specify + exactly one of the <code>action</code> attribute, the + <code>forward</code> attribute, the + <code>href</code> attribute, or the <code>page</code> + attribute.</p> + </info> + </attribute> + + <attribute> <name>anchor</name> <required>false</required> <rtexprvalue>false</rtexprvalue> 1.7 +24 -4 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRewriteTag.java Index: ELRewriteTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRewriteTag.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ELRewriteTag.java 9 Mar 2003 05:47:25 -0000 1.6 +++ ELRewriteTag.java 10 Aug 2003 21:42:21 -0000 1.7 @@ -79,6 +79,11 @@ public class ELRewriteTag extends RewriteTag { /** + * Instance variable mapped to "action" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + private String actionExpr; + /** * Instance variable mapped to "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -140,6 +145,11 @@ private String transactionExpr; /** + * Getter method for "action" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public String getActionExpr() { return (actionExpr); } + /** * Getter method for "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -201,6 +211,11 @@ public String getTransactionExpr() { return (transactionExpr); } /** + * Setter method for "action" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public void setActionExpr(String actionExpr) { this.actionExpr = actionExpr; } + /** * Setter method for "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -267,6 +282,7 @@ public void release() { super.release(); + setActionExpr(null); setAnchorExpr(null); setForwardExpr(null); setHrefExpr(null); @@ -300,6 +316,10 @@ private void evaluateExpressions() throws JspException { String string = null; Boolean bool = null; + + if ((string = EvalHelper.evalString("action", getActionExpr(), + this, pageContext)) != null) + setAction(string); if ((string = EvalHelper.evalString("anchor", getAnchorExpr(), this, pageContext)) != null) 1.4 +7 -3 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRewriteTagBeanInfo.java Index: ELRewriteTagBeanInfo.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRewriteTagBeanInfo.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ELRewriteTagBeanInfo.java 9 Mar 2003 05:51:09 -0000 1.3 +++ ELRewriteTagBeanInfo.java 10 Aug 2003 21:42:21 -0000 1.4 @@ -85,6 +85,10 @@ ArrayList proplist = new ArrayList(); try { + proplist.add(new PropertyDescriptor("action", ELRewriteTag.class, + null, "setActionExpr")); + } catch (IntrospectionException ex) {} + try { proplist.add(new PropertyDescriptor("anchor", ELRewriteTag.class, null, "setAnchorExpr")); } catch (IntrospectionException ex) {}
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]