From a072d4f1a42b2f8e9485a1b59866a271e5ea421b Mon Sep 17 00:00:00 2001
From: "ray.j.greenwell" <ray.j.greenwell@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Mon, 5 Apr 2010 18:34:32 +0000
Subject: [PATCH] Replace both of these by HashMultiset.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2770 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 src/java/com/samskivert/util/CountHashMap.java | 3 +++
 src/java/com/samskivert/util/CountMap.java     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/java/com/samskivert/util/CountHashMap.java b/src/java/com/samskivert/util/CountHashMap.java
index db3199b9..1fc244c8 100644
--- a/src/java/com/samskivert/util/CountHashMap.java
+++ b/src/java/com/samskivert/util/CountHashMap.java
@@ -26,12 +26,15 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
+import com.samskivert.annotation.ReplacedBy;
+
 /**
  * A hashmap that maintains a count for each key.
  *
  * This implementation should change so that we extend AbstractMap, do our own hashing, and can use
  * our own Entry class.
  */
+@ReplacedBy("com.google.common.collect.HashMultiset")
 public class CountHashMap<K> extends HashMap<K, int[]>
 {
     public interface Entry<K> extends Map.Entry<K, int[]>
diff --git a/src/java/com/samskivert/util/CountMap.java b/src/java/com/samskivert/util/CountMap.java
index a575d70b..058df140 100644
--- a/src/java/com/samskivert/util/CountMap.java
+++ b/src/java/com/samskivert/util/CountMap.java
@@ -16,7 +16,7 @@ import com.samskivert.annotation.ReplacedBy;
  * A CountMap maps keys to non-null Integers and provides methods for efficiently adding
  * to the count.
  */
-@ReplacedBy("com.google.common.collect.Multiset")
+@ReplacedBy("com.google.common.collect.HashMultiset")
 public class CountMap<K> extends AbstractMap<K, Integer>
 {
     /**