You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@locus.apache.org on 2000/06/30 18:50:33 UTC

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

craigmcc    00/06/30 09:50:32

  Modified:    src/share/org/apache/struts/taglib BaseFieldTag.java
                        BaseInputTag.java TextareaTag.java
  Log:
  (Sigh) Final fix for the "read-only properties" and "cannot find
  property" type error messages.  All custom tag properties in Struts are
  now Strings instead of some of them being ints.  The "int" properties fail
  in different ways depending on the combination of JVM and servlet
  container you are using -- this should no longer occur.
  
  Revision  Changes    Path
  1.5       +6 -6      jakarta-struts/src/share/org/apache/struts/taglib/BaseFieldTag.java
  
  Index: BaseFieldTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/BaseFieldTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BaseFieldTag.java	2000/06/24 03:16:11	1.4
  +++ BaseFieldTag.java	2000/06/30 16:50:26	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/BaseFieldTag.java,v 1.4 2000/06/24 03:16:11 craigmcc Exp $
  - * $Revision: 1.4 $
  - * $Date: 2000/06/24 03:16:11 $
  + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/BaseFieldTag.java,v 1.5 2000/06/30 16:50:26 craigmcc Exp $
  + * $Revision: 1.5 $
  + * $Date: 2000/06/30 16:50:26 $
    *
    * ====================================================================
    *
  @@ -77,7 +77,7 @@
    * Convenience base class for the various input tags for text fields.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.4 $ $Date: 2000/06/24 03:16:11 $
  + * @version $Revision: 1.5 $ $Date: 2000/06/30 16:50:26 $
    */
   
   public abstract class BaseFieldTag extends BaseInputTag {
  @@ -114,12 +114,12 @@
   	    results.append(accessKey);
   	    results.append("\"");
   	}
  -	if (maxlength >= 0) {
  +	if (maxlength != null) {
   	    results.append(" maxlength=\"");
   	    results.append(maxlength);
   	    results.append("\"");
   	}
  -	if (cols >= 0) {
  +	if (cols != null) {
   	    results.append(" size=\"");
   	    results.append(cols);
   	    results.append("\"");
  
  
  
  1.5       +14 -26    jakarta-struts/src/share/org/apache/struts/taglib/BaseInputTag.java
  
  Index: BaseInputTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/BaseInputTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BaseInputTag.java	2000/06/27 02:48:07	1.4
  +++ BaseInputTag.java	2000/06/30 16:50:27	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/BaseInputTag.java,v 1.4 2000/06/27 02:48:07 craigmcc Exp $
  - * $Revision: 1.4 $
  - * $Date: 2000/06/27 02:48:07 $
  + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/BaseInputTag.java,v 1.5 2000/06/30 16:50:27 craigmcc Exp $
  + * $Revision: 1.5 $
  + * $Date: 2000/06/30 16:50:27 $
    *
    * ====================================================================
    *
  @@ -74,7 +74,7 @@
    * Abstract base class for the various input tags.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.4 $ $Date: 2000/06/27 02:48:07 $
  + * @version $Revision: 1.5 $ $Date: 2000/06/30 16:50:27 $
    */
   
   public abstract class BaseInputTag extends BaseHandlerTag {
  @@ -87,13 +87,13 @@
        * The number of character columns for this field, or negative
        * for no limit.
        */
  -    protected int cols = -1;
  +    protected String cols = null;
   
   
       /**
        * The maximum number of characters allowed, or negative for no limit.
        */
  -    protected int maxlength = -1;
  +    protected String maxlength = null;
   
   
       /**
  @@ -113,7 +113,7 @@
       /**
        * The number of rows for this field, or negative for no limit.
        */
  -    protected int rows = -1;
  +    protected String rows = null;
   
   
       /**
  @@ -129,7 +129,7 @@
       /**
        * Return the number of columns for this field.
        */
  -    public int getCols() {
  +    public String getCols() {
   
   	return (this.cols);
   
  @@ -143,11 +143,7 @@
        */
       public void setCols(String cols) {
   
  -	try {
  -	    this.cols = Integer.parseInt(cols);
  -	} catch (NumberFormatException e) {
  -	    ;
  -	}
  +	this.cols = cols;
   
       }
   
  @@ -155,7 +151,7 @@
       /**
        * Return the maximum length allowed.
        */
  -    public int getMaxlength() {
  +    public String getMaxlength() {
   
   	return (this.maxlength);
   
  @@ -169,11 +165,7 @@
        */
       public void setMaxlength(String maxlength) {
   
  -	try {
  -	    this.maxlength = Integer.parseInt(maxlength);
  -	} catch (NumberFormatException e) {
  -	    ;
  -	}
  +	this.maxlength = maxlength;
   
       }
   
  @@ -203,7 +195,7 @@
       /**
        * Return the number of rows for this field.
        */
  -    public int getRows() {
  +    public String getRows() {
   
   	return (this.rows);
   
  @@ -217,11 +209,7 @@
        */
       public void setRows(String rows) {
   
  -	try {
  -	    this.rows = Integer.parseInt(rows);
  -	} catch (NumberFormatException e) {
  -	    ;
  -	}
  +	this.rows = rows;
   
       }
   
  @@ -229,7 +217,7 @@
       /**
        * Return the size of this field (synonym for <code>getCols()</code>).
        */
  -    public int getSize() {
  +    public String getSize() {
   
   	return (getCols());
   
  
  
  
  1.9       +6 -6      jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java
  
  Index: TextareaTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TextareaTag.java	2000/06/24 03:16:12	1.8
  +++ TextareaTag.java	2000/06/30 16:50:28	1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java,v 1.8 2000/06/24 03:16:12 craigmcc Exp $
  - * $Revision: 1.8 $
  - * $Date: 2000/06/24 03:16:12 $
  + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TextareaTag.java,v 1.9 2000/06/30 16:50:28 craigmcc Exp $
  + * $Revision: 1.9 $
  + * $Date: 2000/06/30 16:50:28 $
    *
    * ====================================================================
    *
  @@ -77,7 +77,7 @@
    * Custom tag for input fields of type "textarea".
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.8 $ $Date: 2000/06/24 03:16:12 $
  + * @version $Revision: 1.9 $ $Date: 2000/06/30 16:50:28 $
    */
   
   public class TextareaTag extends BaseInputTag {
  @@ -121,12 +121,12 @@
   	    results.append(tabIndex);
   	    results.append("\"");
   	}
  -	if (cols >= 0) {
  +	if (cols != null) {
   	    results.append(" cols=\"");
   	    results.append(cols);
   	    results.append("\"");
   	}
  -	if (rows >= 0) {
  +	if (rows != null) {
   	    results.append(" rows=\"");
   	    results.append(rows);
   	    results.append("\"");