jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From felip...@apache.org
Subject cvs commit: jakarta-taglibs/string/xml string.xml
Date Sat, 13 Mar 2004 00:59:43 GMT
felipeal    2004/03/12 16:59:43

  Modified:    string/src/org/apache/taglibs/string DecodeUrlTag.java
                        EncodeUrlTag.java
               string/xml string.xml
  Removed:     string/src/org/apache/taglibs/string
                        BaseEncodeDecodeTagSupport.java
  Log:
  Rolled back bug 18964 changes, as it would require the whole project to be built against
J2SE 1.4
  
  Revision  Changes    Path
  1.6       +12 -11    jakarta-taglibs/string/src/org/apache/taglibs/string/DecodeUrlTag.java
  
  Index: DecodeUrlTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/string/src/org/apache/taglibs/string/DecodeUrlTag.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DecodeUrlTag.java	12 Mar 2004 01:45:51 -0000	1.5
  +++ DecodeUrlTag.java	13 Mar 2004 00:59:43 -0000	1.6
  @@ -16,26 +16,27 @@
   package org.apache.taglibs.string;
   
   import java.net.URLDecoder;
  -import java.io.UnsupportedEncodingException;
  +import javax.servlet.jsp.JspException;
   
   /**
    * Decode a URL so it may be nicely printed.
    * 
    * @author bayard@generationjava.com
    */
  -public class DecodeUrlTag extends BaseEncodeDecodeTagSupport {
  +public class DecodeUrlTag extends StringTagSupport {
   
       public DecodeUrlTag() {
  -        super( "decodeUrl" );
  +        super();
  +    }
  +
  +
  +    public String changeString(String text) throws JspException {
  +        return URLDecoder.decode(text);
  +    }
  +
  +    public void initAttributes() {
  +
       }
   
  -  public String actionWithEncoding( String text, String encoding )
  -    throws UnsupportedEncodingException {
  -    return URLDecoder.decode( text, encoding );
  -  }
  -  
  -  public String actionWithoutEncoding( String text ) {
  -    return URLDecoder.decode( text );
  -  }
   
   }
  
  
  
  1.8       +13 -12    jakarta-taglibs/string/src/org/apache/taglibs/string/EncodeUrlTag.java
  
  Index: EncodeUrlTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/string/src/org/apache/taglibs/string/EncodeUrlTag.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EncodeUrlTag.java	12 Mar 2004 01:45:51 -0000	1.7
  +++ EncodeUrlTag.java	13 Mar 2004 00:59:43 -0000	1.8
  @@ -16,26 +16,27 @@
   package org.apache.taglibs.string;
   
   import java.net.URLEncoder;
  -import java.io.UnsupportedEncodingException;
  +import javax.servlet.jsp.JspException;
   
   /**
  - * Encode a URL so it may be nicely printed.
  + * Encode a String to that it may be used as a URL.
    * 
    * @author bayard@generationjava.com
    */
  -public class EncodeUrlTag extends BaseEncodeDecodeTagSupport {
  +public class EncodeUrlTag extends StringTagSupport {
   
       public EncodeUrlTag() {
  -        super( "encodeUrl" );
  +        super();
  +    }
  +
  +
  +    public String changeString(String text) throws JspException {
  +        return URLEncoder.encode(text);
  +    }
  +
  +    public void initAttributes() {
  +
       }
   
  -  public String actionWithEncoding( String text, String encoding )
  -    throws UnsupportedEncodingException  {
  -    return URLEncoder.encode( text, encoding );
  -  }
  -  
  -  public String actionWithoutEncoding( String text ) {
  -    return URLEncoder.encode( text );
  -  }
   
   }
  
  
  
  1.36      +0 -21     jakarta-taglibs/string/xml/string.xml
  
  Index: string.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/string/xml/string.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- string.xml	12 Mar 2004 05:29:26 -0000	1.35
  +++ string.xml	13 Mar 2004 00:59:43 -0000	1.36
  @@ -482,16 +482,6 @@
             </description>
             <availability>1.0</availability>
           </attribute>
  -        <attribute>
  -          <name>encoding</name>
  -          <required>false</required>
  -          <rtexprvalue>true</rtexprvalue>
  -          <type>java.lang.String</type>
  -          <description>
  -              Encoding the URL should be encoded by (NOTE: available only on J2SE 1.4 compatible
containers - otherwise, will use container's platform default encoding);
  -          </description>
  -          <availability>1.1</availability>
  -        </attribute>
           <example>
             <usage>
               <comment>
  @@ -526,16 +516,6 @@
             </description>
             <availability>1.0</availability>
           </attribute>
  -        <attribute>
  -          <name>encoding</name>
  -          <required>false</required>
  -          <rtexprvalue>true</rtexprvalue>
  -          <type>java.lang.String</type>
  -          <description>
  -              Encoding the URL should be decoded by (NOTE: available only on J2SE 1.4 compatible
containers - otherwise, will use container's platform default encoding);
  -          </description>
  -          <availability>1.1</availability>
  -        </attribute>
           <example>
             <usage>
               <comment>
  @@ -2158,7 +2138,6 @@
   
   <section name="NewFeatures">
       <item>Added attribute delimiterInside to &lt;str:wordWrap&gt; (bug 21866)</item>
  -    <item>Added attribute encoding to &lt;str:encodeUrl&gt; and &lt;str:decodeUrl&gt;
(bug 18964)</item>
       <item>Added new custom tags, &lt;str:join&gt; and &lt;str:split&gt;
(bug 20204)</item>
   </section>
   </revision>
  
  
  

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


Mime
View raw message