luehe       2002/10/07 15:52:22

  Modified:    jasper2/src/share/org/apache/jasper/compiler
                        TldLocationsCache.java Validator.java
               jasper2/src/share/org/apache/jasper/runtime
                        JspWriterImpl.java
  Log:
  misc cleanup
  
  Revision  Changes    Path
  1.7       +0 -4      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java
  
  Index: TldLocationsCache.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TldLocationsCache.java    7 Oct 2002 19:37:21 -0000       1.6
  +++ TldLocationsCache.java    7 Oct 2002 22:52:22 -0000       1.7
  @@ -354,8 +354,4 @@
           if( ! initialized ) init();
           tlds.put( uri, tld);
       }
  -    
  -    private void p(String s) {
  -        System.out.println("[TldLocationsCache] " + s);
  -    }
   }
  
  
  
  1.39      +3 -4      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
  
  Index: Validator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Validator.java    19 Sep 2002 23:21:39 -0000      1.38
  +++ Validator.java    7 Oct 2002 22:52:22 -0000       1.39
  @@ -69,7 +69,6 @@
   import javax.servlet.jsp.tagext.*;
   import javax.servlet.jsp.el.FunctionMapper;
   
  -import org.apache.jasper.Constants;
   import org.apache.jasper.JasperException;
   import org.apache.jasper.JspCompilationContext;
   
  
  
  
  1.4       +6 -19     
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java
  
  Index: JspWriterImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JspWriterImpl.java        31 Mar 2002 19:27:08 -0000      1.3
  +++ JspWriterImpl.java        7 Oct 2002 22:52:22 -0000       1.4
  @@ -59,10 +59,6 @@
    *
    */ 
   
  -
  -
  -
  -
   package org.apache.jasper.runtime;
   
   import java.io.IOException;
  @@ -89,19 +85,14 @@
   public class JspWriterImpl extends JspWriter {
   
       protected Writer out;
  -
  -    protected ServletResponse response;
  -    
  +    protected ServletResponse response;    
       protected char cb[];
       protected int nextChar;
  -
  -    protected static int defaultCharBufferSize = Constants.DEFAULT_BUFFER_SIZE;
  -
       protected boolean flushed = false;
       protected boolean closed = false;
       
       public JspWriterImpl() {
  -     super( defaultCharBufferSize, true );
  +     super( Constants.DEFAULT_BUFFER_SIZE, true );
       }
   
       /**
  @@ -111,7 +102,7 @@
        * @param  response  A Servlet Response
        */
       public JspWriterImpl(ServletResponse response) {
  -        this(response, defaultCharBufferSize, true);
  +        this(response, Constants.DEFAULT_BUFFER_SIZE, true);
       }
   
       /**
  @@ -171,7 +162,6 @@
       protected void initOut() throws IOException {
           if (out == null) {
               out = response.getWriter();
  -         //System.out.println("JspWriterImpl: initOut: " + this + " " +out);
        }
       }
        
  @@ -244,7 +234,6 @@
   
       /**
        * Write a single character.
  -     *
        */
       public void write(int c) throws IOException {
           ensureOpen();
  @@ -284,7 +273,6 @@
        * @param  cbuf  A character array
        * @param  off   Offset from which to start reading characters
        * @param  len   Number of characters to write
  -     *
        */
       public void write(char cbuf[], int off, int len) 
           throws IOException 
  @@ -346,7 +334,6 @@
        * @param  s     String to be written
        * @param  off   Offset from which to start reading characters
        * @param  len   Number of characters to be written
  -     *
        */
       public void write(String s, int off, int len) throws IOException {
           ensureOpen();
  
  
  

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

Reply via email to