cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseFieldTag.java

2003-11-15 Thread dgraham 
dgraham 2003/11/15 15:08:54

  Modified:src/share/org/apache/struts/taglib/html BaseFieldTag.java
  Log:
  Added formatValue() method for PR# 24608.
  
  Revision  ChangesPath
  1.22  +30 -13
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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- BaseFieldTag.java 31 Jul 2003 00:34:15 -  1.21
  +++ BaseFieldTag.java 15 Nov 2003 23:08:54 -  1.22
  @@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
  - * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
  @@ -189,23 +189,40 @@
   
   results.append(" value=\"");
   if (value != null) {
  -results.append(TagUtils.getInstance().filter(value));
  +results.append(this.formatValue(value));
   
   } else if (redisplay || !"password".equals(type)) {
  -Object value = TagUtils.getInstance().lookup(pageContext, name, 
property, null);
  -if (value == null) {
  -value = "";
  -}
  -
  -results.append(TagUtils.getInstance().filter(value.toString()));
  +Object value =
  +TagUtils.getInstance().lookup(pageContext, name, property, null);
  +
  +results.append(this.formatValue(value));
   }
   
  -results.append("\"");
  +results.append('"');
   results.append(this.prepareEventHandlers());
   results.append(this.prepareStyles());
   results.append(this.getElementClose());
   
   return results.toString();
  +}
  +
  +/**
  + * Return the given value as a formatted String.  This 
  + * implementation escapes potentially harmful HTML characters.
  + *
  + * @param value The value to be formatted. null values will
  + * be returned as the empty String "".
  + * 
  + * @throws JspException if a JSP exception has occurred
  + * 
  + * @since Struts 1.2
  + */
  +protected String formatValue(Object value) throws JspException {
  +if (value == null) {
  +return "";
  +}
  +
  +return TagUtils.getInstance().filter(value.toString());
   }
   
   /**
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseFieldTag.java

2003-07-04 Thread dgraham 
dgraham 2003/07/04 13:23:10

  Modified:src/share/org/apache/struts/taglib/html BaseFieldTag.java
  Log:
  Refactored input element generation into new renderInputElement() method 
  called from doStartTag().
  
  Revision  ChangesPath
  1.18  +36 -19
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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- BaseFieldTag.java 16 Nov 2002 06:05:21 -  1.17
  +++ BaseFieldTag.java 4 Jul 2003 20:23:10 -   1.18
  @@ -134,14 +134,27 @@
* @exception JspException if a JSP exception has occurred
*/
   public int doStartTag() throws JspException {
  +
  +ResponseUtils.write(this.pageContext, this.renderInputElement());
   
  -// Create an appropriate "input" element based on our parameters
  +return (EVAL_BODY_TAG);
  +
  +}
  +
  +/**
  + * Renders a fully formed  element.
  + * @throws JspException
  + * @since Struts 1.2
  + */
  +protected String renderInputElement() throws JspException {
   StringBuffer results = new StringBuffer("

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseFieldTag.java BaseTag.java ButtonTag.java CancelTag.java CheckboxTag.java FrameTag.java ImageTag.java ImgTag.java MultiboxTag.java RadioTag.java ResetTag.java SubmitTag.java

2002-10-26 Thread jholmes 
jholmes 2002/10/26 08:08:17

  Modified:src/share/org/apache/struts/taglib/html BaseFieldTag.java
BaseTag.java ButtonTag.java CancelTag.java
CheckboxTag.java FrameTag.java ImageTag.java
ImgTag.java MultiboxTag.java RadioTag.java
ResetTag.java SubmitTag.java
  Log:
  revert changes for Bugzilla #12185
  
  Revision  ChangesPath
  1.15  +5 -5  
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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- BaseFieldTag.java 21 Oct 2002 22:30:22 -  1.14
  +++ BaseFieldTag.java 26 Oct 2002 15:08:16 -  1.15
  @@ -192,7 +192,7 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(" />");
  +results.append(">");
   
   // Print this field to our output writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.8   +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java
  
  Index: BaseTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BaseTag.java  21 Oct 2002 22:30:22 -  1.7
  +++ BaseTag.java  26 Oct 2002 15:08:16 -  1.8
  @@ -133,7 +133,7 @@
   buf.append(target);
   buf.append("\"");
   }
  -buf.append(" />");
  +buf.append(">");
   JspWriter out = pageContext.getOut();
   try {
   out.write(buf.toString());
  
  
  
  1.12  +5 -5  
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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ButtonTag.java21 Oct 2002 22:30:22 -  1.11
  +++ ButtonTag.java26 Oct 2002 15:08:16 -  1.12
  @@ -207,7 +207,7 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(" />");
  +results.append(">");
   
   // Render this element to our writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.8   +5 -5  
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CancelTag.java21 Oct 2002 22:30:22 -  1.7
  +++ CancelTag.java26 Oct 2002 15:08:16 -  1.8
  @@ -210,7 +210,7 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(" />");
  +results.append(">");
   
   // Render this element to our writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.15  +5 -5  
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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- CheckboxTag.java  23 Oct 2002 18:54:49 -  1.14
  +++ CheckboxTag.java  26 Oct 2002 15:08:16 -  1.15
  @@ -218,7 +218,7 @@
   results.append(" checked=\"checked\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(" />");
  +results.append(">");
   
   // Print this field to our output writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.6   +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java
  
  Index: FrameTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FrameTag.java 21 Oct 2002 22:30:22 -  1.5
  +++ FrameTag.java 26 Oct 2002 15:08:16 -  1.6
  @@ -243,7 +2

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseFieldTag.java BaseTag.java ButtonTag.java CancelTag.java CheckboxTag.java FrameTag.java ImageTag.java ImgTag.java MultiboxTag.java RadioTag.java ResetTag.java SubmitTag.java

2002-10-21 Thread jholmes 
jholmes 2002/10/21 15:30:23

  Modified:src/share/org/apache/struts/taglib/html BaseFieldTag.java
BaseTag.java ButtonTag.java CancelTag.java
CheckboxTag.java FrameTag.java ImageTag.java
ImgTag.java MultiboxTag.java RadioTag.java
ResetTag.java SubmitTag.java
  Log:
  fix tags so that they work in text/xml mode
  
  PR: Bugzilla #12185
  
  Revision  ChangesPath
  1.14  +5 -5  
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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- BaseFieldTag.java 23 Sep 2002 05:13:43 -  1.13
  +++ BaseFieldTag.java 21 Oct 2002 22:30:22 -  1.14
  @@ -192,7 +192,7 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(">");
  +results.append(" />");
   
   // Print this field to our output writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.7   +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java
  
  Index: BaseTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BaseTag.java  5 Oct 2002 22:56:21 -   1.6
  +++ BaseTag.java  21 Oct 2002 22:30:22 -  1.7
  @@ -133,7 +133,7 @@
   buf.append(target);
   buf.append("\"");
   }
  -buf.append(">");
  +buf.append(" />");
   JspWriter out = pageContext.getOut();
   try {
   out.write(buf.toString());
  
  
  
  1.11  +5 -5  
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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ButtonTag.java23 Sep 2002 05:13:43 -  1.10
  +++ ButtonTag.java21 Oct 2002 22:30:22 -  1.11
  @@ -207,7 +207,7 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(">");
  +results.append(" />");
   
   // Render this element to our writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.7   +5 -5  
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CancelTag.java23 Sep 2002 05:13:43 -  1.6
  +++ CancelTag.java21 Oct 2002 22:30:22 -  1.7
  @@ -210,7 +210,7 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(">");
  +results.append(" />");
   
   // Render this element to our writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.13  +5 -5  
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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- CheckboxTag.java  23 Sep 2002 05:13:43 -  1.12
  +++ CheckboxTag.java  21 Oct 2002 22:30:22 -  1.13
  @@ -217,7 +217,7 @@
   results.append(" checked=\"checked\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(">");
  +results.append(" />");
   
   // Print this field to our output writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.5   +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java
  
  Index: FrameTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FrameTag.java 8 Oct 2002 06:22:41 -   1.4
  +++ FrameTag.java 21 Oct 2002 22:3

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseFieldTag.java BaseHandlerTag.java BaseInputTag.java BaseTag.java ButtonTag.java CancelTag.java CheckboxTag.java ErrorsTag.java FrameTag.java HtmlTag.java ImageTag.java ImgTag.java LinkTag.java MessagesTag.java MultiboxTag.java OptionTag.java OptionsCollectionTag.java OptionsTag.java RadioTag.java ResetTag.java RewriteTag.java SelectTag.java SubmitTag.java TextareaTag.java

2002-09-22 Thread martinc 

martinc 2002/09/22 22:13:44

  Modified:src/share/org/apache/struts/taglib/html BaseFieldTag.java
BaseHandlerTag.java BaseInputTag.java BaseTag.java
ButtonTag.java CancelTag.java CheckboxTag.java
ErrorsTag.java FrameTag.java HtmlTag.java
ImageTag.java ImgTag.java LinkTag.java
MessagesTag.java MultiboxTag.java OptionTag.java
OptionsCollectionTag.java OptionsTag.java
RadioTag.java ResetTag.java RewriteTag.java
SelectTag.java SubmitTag.java TextareaTag.java
  Log:
  More cleanup identified by IDEA.
  
  Revision  ChangesPath
  1.13  +4 -11 
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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BaseFieldTag.java 25 Jun 2002 00:45:41 -  1.12
  +++ BaseFieldTag.java 23 Sep 2002 05:13:43 -  1.13
  @@ -63,14 +63,7 @@
   package org.apache.struts.taglib.html;
   
   
  -import java.io.IOException;
  -import java.lang.reflect.InvocationTargetException;
   import javax.servlet.jsp.JspException;
  -import javax.servlet.jsp.JspWriter;
  -import javax.servlet.jsp.PageContext;
  -import javax.servlet.jsp.tagext.TagSupport;
  -import org.apache.struts.upload.FormFile;
  -import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
   
  
  
  
  1.17  +4 -5  
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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- BaseHandlerTag.java   25 Jun 2002 00:45:41 -  1.16
  +++ BaseHandlerTag.java   23 Sep 2002 05:13:43 -  1.17
  @@ -63,7 +63,6 @@
   
   import java.util.Locale;
   import javax.servlet.jsp.JspException;
  -import javax.servlet.jsp.PageContext;
   import javax.servlet.jsp.tagext.BodyTagSupport;
   import org.apache.struts.action.Action;
   import org.apache.struts.util.MessageResources;
  
  
  
  1.2   +4 -7  
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseInputTag.java
  
  Index: BaseInputTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseInputTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BaseInputTag.java 6 Jan 2001 21:50:39 -   1.1
  +++ BaseInputTag.java 23 Sep 2002 05:13:43 -  1.2
  @@ -63,10 +63,7 @@
   package org.apache.struts.taglib.html;
   
   
  -import java.io.IOException;
   import javax.servlet.jsp.JspException;
  -import javax.servlet.jsp.PageContext;
  -import javax.servlet.jsp.tagext.TagSupport;
   import org.apache.struts.util.MessageResources;
   
   
  
  
  
  1.5   +4 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java
  
  Index: BaseTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BaseTag.java  11 Mar 2001 00:58:43 -  1.4
  +++ BaseTag.java  23 Sep 2002 05:13:43 -  1.5
  @@ -69,7 +69,6 @@
   import javax.servlet.jsp.tagext.TagSupport;
   import org.apache.struts.action.Action;
   import org.apache.struts.util.MessageResources;
  -import org.apache.struts.util.RequestUtils;
   
   
   /**
  
  
  
  1.10  +5 -8  
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ButtonTag.java25 Jun 2002 00:45:41 -  1.9
  +++ ButtonTag.java23 Sep 2002 05:13:43 -  1.10
  @@ -63,10 +63,7 @@
   package org.apache.struts.taglib.html;
   
   
  -import java.io.IOException;
   import javax.servlet.jsp.JspException;
  -import javax.servlet.jsp.PageContext;
  -import javax.servlet.jsp.JspWriter;
   import org.apache.struts.util.ResponseUtils;
   
   
  @@ -113,7 +110,7 @@
   /**
* Set the property name.
*
  - * @param name The property name
  + * @param property The property name
*/

cvs commit: jakarta-struts/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

2001-12-11 Thread oalexeev 

oalexeev01/12/11 09:54:29

  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:
  Revert 'freetext' attribute adding.
  
  Revision  ChangesPath
  1.11  +0 -1  
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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- BaseFieldTag.java 2001/12/10 10:05:50 1.10
  +++ BaseFieldTag.java 2001/12/11 17:54:28 1.11
  @@ -1,7 +1,7 @@
   /*
  - * $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 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 
1.11 2001/12/11 17:54:28 oalexeev Exp $
  + * $Revision: 1.11 $
  + * $Date: 2001/12/11 17:54:28 $
*
* 
*
  @@ -79,7 +79,7 @@
* Convenience base class for the various input tags for text fields.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.10 $ $Date: 2001/12/10 10:05:50 $
  + * @version $Revision: 1.11 $ $Date: 2001/12/11 17:54:28 $
*/
   
   public abstract class BaseFieldTag extends BaseInputTag {
  @@ -198,7 +198,6 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -prepareFreetext( results );
   results.append(">");
   
   // Print this field to our output writer
  
  
  
  1.12  +0 -32 
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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BaseHandlerTag.java   2001/12/10 10:05:50 1.11
  +++ BaseHandlerTag.java   2001/12/11 17:54:28 1.12
  @@ -1,7 +1,7 @@
   /*
  - * $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 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v 
1.12 2001/12/11 17:54:28 oalexeev Exp $
  + * $Revision: 1.12 $
  + * $Date: 2001/12/11 17:54:28 $
*
* 
*
  @@ -74,7 +74,7 @@
* appropriate implementations of these.
*
* @author Don Clasen
  - * @version $Revision: 1.11 $ $Date: 2001/12/10 10:05:50 $
  + * @version $Revision: 1.12 $ $Date: 2001/12/11 17:54:28 $
*/
   
   public abstract class BaseHandlerTag extends BodyTagSupport {
  @@ -176,13 +176,6 @@
   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
  @@ -432,17 +425,6 @@
   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
   
  @@ -476,7 +458,6 @@
   styleId = null;
   title = null;
   indexed = false;
  -freeText = null;
   
   }
   
  @@ -675,20 +656,7 @@
   
   }
   
  -/**
  - * 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.8   +0 -1  
jakarta-struts/src/

cvs commit: jakarta-struts/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

2001-12-10 Thread oalexeev 

oalexeev01/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  ChangesPath
  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(" ");
  +}
  +
  +}

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseFieldTag.java ImgTag.java LinkTag.java OptionsTag.java RewriteTag.java

2001-04-28 Thread craigmcc 

craigmcc01/04/28 17:38:05

  Modified:src/share/org/apache/struts/taglib/html BaseFieldTag.java
ImgTag.java LinkTag.java OptionsTag.java
RewriteTag.java
  Log:
  Remove obsolete "import" statements.
  
  Revision  ChangesPath
  1.7   +4 -35 
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BaseFieldTag.java 2001/04/18 23:51:30 1.6
  +++ BaseFieldTag.java 2001/04/29 00:38:04 1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 
1.6 2001/04/18 23:51:30 craigmcc Exp $
  - * $Revision: 1.6 $
  - * $Date: 2001/04/18 23:51:30 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 
1.7 2001/04/29 00:38:04 craigmcc Exp $
  + * $Revision: 1.7 $
  + * $Date: 2001/04/29 00:38:04 $
*
* 
*
  @@ -71,7 +71,6 @@
   import javax.servlet.jsp.tagext.TagSupport;
   import org.apache.struts.upload.FormFile;
   import org.apache.struts.util.MessageResources;
  -import org.apache.struts.util.PropertyUtils;
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
   
  @@ -80,7 +79,7 @@
* Convenience base class for the various input tags for text fields.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.6 $ $Date: 2001/04/18 23:51:30 $
  + * @version $Revision: 1.7 $ $Date: 2001/04/29 00:38:04 $
*/
   
   public abstract class BaseFieldTag extends BaseInputTag {
  @@ -186,36 +185,6 @@
if (value != null) {
results.append(ResponseUtils.filter(value));
} else if (redisplay || !"password".equals(type)) {
  -/*
  - Object bean = pageContext.findAttribute(name);
  - if (bean == null)
  - throw new JspException
  - (messages.getMessage("getter.bean", name));
  - try {
  -String value = "";
  -Object objvalue = PropertyUtils.getProperty(bean, property);
  -if ((objvalue != null) &&
  -!(objvalue instanceof FormFile)) {
  -value = objvalue.toString();
  -}
  -if (value == null) {
  -value = "";
  -}
  - results.append(ResponseUtils.filter(value));
  - } catch (IllegalAccessException e) {
  - throw new JspException
  - (messages.getMessage("getter.access", property, name));
  - } catch (InvocationTargetException e) {
  - Throwable t = e.getTargetException();
  -t.printStackTrace();
  - throw new JspException
  - (messages.getMessage("getter.result",
  -  property, t.toString()));
  - } catch (NoSuchMethodException e) {
  - throw new JspException
  - (messages.getMessage("getter.method", property, name));
  - }
  -*/
   Object value = RequestUtils.lookup(pageContext, name, property,
  null);
   if (value == null)
  
  
  
  1.10  +4 -6  
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ImgTag.java   2001/04/19 21:13:58 1.9
  +++ ImgTag.java   2001/04/29 00:38:04 1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v 1.9 
2001/04/19 21:13:58 craigmcc Exp $
  - * $Revision: 1.9 $
  - * $Date: 2001/04/19 21:13:58 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v 1.10 
2001/04/29 00:38:04 craigmcc Exp $
  + * $Revision: 1.10 $
  + * $Date: 2001/04/29 00:38:04 $
*
* 
*
  @@ -75,9 +75,7 @@
   import javax.servlet.jsp.JspWriter;
   import javax.servlet.jsp.PageContext;
   import org.apache.struts.action.Action;
  -import org.apache.struts.util.BeanUtils;
   import org.apache.struts.util.MessageResources;
  -import org.apache.struts.util.PropertyUtils;
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
   
  @@ -97,7 +95,7 @@
*
* @author Michael Westbay

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseFieldTag.java FormTag.java OptionsTag.java RewriteTag.java TextareaTag.java

2001-04-18 Thread craigmcc 

craigmcc01/04/18 16:51:35

  Modified:src/share/org/apache/struts/taglib/html BaseFieldTag.java
FormTag.java OptionsTag.java RewriteTag.java
TextareaTag.java
  Log:
  Eliminate the remaining cases where tags were not calling
  ResponseUtils.write() to render their output.
  
  Revision  ChangesPath
  1.6   +7 -13 
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BaseFieldTag.java 2001/04/03 19:23:15 1.5
  +++ BaseFieldTag.java 2001/04/18 23:51:30 1.6
  @@ -1,13 +1,13 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 
1.5 2001/04/03 19:23:15 craigmcc Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/04/03 19:23:15 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 
1.6 2001/04/18 23:51:30 craigmcc Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/04/18 23:51:30 $
*
* 
*
* The Apache Software License, Version 1.1
*
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
  @@ -29,7 +29,7 @@
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Struts", and "Apache Software
*Foundation" must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
  @@ -80,7 +80,7 @@
* Convenience base class for the various input tags for text fields.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.5 $ $Date: 2001/04/03 19:23:15 $
  + * @version $Revision: 1.6 $ $Date: 2001/04/18 23:51:30 $
*/
   
   public abstract class BaseFieldTag extends BaseInputTag {
  @@ -228,13 +228,7 @@
results.append(">");
   
// Print this field to our output writer
  - JspWriter writer = pageContext.getOut();
  - try {
  - writer.print(results.toString());
  - } catch (IOException e) {
  - throw new JspException
  - (messages.getMessage("common.io", e.toString()));
  - }
  +ResponseUtils.write(pageContext, results.toString());
   
// Continue processing this page
return (EVAL_BODY_TAG);
  
  
  
  1.9   +5 -11 
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FormTag.java  2001/04/03 18:06:18 1.8
  +++ FormTag.java  2001/04/18 23:51:30 1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v 1.8 
2001/04/03 18:06:18 craigmcc Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/04/03 18:06:18 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v 1.9 
2001/04/18 23:51:30 craigmcc Exp $
  + * $Revision: 1.9 $
  + * $Date: 2001/04/18 23:51:30 $
*
* 
*
  @@ -85,7 +85,7 @@
* properties correspond to the various fields of the form.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.8 $ $Date: 2001/04/03 18:06:18 $
  + * @version $Revision: 1.9 $ $Date: 2001/04/18 23:51:30 $
*/
   
   public class FormTag extends TagSupport {
  @@ -499,13 +499,7 @@
   }
   
// Print this field to our output writer
  - JspWriter writer = pageContext.getOut();
  - try {
  - writer.print(results.toString());
  - } catch (IOException e) {
  - throw new JspException
  - (messages.getMessage("common.io", e.toString()));
  - }
  +ResponseUtils.write(pageContext, results.toString());
   
// Store this tag itself as a page attribute
pageContext.setAttribute(Constants.FORM_KEY, this);
  
  
  
  1.5   +4 -8  
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java
  
  Index: OptionsTag.java
  ===
  RCS file:

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseFieldTag.java MultiboxTag.java TextareaTag.java

2001-04-03 Thread craigmcc 

craigmcc01/04/03 12:23:15

  Modified:src/share/org/apache/struts/taglib/html BaseFieldTag.java
MultiboxTag.java TextareaTag.java
  Log:
  Replace use of deprecated BeanUtils.filter() with ResponseUtils.filter().
  
  Revision  ChangesPath
  1.5   +6 -7  
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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BaseFieldTag.java 2001/02/14 00:39:52 1.4
  +++ BaseFieldTag.java 2001/04/03 19:23:15 1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 
1.4 2001/02/14 00:39:52 craigmcc Exp $
  - * $Revision: 1.4 $
  - * $Date: 2001/02/14 00:39:52 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 
1.5 2001/04/03 19:23:15 craigmcc Exp $
  + * $Revision: 1.5 $
  + * $Date: 2001/04/03 19:23:15 $
*
* 
*
  @@ -70,7 +70,6 @@
   import javax.servlet.jsp.PageContext;
   import javax.servlet.jsp.tagext.TagSupport;
   import org.apache.struts.upload.FormFile;
  -import org.apache.struts.util.BeanUtils;
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.PropertyUtils;
   import org.apache.struts.util.RequestUtils;
  @@ -81,7 +80,7 @@
* Convenience base class for the various input tags for text fields.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.4 $ $Date: 2001/02/14 00:39:52 $
  + * @version $Revision: 1.5 $ $Date: 2001/04/03 19:23:15 $
*/
   
   public abstract class BaseFieldTag extends BaseInputTag {
  @@ -185,7 +184,7 @@
}
results.append(" value=\"");
if (value != null) {
  - results.append(BeanUtils.filter(value));
  + results.append(ResponseUtils.filter(value));
} else if (redisplay || !"password".equals(type)) {
   /*
Object bean = pageContext.findAttribute(name);
  @@ -202,7 +201,7 @@
   if (value == null) {
   value = "";
   }
  - results.append(BeanUtils.filter(value));
  + results.append(ResponseUtils.filter(value));
} catch (IllegalAccessException e) {
throw new JspException
(messages.getMessage("getter.access", property, name));
  
  
  
  1.4   +6 -5  
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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MultiboxTag.java  2001/02/10 23:31:50 1.3
  +++ MultiboxTag.java  2001/04/03 19:23:15 1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v 
1.3 2001/02/10 23:31:50 craigmcc Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/02/10 23:31:50 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v 
1.4 2001/04/03 19:23:15 craigmcc Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/04/03 19:23:15 $
*
* 
*
  @@ -71,6 +71,7 @@
   import org.apache.struts.action.Action;
   import org.apache.struts.util.BeanUtils;
   import org.apache.struts.util.MessageResources;
  +import org.apache.struts.util.ResponseUtils;
   
   
   /**
  @@ -82,7 +83,7 @@
*
* @author Ralph Schaer
* @author Craig R. McClanahan
  - * @version $Revision: 1.3 $ $Date: 2001/02/10 23:31:50 $
  + * @version $Revision: 1.4 $ $Date: 2001/04/03 19:23:15 $
*/
   
   public class MultiboxTag extends BaseHandlerTag {
  @@ -246,7 +247,7 @@
PageContext.REQUEST_SCOPE);
   throw e;
   }
  -results.append(BeanUtils.filter(value));
  +results.append(ResponseUtils.filter(value));
results.append("\"");
Object bean = pageContext.findAttribute(name);
String values[] = null;
  
  
  
  1.3   +7 -6  
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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TextareaTag.java  2001/01/08 21:36:13 1.2
  +++ TextareaTag.java  2001/04/03 19:23:15 1.3
  @@ -1,7 +1,7

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseFieldTag.java

2001-02-01 Thread craigmcc 

craigmcc01/01/31 16:48:08

  Modified:src/share/org/apache/struts/taglib/html BaseFieldTag.java
  Log:
  Do not redisplay the contents of a field of type , because
  this caused the actual value to be included in the page source of the rendered
  page.  This could lead to security concerns, for example if the password was
  invalid due to a simple typo.
  
  Submitted by:  Frederic Bages <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.3   +5 -5  
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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BaseFieldTag.java 2001/01/08 00:48:17 1.2
  +++ BaseFieldTag.java 2001/02/01 00:48:07 1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 
1.2 2001/01/08 00:48:17 craigmcc Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/01/08 00:48:17 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v 
1.3 2001/02/01 00:48:07 craigmcc Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/02/01 00:48:07 $
*
* 
*
  @@ -79,7 +79,7 @@
* Convenience base class for the various input tags for text fields.
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.2 $ $Date: 2001/01/08 00:48:17 $
  + * @version $Revision: 1.3 $ $Date: 2001/02/01 00:48:07 $
*/
   
   public abstract class BaseFieldTag extends BaseInputTag {
  @@ -170,7 +170,7 @@
results.append(" value=\"");
if (value != null) {
results.append(BeanUtils.filter(value));
  - } else {
  + } else if (!"password".equals(type)) {
Object bean = pageContext.findAttribute(name);
if (bean == null)
throw new JspException