1 files changed, 10 insertions, 54 deletions

diff --git a/guava/src/com/google/common/hash/AbstractNonStreamingHashFunction.java b/guava/src/com/google/common/hash/AbstractNonStreamingHashFunction.java
index 0025d3c..68e9ace 100644
--- a/guava/src/com/google/common/hash/AbstractNonStreamingHashFunction.java
+++ b/guava/src/com/google/common/hash/AbstractNonStreamingHashFunction.java
@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2011 The Guava Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2011 Google Inc. All Rights Reserved.
 
 package com.google.common.hash;
 
@@ -21,14 +7,13 @@ import com.google.common.base.Throwables;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.charset.Charset;
 
 /**
  * Skeleton implementation of {@link HashFunction}, appropriate for non-streaming algorithms.
- * All the hash computation done using {@linkplain #newHasher()} are delegated to the {@linkplain
- * #hashBytes(byte[], int, int)} method.
- *
- * @author Dimitris Andreou
+ * All the hash computation done using {@linkplain #newHasher()} are delegated to the {@linkplain 
+ * #hashBytes(byte[], int, int)} method. 
+ * 
+ * @author andreou@google.com (Dimitris Andreou)
  */
 abstract class AbstractNonStreamingHashFunction implements HashFunction {
   @Override
@@ -41,43 +26,14 @@ abstract class AbstractNonStreamingHashFunction implements HashFunction {
     Preconditions.checkArgument(expectedInputSize >= 0);
     return new BufferingHasher(expectedInputSize);
   }
-
-  @Override public <T> HashCode hashObject(T instance, Funnel<? super T> funnel) {
-    return newHasher().putObject(instance, funnel).hash();
-  }
-
-  @Override public HashCode hashString(CharSequence input) {
-    int len = input.length();
-    Hasher hasher = newHasher(len * 2);
-    for (int i = 0; i < len; i++) {
-      hasher.putChar(input.charAt(i));
-    }
-    return hasher.hash();
-  }
-
-  @Override public HashCode hashString(CharSequence input, Charset charset) {
-    return hashBytes(input.toString().getBytes(charset));
-  }
-
-  @Override public HashCode hashInt(int input) {
-    return newHasher(4).putInt(input).hash();
-  }
-
-  @Override public HashCode hashLong(long input) {
-    return newHasher(8).putLong(input).hash();
-  }
-
-  @Override public HashCode hashBytes(byte[] input) {
-    return hashBytes(input, 0, input.length);
-  }
-
+  
   /**
-   * In-memory stream-based implementation of Hasher.
+   * In-memory stream-based implementation of Hasher.  
    */
   private final class BufferingHasher extends AbstractHasher {
     final ExposedByteArrayOutputStream stream;
     static final int BOTTOM_BYTE = 0xFF;
-
+    
     BufferingHasher(int expectedInputSize) {
       this.stream = new ExposedByteArrayOutputStream(expectedInputSize);
     }
@@ -97,7 +53,7 @@ abstract class AbstractNonStreamingHashFunction implements HashFunction {
       }
       return this;
     }
-
+    
     @Override
     public Hasher putBytes(byte[] bytes, int off, int len) {
       stream.write(bytes, off, len);
@@ -146,7 +102,7 @@ abstract class AbstractNonStreamingHashFunction implements HashFunction {
       return hashBytes(stream.byteArray(), 0, stream.length());
     }
   }
-
+  
   // Just to access the byte[] without introducing an unnecessary copy
   private static final class ExposedByteArrayOutputStream extends ByteArrayOutputStream {
     ExposedByteArrayOutputStream(int expectedInputSize) {