cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation EncodeURLTransformer.java

[joerg]

joerg       2003/08/03 20:44:05

  Modified:    src/java/org/apache/cocoon/transformation
                        EncodeURLTransformer.java
  Log:
  cleanup on encodeURL()
  
  Revision  Changes    Path
  1.5       +5 -8      
cocoon-2.1/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
  
  Index: EncodeURLTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EncodeURLTransformer.java 19 Mar 2003 15:42:14 -0000      1.4
  +++ EncodeURLTransformer.java 4 Aug 2003 03:44:05 -0000       1.5
  @@ -292,10 +292,9 @@
                       String value = new_attributes.getValue(i);
   
                       if 
(elementAttributeMatching.matchesElementAttribute(lname, attr_lname)) {
  -                        // don't use simply response.encodeURL
  +                        // don't use simply this.response.encodeURL(value)
                           // but be more smart about the url encoding
  -                        //final String new_value = this.response.encodeURL( 
value );
  -                        final String new_value = this.encodeURL( value, 
response );
  +                        final String new_value = this.encodeURL(value);
                           if (getLogger().isDebugEnabled()) {
                               this.getLogger().debug("element/@attribute 
matches: " + name + "/@" + attr_lname);
                               this.getLogger().debug("encodeURL: " + value + " 
-> " + new_value);
  @@ -320,11 +319,9 @@
        * </p>
        *
        * @param  url       the URL probably without sessionid.
  -     * @param  request   the http request
  -     * @param  response  the http response
        * @return           String the original url inclusive the sessionid
        */
  -    private String encodeURL(String url, Response response) {
  +    private String encodeURL(String url) {
           String encoded_url;
           if (this.response != null) {
               // As some servlet-engine does not check if url has been already 
rewritten