Return-Path: 
 <commits-return-40737-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
X-Original-To: apmail-commons-commits-archive@minotaur.apache.org
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 79EF610B3C
	for <apmail-commons-commits-archive@minotaur.apache.org>;
 Thu, 27 Mar 2014 22:36:45 +0000 (UTC)
Received: (qmail 13666 invoked by uid 500); 27 Mar 2014 22:36:44 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 13603 invoked by uid 500); 27 Mar 2014 22:36:44 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 13596 invoked by uid 99); 27 Mar 2014 22:36:43 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Mar 2014 22:36:43 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Mar 2014 22:36:41 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8C55F23889CB;
	Thu, 27 Mar 2014 22:36:19 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1582521 -
 /commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
Date: Thu, 27 Mar 2014 22:36:19 -0000
To: commits@commons.apache.org
From: mbenson@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140327223619.8C55F23889CB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mbenson
Date: Thu Mar 27 22:36:19 2014
New Revision: 1582521

URL: http://svn.apache.org/r1582521
Log:
fix generics

Modified:
    commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java

Modified: commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java?rev=1582521&r1=1582520&r2=1582521&view=diff
==============================================================================
--- commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java (original)
+++ commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java Thu Mar 27 22:36:19 2014
@@ -43,12 +43,12 @@ public final class ArgumentMatcherUtils
         return new EqualsMatcher<T>(value);
     }
 
-    public static <C extends Comparable<?>> ArgumentMatcher<C> gt(C comparable)
+    public static <C extends Comparable<C>> ArgumentMatcher<C> gt(C comparable)
     {
         return new GreaterThanMatcher<C>(comparable);
     }
 
-    public static <C extends Comparable<?>> ArgumentMatcher<C> gte(C comparable)
+    public static <C extends Comparable<C>> ArgumentMatcher<C> gte(C comparable)
     {
         return new GreaterThanOrEqualMatcher<C>(comparable);
     }
@@ -63,12 +63,12 @@ public final class ArgumentMatcherUtils
         return new IsNullMatcher<T>();
     }
 
-    public static <C extends Comparable<?>> ArgumentMatcher<C> lt(C comparable)
+    public static <C extends Comparable<C>> ArgumentMatcher<C> lt(C comparable)
     {
         return new LessThanMatcher<C>(comparable);
     }
 
-    public static <C extends Comparable<?>> ArgumentMatcher<C> lte(C comparable)
+    public static <C extends Comparable<C>> ArgumentMatcher<C> lte(C comparable)
     {
         return new LessThanOrEqualMatcher<C>(comparable);
     }
@@ -110,7 +110,7 @@ public final class ArgumentMatcherUtils
         }
     }
 
-    private abstract static class ComparatorMatcher<C extends Comparable<?>> implements ArgumentMatcher<C>
+    private abstract static class ComparatorMatcher<C extends Comparable<C>> implements ArgumentMatcher<C>
     {
         private final C comparable;
 
@@ -122,15 +122,13 @@ public final class ArgumentMatcherUtils
         protected abstract boolean evaluate(int comparison);
 
         @Override
-        @SuppressWarnings("unchecked")
         public boolean matches(C argument)
         {
             if (argument == null)
             {
                 return false;
             }
-            @SuppressWarnings("rawtypes")
-            final int comparison = ((Comparable) comparable).compareTo(argument);
+            final int comparison = (comparable).compareTo(argument);
             return evaluate(comparison);
         }
     }
@@ -168,7 +166,7 @@ public final class ArgumentMatcherUtils
         }
     }
 
-    private static final class GreaterThanMatcher<C extends Comparable<?>> extends ComparatorMatcher<C>
+    private static final class GreaterThanMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
     {
         private GreaterThanMatcher(C comparable)
         {
@@ -182,7 +180,7 @@ public final class ArgumentMatcherUtils
         }
     }
 
-    private static final class GreaterThanOrEqualMatcher<C extends Comparable<?>> extends ComparatorMatcher<C>
+    private static final class GreaterThanOrEqualMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
     {
         private GreaterThanOrEqualMatcher(C comparable)
         {
@@ -221,7 +219,7 @@ public final class ArgumentMatcherUtils
         }
     }
 
-    private static final class LessThanMatcher<C extends Comparable<?>> extends ComparatorMatcher<C>
+    private static final class LessThanMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
     {
         private LessThanMatcher(C comparable)
         {
@@ -235,7 +233,7 @@ public final class ArgumentMatcherUtils
         }
     }
 
-    private static final class LessThanOrEqualMatcher<C extends Comparable<?>> extends ComparatorMatcher<C>
+    private static final class LessThanOrEqualMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
     {
         private LessThanOrEqualMatcher(C comparable)
         {