svn commit: r1515490 - in /commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor: SwitchInterceptor.java matcher/argument/ArgumentMatcherUtils.java

[mbenson]

Author: mbenson
Date: Mon Aug 19 16:15:56 2013
New Revision: 1515490

URL: http://svn.apache.org/r1515490
Log:
warnings

Modified:
    
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/SwitchInterceptor.java
    
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java

Modified: 
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/SwitchInterceptor.java
URL: 
http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/SwitchInterceptor.java?rev=1515490&r1=1515489&r2=1515490&view=diff
==============================================================================
--- 
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/SwitchInterceptor.java
 (original)
+++ 
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/SwitchInterceptor.java
 Mon Aug 19 16:15:56 2013
@@ -39,6 +39,8 @@ public class SwitchInterceptor implement
 // Fields
 
//----------------------------------------------------------------------------------------------------------------------
 
+    private static final long serialVersionUID = 1L;
+
     private final List<Pair<InvocationMatcher, Interceptor>> cases = new 
CopyOnWriteArrayList<Pair<InvocationMatcher, Interceptor>>();
 
 
//----------------------------------------------------------------------------------------------------------------------

Modified: 
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java?rev=1515490&r1=1515489&r2=1515490&view=diff
==============================================================================
--- 
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
 (original)
+++ 
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
 Mon Aug 19 16:15:56 2013
@@ -42,12 +42,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<?>> 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<?>> ArgumentMatcher<C> gte(C 
comparable)
     {
         return new GreaterThanOrEqualMatcher<C>(comparable);
     }
@@ -62,12 +62,12 @@ public final class ArgumentMatcherUtils
         return new IsNullMatcher();
     }
 
-    public static <C extends Comparable> ArgumentMatcher<C> lt(C comparable)
+    public static <C extends Comparable<?>> 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<?>> ArgumentMatcher<C> lte(C 
comparable)
     {
         return new LessThanOrEqualMatcher<C>(comparable);
     }
@@ -109,7 +109,7 @@ public final class ArgumentMatcherUtils
         }
     }
 
-    private abstract static class ComparatorMatcher<C extends Comparable> 
implements ArgumentMatcher<C>
+    private abstract static class ComparatorMatcher<C extends Comparable<?>> 
implements ArgumentMatcher<C>
     {
         private final C comparable;
 
@@ -124,11 +124,13 @@ public final class ArgumentMatcherUtils
         @SuppressWarnings("unchecked")
         public boolean matches(C argument)
         {
-            if(argument == null)
+            if (argument == null)
             {
                 return false;
             }
-            return evaluate(comparable.compareTo(argument));
+            @SuppressWarnings("rawtypes")
+            final int comparison = ((Comparable) 
comparable).compareTo(argument);
+            return evaluate(comparison);
         }
     }
 
@@ -164,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<?>> 
extends ComparatorMatcher<C>
     {
         private GreaterThanMatcher(C comparable)
         {
@@ -178,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<?>> extends ComparatorMatcher<C>
     {
         private GreaterThanOrEqualMatcher(C comparable)
         {
@@ -217,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<?>> 
extends ComparatorMatcher<C>
     {
         private LessThanMatcher(C comparable)
         {
@@ -231,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<?>> 
extends ComparatorMatcher<C>
     {
         private LessThanOrEqualMatcher(C comparable)
         {