jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sh...@apache.org
Subject cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/xml ParamTag.java
Date Wed, 12 Dec 2001 02:28:04 GMT
shawn       01/12/11 18:28:04

  Modified:    standard/src/org/apache/taglibs/standard/tag/common/xml
                        ParamSupport.java TransformSupport.java
               standard/src/org/apache/taglibs/standard/tag/el/xml
                        ParamTag.java
               standard/src/org/apache/taglibs/standard/tag/rt/xml
                        ParamTag.java
  Log:
  XML transformation parameters:  String -> Object
  (And somehow, one of the minor SPEL documentation changes got stuck in this commit too!)
  
  Revision  Changes    Path
  1.2       +5 -4      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
  
  Index: ParamSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ParamSupport.java	2001/11/21 07:38:53	1.1
  +++ ParamSupport.java	2001/12/12 02:28:04	1.2
  @@ -74,7 +74,7 @@
       // Protected state
   
       protected String name;                       // 'name' attribute
  -    protected String value;                      // 'value' attribute
  +    protected Object value;                      // 'value' attribute
   
       //*********************************************************************
       // Constructor and initialization
  @@ -85,7 +85,8 @@
       }
   
       private void init() {
  -	name = value = null;
  +	name = null;
  +	value = null;
       }
   
   
  @@ -100,14 +101,14 @@
   		Resources.getMessage("PARAM_OUTSIDE_TRANSFORM"));
   	TransformSupport parent = (TransformSupport) t;
   
  -	String value = this.value;
  +	Object value = this.value;
   	if (value == null) {
               String bcs = getBodyContent().getString();
               if (bcs == null || (value = bcs.trim()).equals(""))
                   throw new JspTagException(
                       Resources.getMessage("PARAM_NO_VALUE"));
   	}
  -	parent.setParameter(name, value);
  +	parent.addParameter(name, value);
   	return EVAL_PAGE;
       }
   
  
  
  
  1.4       +2 -2      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
  
  Index: TransformSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TransformSupport.java	2001/11/23 14:01:22	1.3
  +++ TransformSupport.java	2001/12/12 02:28:04	1.4
  @@ -217,8 +217,8 @@
       //*********************************************************************
       // Public methods for subtags
   
  -    /** Sets a transformation parameter on our transformer. */
  -    public void setParameter(String name, String value) {
  +    /** Sets (adds) a transformation parameter on our transformer. */
  +    public void addParameter(String name, Object value) {
   	t.setParameter(name, value);
       }
   
  
  
  
  1.2       +2 -2      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/xml/ParamTag.java
  
  Index: ParamTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/xml/ParamTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ParamTag.java	2001/11/21 07:39:08	1.1
  +++ ParamTag.java	2001/12/12 02:28:04	1.2
  @@ -141,7 +141,7 @@
   
   	name = (String) ExpressionUtil.evalNotNull(
   	    "import", "name", name_, String.class, this, pageContext);
  -	value = (String) ExpressionUtil.evalNotNull(
  -	    "import", "value", value_, String.class, this, pageContext);
  +	value = ExpressionUtil.evalNotNull(
  +	    "import", "value", value_, Object.class, this, pageContext);
       }
   }
  
  
  
  1.2       +1 -1      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
  
  Index: ParamTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ParamTag.java	2001/11/21 07:38:52	1.1
  +++ ParamTag.java	2001/12/12 02:28:04	1.2
  @@ -77,7 +77,7 @@
       }
   
       // for tag attribute
  -    public void setValue(String value) throws JspTagException {
  +    public void setValue(Object value) throws JspTagException {
           this.value = value;
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:taglibs-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:taglibs-dev-help@jakarta.apache.org>


Mime
View raw message