oalexeev 01/12/10 02:05:51
Modified: src/share/org/apache/struts/taglib/html BaseFieldTag.java
BaseHandlerTag.java ButtonTag.java CancelTag.java
CheckboxTag.java ImageTag.java ImgTag.java
LinkTag.java MultiboxTag.java RadioTag.java
ResetTag.java SelectTag.java SubmitTag.java
TextareaTag.java
Log:
Add freetext attribute to directly render all non supported by struts attributes to
the target tags.
Revision Changes Path
1.10 +5 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java
Index: BaseFieldTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BaseFieldTag.java 2001/09/17 19:59:30 1.9
+++ BaseFieldTag.java 2001/12/10 10:05:50 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v
1.9 2001/09/17 19:59:30 husted Exp $
- * $Revision: 1.9 $
- * $Date: 2001/09/17 19:59:30 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v
1.10 2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
* Convenience base class for the various input tags for text fields.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.9 $ $Date: 2001/09/17 19:59:30 $
+ * @version $Revision: 1.10 $ $Date: 2001/12/10 10:05:50 $
*/
public abstract class BaseFieldTag extends BaseInputTag {
@@ -198,6 +198,7 @@
results.append("\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
+ prepareFreetext( results );
results.append(">");
// Print this field to our output writer
1.11 +36 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
Index: BaseHandlerTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BaseHandlerTag.java 2001/11/26 15:08:02 1.10
+++ BaseHandlerTag.java 2001/12/10 10:05:50 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
1.10 2001/11/26 15:08:02 oalexeev Exp $
- * $Revision: 1.10 $
- * $Date: 2001/11/26 15:08:02 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
1.11 2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
* appropriate implementations of these.
*
* @author Don Clasen
- * @version $Revision: 1.10 $ $Date: 2001/11/26 15:08:02 $
+ * @version $Revision: 1.11 $ $Date: 2001/12/10 10:05:50 $
*/
public abstract class BaseHandlerTag extends BodyTagSupport {
@@ -176,6 +176,13 @@
private String title = null;
+// Freetext attributes holder
+
+ /** Free text attribute to place to it all additional attributes.
+ * This attribute contents will be directly rendered to the tag.
+ */
+ protected String freeText = null;
+
// ------------------------------------------------------------- Properties
// Navigation Management
@@ -425,6 +432,17 @@
this.title = title;
}
+// Freetext attributes holder
+
+ /** Returns the freetext attribute */
+ public String getFreetext() {
+ return freeText;
+ }
+
+ /** Sets the freetext attribute */
+ public void setFreetext( String freeText ) {
+ this.freeText = freeText;
+ }
// --------------------------------------------------------- Public Methods
@@ -458,6 +476,7 @@
styleId = null;
title = null;
indexed = false;
+ freeText = null;
}
@@ -656,7 +675,20 @@
}
+ /**
+ * Prepares the freetext attributes, appending all it to the the given
+ * StringBuffer.
+ * @param handlers The StringBuffer that output will be appended to.
+ */
+ protected void prepareFreetext(StringBuffer handlers) {
+ if (freeText!= null) {
+ handlers.append(" ");
+ handlers.append(getFreetext());
+ handlers.append(" ");
+ }
+
+ }
}
1.7 +5 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/ButtonTag.java
Index: ButtonTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ButtonTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ButtonTag.java 2001/09/17 19:59:30 1.6
+++ ButtonTag.java 2001/12/10 10:05:50 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ButtonTag.java,v 1.6
2001/09/17 19:59:30 husted Exp $
- * $Revision: 1.6 $
- * $Date: 2001/09/17 19:59:30 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ButtonTag.java,v 1.7
2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
* Renders an HTML BUTTON tag within the Struts framework.
*
* @author Don Clasen
- * @version $Revision: 1.6 $ $Date: 2001/09/17 19:59:30 $
+ * @version $Revision: 1.7 $ $Date: 2001/12/10 10:05:50 $
*/
public class ButtonTag extends BaseHandlerTag {
@@ -209,6 +209,7 @@
results.append("\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
+ prepareFreetext( results );
results.append(">");
// Render this element to our writer
1.4 +8 -7
jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java
Index: CancelTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CancelTag.java 2001/04/18 01:31:14 1.3
+++ CancelTag.java 2001/12/10 10:05:50 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java,v 1.3
2001/04/18 01:31:14 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/04/18 01:31:14 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java,v 1.4
2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
* Tag for input fields of type "cancel".
*
* @author Jeff Hutchinson
- * @version $Revision: 1.3 $ $Date: 2001/04/18 01:31:14 $
+ * @version $Revision: 1.4 $ $Date: 2001/12/10 10:05:50 $
*/
public class CancelTag extends BaseHandlerTag {
@@ -213,6 +213,7 @@
results.append("\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
+ prepareFreetext( results );
results.append(">");
// Render this element to our writer
@@ -229,10 +230,10 @@
*/
public void release() {
- super.release();
- property = Constants.CANCEL_PROPERTY;
+ super.release();
+ property = Constants.CANCEL_PROPERTY;
text = null;
- value = null;
+ value = null;
}
1.9 +5 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java
Index: CheckboxTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CheckboxTag.java 2001/09/17 19:59:30 1.8
+++ CheckboxTag.java 2001/12/10 10:05:50 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java,v
1.8 2001/09/17 19:59:30 husted Exp $
- * $Revision: 1.8 $
- * $Date: 2001/09/17 19:59:30 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java,v
1.9 2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.9 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Tag for input fields of type "checkbox".
*
* @author Craig R. McClanahan
- * @version $Revision: 1.8 $ $Date: 2001/09/17 19:59:30 $
+ * @version $Revision: 1.9 $ $Date: 2001/12/10 10:05:50 $
*/
public class CheckboxTag extends BaseHandlerTag {
@@ -219,6 +219,7 @@
results.append(" checked=\"checked\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
+ prepareFreetext( results );
results.append(">");
// Print this field to our output writer
1.12 +5 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java
Index: ImageTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ImageTag.java 2001/09/18 05:50:51 1.11
+++ ImageTag.java 2001/12/10 10:05:50 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java,v 1.11
2001/09/18 05:50:51 martinc Exp $
- * $Revision: 1.11 $
- * $Date: 2001/09/18 05:50:51 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java,v 1.12
2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
* Tag for input fields of type "image".
*
* @author Oleg V Alexeev
- * @version $Revision: 1.11 $ $Date: 2001/09/18 05:50:51 $
+ * @version $Revision: 1.12 $ $Date: 2001/12/10 10:05:50 $
*/
public class ImageTag extends SubmitTag {
@@ -327,6 +327,7 @@
}
results.append(prepareEventHandlers());
results.append(prepareStyles());
+ prepareFreetext( results );
results.append(">");
// Render this element to our writer
1.12 +69 -68
jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
Index: ImgTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ImgTag.java 2001/08/07 17:37:46 1.11
+++ ImgTag.java 2001/12/10 10:05:50 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v 1.11
2001/08/07 17:37:46 craigmcc Exp $
- * $Revision: 1.11 $
- * $Date: 2001/08/07 17:37:46 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v 1.12
2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
*
* @author Michael Westbay
* @author Craig McClanahan
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class ImgTag extends BaseHandlerTag {
@@ -259,11 +259,11 @@
protected String lowsrc = null;
public String getLowsrc() {
- return (this.lowsrc);
+ return (this.lowsrc);
}
public void setLowsrc(String lowsrc) {
- this.lowsrc = lowsrc;
+ this.lowsrc = lowsrc;
}
@@ -280,11 +280,11 @@
protected String name = null;
public String getName() {
- return (this.name);
+ return (this.name);
}
public void setName(String name) {
- this.name = name;
+ this.name = name;
}
@@ -382,11 +382,11 @@
protected String property = null;
public String getProperty() {
- return (this.property);
+ return (this.property);
}
public void setProperty(String property) {
- this.property = property;
+ this.property = property;
}
@@ -410,11 +410,11 @@
protected String src = null;
public String getSrc() {
- return (this.src);
+ return (this.src);
}
public void setSrc(String src) {
- this.src = src;
+ this.src = src;
}
@@ -485,8 +485,8 @@
*/
public int doStartTag() throws JspException {
- // Evaluate the body of this tag
- return (EVAL_BODY_TAG);
+ // Evaluate the body of this tag
+ return (EVAL_BODY_TAG);
}
@@ -498,12 +498,12 @@
*/
public int doEndTag() throws JspException {
- // Generate the name definition or image element
+ // Generate the name definition or image element
HttpServletRequest request =
- (HttpServletRequest) pageContext.getRequest();
- HttpServletResponse response =
- (HttpServletResponse) pageContext.getResponse();
- StringBuffer results = new StringBuffer("<img");
+ (HttpServletRequest) pageContext.getRequest();
+ HttpServletResponse response =
+ (HttpServletResponse) pageContext.getResponse();
+ StringBuffer results = new StringBuffer("<img");
String tmp = src();
String srcurl = url(tmp);
if (srcurl != null) {
@@ -570,13 +570,14 @@
}
results.append(prepareStyles());
results.append(prepareEventHandlers());
- results.append(">");
+ prepareFreetext( results );
+ results.append(">");
- // Print this element to our output writer
+ // Print this element to our output writer
ResponseUtils.write(pageContext, results.toString());
// Evaluate the reaminder of this page
- return (EVAL_PAGE);
+ return (EVAL_PAGE);
}
@@ -586,7 +587,7 @@
*/
public void release() {
- super.release();
+ super.release();
alt = null;
altKey = null;
border = null;
@@ -597,16 +598,16 @@
ismap = null;
locale = Action.LOCALE_KEY;
lowsrc = null;
- name = null;
+ name = null;
page = null;
pageKey = null;
paramId = null;
paramName = null;
paramProperty = null;
paramScope = null;
- property = null;
+ property = null;
scope = null;
- src = null;
+ src = null;
srcKey = null;
usemap = null;
vspace = null;
@@ -743,7 +744,7 @@
return (url);
// Start with an unadorned URL as specified
- StringBuffer src = new StringBuffer(url);
+ StringBuffer src = new StringBuffer(url);
// Append a single-parameter name and value, if requested
@@ -760,34 +761,34 @@
src.append(URLEncoder.encode(value.toString()));
}
- // Just return the URL if there is no bean to look up
- if ((property != null) && (name == null)) {
- JspException e = new JspException
- (messages.getMessage("getter.name"));
+ // Just return the URL if there is no bean to look up
+ if ((property != null) && (name == null)) {
+ JspException e = new JspException
+ (messages.getMessage("getter.name"));
RequestUtils.saveException(pageContext, e);
throw e;
}
- if (name == null)
- return (src.toString());
+ if (name == null)
+ return (src.toString());
- // Look up the map we will be using
+ // Look up the map we will be using
Object mapObject = RequestUtils.lookup(pageContext, name,
property, scope);
- Map map = null;
+ Map map = null;
try {
map = (Map) mapObject;
} catch (ClassCastException e) {
RequestUtils.saveException(pageContext, e);
throw new JspException
(messages.getMessage("imgTag.type"));
- }
+ }
- // Append the required query parameters
- boolean question = (src.toString().indexOf("?") >= 0);
- Iterator keys = map.keySet().iterator();
+ // Append the required query parameters
+ boolean question = (src.toString().indexOf("?") >= 0);
+ Iterator keys = map.keySet().iterator();
while (keys.hasNext()) {
- String key = (String) keys.next();
- Object value = map.get(key);
+ String key = (String) keys.next();
+ Object value = map.get(key);
if (value == null) {
if (question)
src.append('&');
@@ -798,34 +799,34 @@
src.append(key);
src.append('=');
// Interpret null as "no value specified"
- } else if (value instanceof String[]) {
- String values[] = (String[]) value;
- for (int i = 0; i < values.length; i++) {
- if (question)
- src.append('&');
- else {
- src.append('?');
- question = true;
- }
- src.append(key);
- src.append('=');
- src.append(URLEncoder.encode(values[i]));
- }
- } else {
- if (question)
- src.append('&');
- else {
- src.append('?');
- question = true;
- }
- src.append(key);
- src.append('=');
- src.append(URLEncoder.encode(value.toString()));
- }
- }
+ } else if (value instanceof String[]) {
+ String values[] = (String[]) value;
+ for (int i = 0; i < values.length; i++) {
+ if (question)
+ src.append('&');
+ else {
+ src.append('?');
+ question = true;
+ }
+ src.append(key);
+ src.append('=');
+ src.append(URLEncoder.encode(values[i]));
+ }
+ } else {
+ if (question)
+ src.append('&');
+ else {
+ src.append('?');
+ question = true;
+ }
+ src.append(key);
+ src.append('=');
+ src.append(URLEncoder.encode(value.toString()));
+ }
+ }
- // Return the final result
- return (src.toString());
+ // Return the final result
+ return (src.toString());
}
1.19 +5 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java
Index: LinkTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- LinkTag.java 2001/09/17 19:59:30 1.18
+++ LinkTag.java 2001/12/10 10:05:50 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v 1.18
2001/09/17 19:59:30 husted Exp $
- * $Revision: 1.18 $
- * $Date: 2001/09/17 19:59:30 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v 1.19
2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -90,7 +90,7 @@
* Generate a URL-encoded hyperlink to the specified URI.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.18 $ $Date: 2001/09/17 19:59:30 $
+ * @version $Revision: 1.19 $ $Date: 2001/12/10 10:05:50 $
*/
public class LinkTag extends BaseHandlerTag {
@@ -393,6 +393,7 @@
}
results.append(prepareStyles());
results.append(prepareEventHandlers());
+ prepareFreetext( results );
results.append(">");
// Print this element to our output writer
1.11 +66 -65
jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java
Index: MultiboxTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MultiboxTag.java 2001/10/07 06:13:05 1.10
+++ MultiboxTag.java 2001/12/10 10:05:50 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
1.10 2001/10/07 06:13:05 martinc Exp $
- * $Revision: 1.10 $
- * $Date: 2001/10/07 06:13:05 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
1.11 2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -83,7 +83,7 @@
*
* @author Ralph Schaer
* @author Craig R. McClanahan
- * @version $Revision: 1.10 $ $Date: 2001/10/07 06:13:05 $
+ * @version $Revision: 1.11 $ $Date: 2001/12/10 10:05:50 $
*/
public class MultiboxTag extends BaseHandlerTag {
@@ -112,11 +112,11 @@
protected String name = Constants.BEAN_KEY;
public String getName() {
- return (this.name);
+ return (this.name);
}
public void setName(String name) {
- this.name = name;
+ this.name = name;
}
@@ -141,7 +141,7 @@
*/
public String getProperty() {
- return (this.property);
+ return (this.property);
}
@@ -153,7 +153,7 @@
*/
public void setProperty(String property) {
- this.property = property;
+ this.property = property;
}
@@ -163,7 +163,7 @@
*/
public String getValue() {
- return (this.value);
+ return (this.value);
}
@@ -175,7 +175,7 @@
*/
public void setValue(String value) {
- this.value = value;
+ this.value = value;
}
@@ -190,9 +190,9 @@
*/
public int doStartTag() throws JspException {
- // Defer processing until the end of this tag is encountered
+ // Defer processing until the end of this tag is encountered
this.constant = null;
- return (EVAL_BODY_TAG);
+ return (EVAL_BODY_TAG);
}
@@ -222,22 +222,22 @@
*/
public int doEndTag() throws JspException {
- // Create an appropriate "input" element based on our parameters
- StringBuffer results = new StringBuffer("<input type=\"checkbox\"");
- results.append(" name=\"");
- results.append(this.property);
- results.append("\"");
- if (accesskey != null) {
- results.append(" accesskey=\"");
- results.append(accesskey);
- results.append("\"");
- }
- if (tabindex != null) {
- results.append(" tabindex=\"");
- results.append(tabindex);
- results.append("\"");
- }
- results.append(" value=\"");
+ // Create an appropriate "input" element based on our parameters
+ StringBuffer results = new StringBuffer("<input type=\"checkbox\"");
+ results.append(" name=\"");
+ results.append(this.property);
+ results.append("\"");
+ if (accesskey != null) {
+ results.append(" accesskey=\"");
+ results.append(accesskey);
+ results.append("\"");
+ }
+ if (tabindex != null) {
+ results.append(" tabindex=\"");
+ results.append(tabindex);
+ results.append("\"");
+ }
+ results.append(" value=\"");
String value = this.value;
if (value == null)
value = this.constant;
@@ -249,43 +249,44 @@
throw e;
}
results.append(ResponseUtils.filter(value));
- results.append("\"");
- Object bean = pageContext.findAttribute(name);
- String values[] = null;
- if (bean == null)
- throw new JspException
- (messages.getMessage("getter.bean", name));
- try {
- values = BeanUtils.getArrayProperty(bean, property);
- if (values == null)
- values = new String[0];
- } catch (IllegalAccessException e) {
- throw new JspException
- (messages.getMessage("getter.access", property, name));
- } catch (InvocationTargetException e) {
- Throwable t = e.getTargetException();
- throw new JspException
- (messages.getMessage("getter.result",
- property, t.toString()));
- } catch (NoSuchMethodException e) {
- throw new JspException
- (messages.getMessage("getter.method", property, name));
- }
- for (int i = 0; i < values.length; i++) {
- if (value.equals(values[i])) {
- results.append(" checked=\"checked\"");
- break;
- }
- }
- results.append(prepareEventHandlers());
- results.append(prepareStyles());
- results.append(">");
+ results.append("\"");
+ Object bean = pageContext.findAttribute(name);
+ String values[] = null;
+ if (bean == null)
+ throw new JspException
+ (messages.getMessage("getter.bean", name));
+ try {
+ values = BeanUtils.getArrayProperty(bean, property);
+ if (values == null)
+ values = new String[0];
+ } catch (IllegalAccessException e) {
+ throw new JspException
+ (messages.getMessage("getter.access", property, name));
+ } catch (InvocationTargetException e) {
+ Throwable t = e.getTargetException();
+ throw new JspException
+ (messages.getMessage("getter.result",
+ property, t.toString()));
+ } catch (NoSuchMethodException e) {
+ throw new JspException
+ (messages.getMessage("getter.method", property, name));
+ }
+ for (int i = 0; i < values.length; i++) {
+ if (value.equals(values[i])) {
+ results.append(" checked=\"checked\"");
+ break;
+ }
+ }
+ results.append(prepareEventHandlers());
+ results.append(prepareStyles());
+ prepareFreetext( results );
+ results.append(">");
// Render this element to our response
ResponseUtils.write(pageContext, results.toString());
- // Continue evaluating this page
- return (EVAL_PAGE);
+ // Continue evaluating this page
+ return (EVAL_PAGE);
}
@@ -295,11 +296,11 @@
*/
public void release() {
- super.release();
+ super.release();
constant = null;
- name = Constants.BEAN_KEY;
- property = null;
- value = null;
+ name = Constants.BEAN_KEY;
+ property = null;
+ value = null;
}
1.9 +5 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java
Index: RadioTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RadioTag.java 2001/09/17 19:59:30 1.8
+++ RadioTag.java 2001/12/10 10:05:50 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java,v 1.8
2001/09/17 19:59:30 husted Exp $
- * $Revision: 1.8 $
- * $Date: 2001/09/17 19:59:30 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java,v 1.9
2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.9 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Tag for input fields of type "radio".
*
* @author Craig R. McClanahan
- * @version $Revision: 1.8 $ $Date: 2001/09/17 19:59:30 $
+ * @version $Revision: 1.9 $ $Date: 2001/12/10 10:05:50 $
*/
public class RadioTag extends BaseHandlerTag {
@@ -231,6 +231,7 @@
results.append(" checked=\"checked\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
+ prepareFreetext( results );
results.append(">");
// Print this field to our output writer
1.4 +44 -43
jakarta-struts/src/share/org/apache/struts/taglib/html/ResetTag.java
Index: ResetTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ResetTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResetTag.java 2001/04/18 01:31:15 1.3
+++ ResetTag.java 2001/12/10 10:05:50 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ResetTag.java,v 1.3
2001/04/18 01:31:15 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/04/18 01:31:15 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ResetTag.java,v 1.4
2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Tag for input fields of type "reset".
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/04/18 01:31:15 $
+ * @version $Revision: 1.4 $ $Date: 2001/12/10 10:05:50 $
*/
public class ResetTag extends BaseHandlerTag {
@@ -118,7 +118,7 @@
*/
public String getName() {
- return (this.name);
+ return (this.name);
}
@@ -130,7 +130,7 @@
*/
public void setName(String name) {
- this.name = name;
+ this.name = name;
}
@@ -140,7 +140,7 @@
*/
public String getValue() {
- return (this.value);
+ return (this.value);
}
@@ -152,7 +152,7 @@
*/
public void setValue(String value) {
- this.value = value;
+ this.value = value;
}
@@ -167,9 +167,9 @@
*/
public int doStartTag() throws JspException {
- // Do nothing until doEndTag() is called
+ // Do nothing until doEndTag() is called
this.text = null;
- return (EVAL_BODY_TAG);
+ return (EVAL_BODY_TAG);
}
@@ -199,40 +199,41 @@
*/
public int doEndTag() throws JspException {
- // Acquire the label value we will be generating
- String label = value;
- if ((label == null) && (text != null))
- label = text;
- if ((label == null) || (label.length() < 1))
- label = "Reset";
-
- // Generate an HTML element
- StringBuffer results = new StringBuffer();
- results.append("<input type=\"reset\" name=\"");
- results.append(name);
- results.append("\"");
- if (accesskey != null) {
- results.append(" accesskey=\"");
- results.append(accesskey);
- results.append("\"");
- }
- if (tabindex != null) {
- results.append(" tabindex=\"");
- results.append(tabindex);
- results.append("\"");
- }
- results.append(" value=\"");
- results.append(label);
- results.append("\"");
- results.append(prepareEventHandlers());
- results.append(prepareStyles());
- results.append(">");
+ // Acquire the label value we will be generating
+ String label = value;
+ if ((label == null) && (text != null))
+ label = text;
+ if ((label == null) || (label.length() < 1))
+ label = "Reset";
+
+ // Generate an HTML element
+ StringBuffer results = new StringBuffer();
+ results.append("<input type=\"reset\" name=\"");
+ results.append(name);
+ results.append("\"");
+ if (accesskey != null) {
+ results.append(" accesskey=\"");
+ results.append(accesskey);
+ results.append("\"");
+ }
+ if (tabindex != null) {
+ results.append(" tabindex=\"");
+ results.append(tabindex);
+ results.append("\"");
+ }
+ results.append(" value=\"");
+ results.append(label);
+ results.append("\"");
+ results.append(prepareEventHandlers());
+ results.append(prepareStyles());
+ prepareFreetext( results );
+ results.append(">");
- // Render this element to our writer
+ // Render this element to our writer
ResponseUtils.write(pageContext, results.toString());
// Evaluate the remainder of this page
- return (EVAL_PAGE);
+ return (EVAL_PAGE);
}
@@ -242,10 +243,10 @@
*/
public void release() {
- super.release();
- name = "reset";
+ super.release();
+ name = "reset";
text = null;
- value = null;
+ value = null;
}
1.9 +5 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java
Index: SelectTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SelectTag.java 2001/09/17 19:59:30 1.8
+++ SelectTag.java 2001/12/10 10:05:50 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v 1.8
2001/09/17 19:59:30 husted Exp $
- * $Revision: 1.8 $
- * $Date: 2001/09/17 19:59:30 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v 1.9
2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.9 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
* inside a form tag.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.8 $ $Date: 2001/09/17 19:59:30 $
+ * @version $Revision: 1.9 $ $Date: 2001/12/10 10:05:50 $
*/
public class SelectTag extends BaseHandlerTag {
@@ -269,6 +269,7 @@
}
results.append(prepareEventHandlers());
results.append(prepareStyles());
+ prepareFreetext( results );
results.append(">");
// Print this field to our output writer
1.6 +5 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/SubmitTag.java
Index: SubmitTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SubmitTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SubmitTag.java 2001/09/17 19:59:30 1.5
+++ SubmitTag.java 2001/12/10 10:05:50 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SubmitTag.java,v 1.5
2001/09/17 19:59:30 husted Exp $
- * $Revision: 1.5 $
- * $Date: 2001/09/17 19:59:30 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SubmitTag.java,v 1.6
2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Tag for input fields of type "submit".
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2001/09/17 19:59:30 $
+ * @version $Revision: 1.6 $ $Date: 2001/12/10 10:05:50 $
*/
public class SubmitTag extends BaseHandlerTag {
@@ -231,6 +231,7 @@
results.append("\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
+ prepareFreetext( results );
results.append(">");
// Render this element to our writer
1.8 +5 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java
Index: TextareaTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TextareaTag.java 2001/09/17 19:59:30 1.7
+++ TextareaTag.java 2001/12/10 10:05:50 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java,v
1.7 2001/09/17 19:59:30 husted Exp $
- * $Revision: 1.7 $
- * $Date: 2001/09/17 19:59:30 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java,v
1.8 2001/12/10 10:05:50 oalexeev Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/12/10 10:05:50 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* Custom tag for input fields of type "textarea".
*
* @author Craig R. McClanahan
- * @version $Revision: 1.7 $ $Date: 2001/09/17 19:59:30 $
+ * @version $Revision: 1.8 $ $Date: 2001/12/10 10:05:50 $
*/
public class TextareaTag extends BaseInputTag {
@@ -142,6 +142,7 @@
}
results.append(prepareEventHandlers());
results.append(prepareStyles());
+ prepareFreetext( results );
results.append(">");
if (value != null) {
results.append(ResponseUtils.filter(value));
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
