Author: mbenson
Date: Tue Sep 3 17:26:32 2013
New Revision: 1519762
URL: http://svn.apache.org/r1519762
Log:
allow any matching Trainer
Modified:
commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java
commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/StubBuilder.java
Modified:
commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java?rev=1519762&r1=1519761&r2=1519762&view=diff
==============================================================================
---
commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java
(original)
+++
commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java
Tue Sep 3 17:26:32 2013
@@ -241,7 +241,7 @@ public class AnnotationBuilder<A extends
}
@Override
- public AnnotationBuilder<A> train(BaseTrainer<?, A> trainer)
+ public AnnotationBuilder<A> train(BaseTrainer<?, ? super A> trainer)
{
return (AnnotationBuilder<A>) super.train(trainer);
}
Modified:
commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/StubBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/StubBuilder.java?rev=1519762&r1=1519761&r2=1519762&view=diff
==============================================================================
---
commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/StubBuilder.java
(original)
+++
commons/proper/proxy/branches/version-2.0-work/stub/src/main/java/org/apache/commons/proxy2/stub/StubBuilder.java
Tue Sep 3 17:26:32 2013
@@ -75,7 +75,7 @@ public class StubBuilder<T> implements B
return proxyFactory.createInterceptorProxy(target, switchInterceptor,
type);
}
- public StubBuilder<T> train(BaseTrainer<?, T> trainer)
+ public StubBuilder<T> train(BaseTrainer<?, ? super T> trainer)
{
try
{
