From aab57210e5261d1832c9ff3d19caffda74814dd5 Mon Sep 17 00:00:00 2001 From: "ray.j.greenwell" Date: Fri, 26 Mar 2010 17:57:47 +0000 Subject: [PATCH] Use @ReplacedBy a few more places. I'm going to start adding this more aggressively as I come across "old things". git-svn-id: https://samskivert.googlecode.com/svn/trunk@2761 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/util/CountMap.java | 4 ++++ src/java/com/samskivert/util/Predicate.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/java/com/samskivert/util/CountMap.java b/src/java/com/samskivert/util/CountMap.java index 706317f4..a575d70b 100644 --- a/src/java/com/samskivert/util/CountMap.java +++ b/src/java/com/samskivert/util/CountMap.java @@ -10,10 +10,13 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +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") public class CountMap extends AbstractMap { /** @@ -53,6 +56,7 @@ public class CountMap extends AbstractMap /** * Add the specified amount to the count for the specified key, return the new count. + * Adding 0 will ensure that a Map.Entry is created for the specified key. */ public int add (K key, int amount) { diff --git a/src/java/com/samskivert/util/Predicate.java b/src/java/com/samskivert/util/Predicate.java index ef00bad1..3c1939b1 100644 --- a/src/java/com/samskivert/util/Predicate.java +++ b/src/java/com/samskivert/util/Predicate.java @@ -25,6 +25,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.NoSuchElementException; +import com.samskivert.annotation.ReplacedBy; + /** * Arbitrates membership. * @@ -42,6 +44,7 @@ import java.util.NoSuchElementException; * * An interface like this may someday be in the Java library, but until then... */ +@ReplacedBy("com.google.common.base.Predicate") public abstract class Predicate { //--------------------------------------------------------------------