svn commit: r734832 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: Base64.java ByteChunk.java CharChunk.java MessageBytes.java

[markt]

Author: markt
Date: Thu Jan 15 13:47:53 2009
New Revision: 734832

URL: http://svn.apache.org/viewvc?rev=734832&view=rev
Log:
Removed unused code from o.a.t.util.buf

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/buf/Base64.java
    tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
    tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
    tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/Base64.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/Base64.java?rev=734832&r1=734831&r2=734832&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/Base64.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/Base64.java Thu Jan 15 
13:47:53 2009
@@ -42,7 +42,6 @@
     static private final int  TWENTYFOURBITGROUP = 24;
     static private final int  EIGHTBIT           = 8;
     static private final int  SIXTEENBIT         = 16;
-    static private final int  SIXBIT             = 6;
     static private final int  FOURBYTE           = 4;
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=734832&r1=734831&r2=734832&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Thu Jan 15 
13:47:53 2009
@@ -112,7 +112,6 @@
     private ByteInputChannel in = null;
     private ByteOutputChannel out = null;
 
-    private boolean isOutput=false;
     private boolean optimizedWrite=true;
     
     /**
@@ -156,7 +155,6 @@
     // -------------------- Setup --------------------
 
     public void allocate( int initial, int limit  ) {
-       isOutput=true;
        if( buff==null || buff.length < initial ) {
            buff=new byte[initial];
        }    

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=734832&r1=734831&r2=734832&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Thu Jan 15 
13:47:53 2009
@@ -64,8 +64,6 @@
 
     private boolean isSet=false;  // XXX 
 
-    private boolean isOutput=false;
-
     // -1: grow undefinitely
     // maximum amount to be cached
     private int limit=-1;
@@ -117,14 +115,12 @@
     // -------------------- Setup --------------------
 
     public void allocate( int initial, int limit  ) {
-       isOutput=true;
        if( buff==null || buff.length < initial ) {
            buff=new char[initial];
        }
        this.limit=limit;
        start=0;
        end=0;
-       isOutput=true;
        isSet=true;
     }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=734832&r1=734831&r2=734832&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Thu Jan 15 
13:47:53 2009
@@ -17,7 +17,6 @@
 
 package org.apache.tomcat.util.buf;
 
-import java.util.*;
 import java.io.Serializable;
 import java.io.IOException;
 
@@ -114,7 +113,6 @@
        hasHashCode=false;
        hasIntValue=false;
     hasLongValue=false;
-       hasDateValue=false;     
     }
 
 
@@ -132,7 +130,6 @@
         hasHashCode=false;
         hasIntValue=false;
         hasLongValue=false;
-        hasDateValue=false; 
     }
 
     /** Set the encoding. If the object was constructed from bytes[]. any
@@ -162,7 +159,6 @@
         hasHashCode=false;
         hasIntValue=false;
         hasLongValue=false;
-        hasDateValue=false; 
     }
 
     /** Remove the cached string value. Use it after a conversion on the
@@ -186,7 +182,6 @@
         hasHashCode=false;
         hasIntValue=false;
         hasLongValue=false;
-        hasDateValue=false; 
         if (s == null) {
             hasStrValue=false;
             type=T_NULL;
@@ -543,8 +538,6 @@
     private boolean hasIntValue=false;
     private long longValue;
     private boolean hasLongValue=false;
-    private Date dateValue;
-    private boolean hasDateValue=false;
     
     /** Set the buffer to the representation of an int
      */
@@ -585,7 +578,6 @@
         hasHashCode=false;
         hasIntValue=true;
         hasLongValue=false;
-        hasDateValue=false; 
         type=T_BYTES;
     }
 
@@ -628,7 +620,6 @@
         hasHashCode=false;
         hasIntValue=false;
         hasLongValue=true;
-        hasDateValue=false; 
         type=T_BYTES;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org