dmkarr 2004/01/17 23:11:27 Modified: contrib/struts-el/doc/userGuide struts-html-el.xml struts-logic-el.xml contrib/struts-el/src/share/org/apache/strutsel/taglib/html ELHiddenTag.java ELHiddenTagBeanInfo.java ELImgTag.java ELImgTagBeanInfo.java ELLinkTag.java ELLinkTagBeanInfo.java ELRewriteTag.java ELRewriteTagBeanInfo.java contrib/struts-el/src/share/org/apache/strutsel/taglib/logic ELRedirectTag.java ELRedirectTagBeanInfo.java Log: Updates to match changes to base tags: html:hidden, html:img, html:link, html:rewrite, logic:redirect Revision Changes Path 1.24 +46 -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.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- struts-html-el.xml 16 Jan 2004 04:10:58 -0000 1.23 +++ struts-html-el.xml 18 Jan 2004 07:11:26 -0000 1.24 @@ -1952,6 +1952,16 @@ </attribute> <attribute> + <name>disabled</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + Set to <code>true</code> if this input field should be + disabled. + </info> + </attribute> + + <attribute> <name>indexed</name> <required>false</required> <rtexprvalue>true</rtexprvalue> @@ -3139,6 +3149,18 @@ </info> </attribute> + <attribute> + <name>useLocalEncoding</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>If set to <code>true</code>, LocalCharacterEncoding will be + used, that is, the characterEncoding set to the HttpServletResponse, + as prefered character encoding rather than UTF-8, when + URLEncoding is done on parameters of the URL.</p> + </info> + </attribute> + <attribute> <name>usemap</name> <required>false</required> @@ -3827,6 +3849,18 @@ </info> </attribute> + <attribute> + <name>useLocalEncoding</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>If set to <code>true</code>, LocalCharacterEncoding will be + used, that is, the characterEncoding set to the HttpServletResponse, + as prefered character encoding rather than UTF-8, when + URLEncoding is done on parameters of the URL.</p> + </info> + </attribute> + </tag> <tag> @@ -5741,6 +5775,18 @@ in the receiving Action.</p> </info> </attribute> + + <attribute> + <name>useLocalEncoding</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>If set to <code>true</code>, LocalCharacterEncoding will be + used, that is, the characterEncoding set to the HttpServletResponse, + as prefered character encoding rather than UTF-8, when + URLEncoding is done on parameters of the URL.</p> + </info> + </attribute> </tag> 1.8 +29 -0 jakarta-struts/contrib/struts-el/doc/userGuide/struts-logic-el.xml Index: struts-logic-el.xml =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/doc/userGuide/struts-logic-el.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- struts-logic-el.xml 16 Jan 2004 04:10:58 -0000 1.7 +++ struts-logic-el.xml 18 Jan 2004 07:11:27 -0000 1.8 @@ -934,6 +934,23 @@ same query parameter name will be created.</p> </info> + <attribute> + <name>action</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>Logical name of a global <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> @@ -1092,6 +1109,18 @@ URL for this redirect.</p> </info> </attribute> + + <attribute> + <name>useLocalEncoding</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>If set to <code>true</code>, LocalCharacterEncoding will be + used, that is, the characterEncoding set to the HttpServletResponse, + as prefered character encoding rather than UTF-8, when + URLEncoding is done on parameters of the URL.</p> + </info> + </attribute> </tag> 1.8 +24 -4 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHiddenTag.java Index: ELHiddenTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHiddenTag.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ELHiddenTag.java 26 Jul 2003 05:48:02 -0000 1.7 +++ ELHiddenTag.java 18 Jan 2004 07:11:27 -0000 1.8 @@ -94,6 +94,11 @@ */ private String altKeyExpr; /** + * Instance variable mapped to "disabled" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + private String disabledExpr; + /** * Instance variable mapped to "indexed" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -225,6 +230,11 @@ */ public String getAltKeyExpr() { return (altKeyExpr); } /** + * Getter method for "disabled" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public String getDisabledExpr() { return (disabledExpr); } + /** * Getter method for "indexed" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -356,6 +366,11 @@ */ public void setAltKeyExpr(String altKeyExpr) { this.altKeyExpr = altKeyExpr; } /** + * Setter method for "disabled" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public void setDisabledExpr(String disabledExpr) { this.disabledExpr = disabledExpr; } + /** * Setter method for "indexed" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -480,6 +495,7 @@ setAccesskeyExpr(null); setAltExpr(null); setAltKeyExpr(null); + setDisabledExpr(null); setIndexedExpr(null); setNameExpr(null); setOnblurExpr(null); @@ -536,6 +552,10 @@ if ((string = EvalHelper.evalString("altKey", getAltKeyExpr(), this, pageContext)) != null) setAltKey(string); + + if ((bool = EvalHelper.evalBoolean("disabled", getDisabledExpr(), + this, pageContext)) != null) + setDisabled(bool.booleanValue()); if ((bool = EvalHelper.evalBoolean("indexed", getIndexedExpr(), this, pageContext)) != null) 1.5 +7 -3 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHiddenTagBeanInfo.java Index: ELHiddenTagBeanInfo.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHiddenTagBeanInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ELHiddenTagBeanInfo.java 26 Jul 2003 05:48:02 -0000 1.4 +++ ELHiddenTagBeanInfo.java 18 Jan 2004 07:11:27 -0000 1.5 @@ -97,6 +97,10 @@ null, "setAltKeyExpr")); } catch (IntrospectionException ex) {} try { + proplist.add(new PropertyDescriptor("disabled", ELHiddenTag.class, + null, "setDisabledExpr")); + } catch (IntrospectionException ex) {} + try { proplist.add(new PropertyDescriptor("indexed", ELHiddenTag.class, null, "setIndexedExpr")); } catch (IntrospectionException ex) {} 1.10 +25 -4 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ELImgTag.java 26 Jul 2003 05:48:03 -0000 1.9 +++ ELImgTag.java 18 Jan 2004 07:11:27 -0000 1.10 @@ -279,6 +279,11 @@ */ private String titleKeyExpr; /** + * Instance variable mapped to "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + private String useLocalEncodingExpr; + /** * Instance variable mapped to "usemap" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -485,6 +490,11 @@ */ public String getTitleKeyExpr() { return (titleKeyExpr); } /** + * Getter method for "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public String getUseLocalEncodingExpr() { return (useLocalEncodingExpr); } + /** * Getter method for "usemap" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -691,6 +701,11 @@ */ public void setTitleKeyExpr(String titleKeyExpr) { this.titleKeyExpr = titleKeyExpr; } /** + * Setter method for "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public void setUseLocalEncodingExpr(String useLocalEncodingExpr) { this.useLocalEncodingExpr = useLocalEncodingExpr; } + /** * Setter method for "usemap" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -750,6 +765,7 @@ setStyleIdExpr(null); setTitleExpr(null); setTitleKeyExpr(null); + setUseLocalEncodingExpr(null); setUsemapExpr(null); setVspaceExpr(null); setWidthExpr(null); @@ -773,6 +789,7 @@ */ private void evaluateExpressions() throws JspException { String string = null; + Boolean bool = null; if ((string = EvalHelper.evalString("accessKey", getAccesskeyExpr(), this, pageContext)) != null) @@ -927,6 +944,10 @@ if ((string = EvalHelper.evalString("titleKey", getTitleKeyExpr(), this, pageContext)) != null) setTitleKey(string); + + if ((bool = EvalHelper.evalBoolean("useLocalEncoding", getUseLocalEncodingExpr(), + this, pageContext)) != null) + setUseLocalEncoding(bool.booleanValue()); if ((string = EvalHelper.evalString("usemap", getUsemapExpr(), this, pageContext)) != null) 1.5 +7 -3 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java Index: ELImgTagBeanInfo.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ELImgTagBeanInfo.java 26 Jul 2003 05:48:03 -0000 1.4 +++ ELImgTagBeanInfo.java 18 Jan 2004 07:11:27 -0000 1.5 @@ -230,6 +230,10 @@ null, "setTitleKeyExpr")); } catch (IntrospectionException ex) {} try { + proplist.add(new PropertyDescriptor("useLocalEncoding", ELImgTag.class, + null, "setUseLocalEncodingExpr")); + } catch (IntrospectionException ex) {} + try { proplist.add(new PropertyDescriptor("usemap", ELImgTag.class, null, "setUsemapExpr")); } catch (IntrospectionException ex) {} 1.9 +24 -4 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELLinkTag.java Index: ELLinkTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELLinkTag.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ELLinkTag.java 9 Mar 2003 05:47:24 -0000 1.8 +++ ELLinkTag.java 18 Jan 2004 07:11:27 -0000 1.9 @@ -258,6 +258,11 @@ * (Mapping set in associated BeanInfo class.) */ private String transactionExpr; + /** + * Instance variable mapped to "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + private String useLocalEncodingExpr; /** * Getter method for "accessKey" tag attribute. @@ -439,6 +444,11 @@ * (Mapping set in associated BeanInfo class.) */ public String getTransactionExpr() { return (transactionExpr); } + /** + * Getter method for "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public String getUseLocalEncodingExpr() { return (useLocalEncodingExpr); } /** * Setter method for "accessKey" tag attribute. @@ -620,6 +630,11 @@ * (Mapping set in associated BeanInfo class.) */ public void setTransactionExpr(String transactionExpr) { this.transactionExpr = transactionExpr; } + /** + * Setter method for "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public void setUseLocalEncodingExpr(String useLocalEncodingExpr) { this.useLocalEncodingExpr = useLocalEncodingExpr; } /** * Resets attribute values for tag reuse. @@ -663,6 +678,7 @@ setTitleExpr(null); setTitleKeyExpr(null); setTransactionExpr(null); + setUseLocalEncodingExpr(null); } /** @@ -828,5 +844,9 @@ if ((bool = EvalHelper.evalBoolean("transaction", getTransactionExpr(), this, pageContext)) != null) setTransaction(bool.booleanValue()); + + if ((bool = EvalHelper.evalBoolean("useLocalEncoding", getUseLocalEncodingExpr(), + this, pageContext)) != null) + setUseLocalEncoding(bool.booleanValue()); } } 1.5 +7 -3 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELLinkTagBeanInfo.java Index: ELLinkTagBeanInfo.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELLinkTagBeanInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ELLinkTagBeanInfo.java 9 Mar 2003 05:51:09 -0000 1.4 +++ ELLinkTagBeanInfo.java 18 Jan 2004 07:11:27 -0000 1.5 @@ -228,6 +228,10 @@ proplist.add(new PropertyDescriptor("transaction", ELLinkTag.class, null, "setTransactionExpr")); } catch (IntrospectionException ex) {} + try { + proplist.add(new PropertyDescriptor("useLocalEncoding", ELLinkTag.class, + null, "setUseLocalEncodingExpr")); + } catch (IntrospectionException ex) {} PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()]; 1.8 +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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ELRewriteTag.java 10 Aug 2003 21:42:21 -0000 1.7 +++ ELRewriteTag.java 18 Jan 2004 07:11:27 -0000 1.8 @@ -143,6 +143,11 @@ * (Mapping set in associated BeanInfo class.) */ private String transactionExpr; + /** + * Instance variable mapped to "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + private String useLocalEncodingExpr; /** * Getter method for "action" tag attribute. @@ -209,6 +214,11 @@ * (Mapping set in associated BeanInfo class.) */ public String getTransactionExpr() { return (transactionExpr); } + /** + * Getter method for "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public String getUseLocalEncodingExpr() { return (useLocalEncodingExpr); } /** * Setter method for "action" tag attribute. @@ -275,6 +285,11 @@ * (Mapping set in associated BeanInfo class.) */ public void setTransactionExpr(String transactionExpr) { this.transactionExpr = transactionExpr; } + /** + * Setter method for "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public void setUseLocalEncodingExpr(String useLocalEncodingExpr) { this.useLocalEncodingExpr = useLocalEncodingExpr; } /** * Resets attribute values for tag reuse. @@ -295,6 +310,7 @@ setPropertyExpr(null); setScopeExpr(null); setTransactionExpr(null); + setUseLocalEncodingExpr(null); } /** @@ -368,5 +384,9 @@ if ((bool = EvalHelper.evalBoolean("transaction", getTransactionExpr(), this, pageContext)) != null) setTransaction(bool.booleanValue()); + + if ((bool = EvalHelper.evalBoolean("useLocalEncoding", getUseLocalEncodingExpr(), + this, pageContext)) != null) + setUseLocalEncoding(bool.booleanValue()); } } 1.5 +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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ELRewriteTagBeanInfo.java 10 Aug 2003 21:42:21 -0000 1.4 +++ ELRewriteTagBeanInfo.java 18 Jan 2004 07:11:27 -0000 1.5 @@ -136,6 +136,10 @@ proplist.add(new PropertyDescriptor("transaction", ELRewriteTag.class, null, "setTransactionExpr")); } catch (IntrospectionException ex) {} + try { + proplist.add(new PropertyDescriptor("useLocalEncoding", ELRewriteTag.class, + null, "setUseLocalEncodingExpr")); + } catch (IntrospectionException ex) {} PropertyDescriptor[] result = new PropertyDescriptor[proplist.size()]; 1.7 +44 -4 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELRedirectTag.java Index: ELRedirectTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELRedirectTag.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ELRedirectTag.java 9 Mar 2003 05:47:26 -0000 1.6 +++ ELRedirectTag.java 18 Jan 2004 07:11:27 -0000 1.7 @@ -79,6 +79,11 @@ public class ELRedirectTag extends RedirectTag { /** + * 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.) */ @@ -138,8 +143,18 @@ * (Mapping set in associated BeanInfo class.) */ private String transactionExpr; + /** + * Instance variable mapped to "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + private String useLocalEncodingExpr; /** + * 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.) */ @@ -199,8 +214,18 @@ * (Mapping set in associated BeanInfo class.) */ public String getTransactionExpr() { return (transactionExpr); } + /** + * Getter method for "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public String getUseLocalEncodingExpr() { return (useLocalEncodingExpr); } /** + * 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.) */ @@ -260,6 +285,11 @@ * (Mapping set in associated BeanInfo class.) */ public void setTransactionExpr(String transactionExpr) { this.transactionExpr = transactionExpr; } + /** + * Setter method for "useLocalEncoding" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public void setUseLocalEncodingExpr(String useLocalEncodingExpr) { this.useLocalEncodingExpr = useLocalEncodingExpr; } /** * Resets attribute values for tag reuse. @@ -267,6 +297,7 @@ public void release() { super.release(); + setActionExpr(null); setAnchorExpr(null); setForwardExpr(null); setHrefExpr(null); @@ -279,6 +310,7 @@ setPropertyExpr(null); setScopeExpr(null); setTransactionExpr(null); + setUseLocalEncodingExpr(null); } /** @@ -301,6 +333,10 @@ 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) setAnchor(string); @@ -348,5 +384,9 @@ if ((bool = EvalHelper.evalBoolean("transaction", getTransactionExpr(), this, pageContext)) != null) setTransaction(bool.booleanValue()); + + if ((bool = EvalHelper.evalBoolean("useLocalEncoding", getUseLocalEncodingExpr(), + this, pageContext)) != null) + setUseLocalEncoding(bool.booleanValue()); } } 1.4 +11 -3 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELRedirectTagBeanInfo.java Index: ELRedirectTagBeanInfo.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELRedirectTagBeanInfo.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ELRedirectTagBeanInfo.java 9 Mar 2003 05:51:14 -0000 1.3 +++ ELRedirectTagBeanInfo.java 18 Jan 2004 07:11:27 -0000 1.4 @@ -85,6 +85,10 @@ ArrayList proplist = new ArrayList(); try { + proplist.add(new PropertyDescriptor("action", ELRedirectTag.class, + null, "setActionExpr")); + } catch (IntrospectionException ex) {} + try { proplist.add(new PropertyDescriptor("anchor", ELRedirectTag.class, null, "setAnchorExpr")); } catch (IntrospectionException ex) {} @@ -131,6 +135,10 @@ try { proplist.add(new PropertyDescriptor("transaction", ELRedirectTag.class, null, "setTransactionExpr")); + } catch (IntrospectionException ex) {} + try { + proplist.add(new PropertyDescriptor("useLocalEncoding", ELRedirectTag.class, + null, "setUseLocalEncodingExpr")); } catch (IntrospectionException ex) {} PropertyDescriptor[] result =
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]