Author: simonetripodi
Date: Thu Jul 8 16:20:17 2010
New Revision: 961832
URL: http://svn.apache.org/viewvc?rev=961832&view=rev
Log:
fixed spi methods signatures
Modified:
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/internal/DefaultAnnotationRuleProviderFactory.java
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/internal/DefaultDigesterLoaderHandlerFactory.java
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/spi/AnnotationRuleProviderFactory.java
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/spi/DigesterLoaderHandlerFactory.java
Modified:
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/internal/DefaultAnnotationRuleProviderFactory.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/internal/DefaultAnnotationRuleProviderFactory.java?rev=961832&r1=961831&r2=961832&view=diff
==============================================================================
---
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/internal/DefaultAnnotationRuleProviderFactory.java
(original)
+++
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/internal/DefaultAnnotationRuleProviderFactory.java
Thu Jul 8 16:20:17 2010
@@ -35,9 +35,8 @@ public final class DefaultAnnotationRule
/**
* {...@inheritdoc}
*/
- public <A extends Annotation, E extends AnnotatedElement, R extends Rule>
AnnotationRuleProvider<A, E, R> newInstance(
- Class<? extends AnnotationRuleProvider<A, E, R>> type)
- throws DigesterLoadingException {
+ public <T extends AnnotationRuleProvider<? extends Annotation, ? extends
AnnotatedElement, ? extends Rule>>
+ T newInstance(Class<T> type) throws DigesterLoadingException {
try {
return type.newInstance();
} catch (Exception e) {
Modified:
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/internal/DefaultDigesterLoaderHandlerFactory.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/internal/DefaultDigesterLoaderHandlerFactory.java?rev=961832&r1=961831&r2=961832&view=diff
==============================================================================
---
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/internal/DefaultDigesterLoaderHandlerFactory.java
(original)
+++
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/internal/DefaultDigesterLoaderHandlerFactory.java
Thu Jul 8 16:20:17 2010
@@ -34,9 +34,8 @@ public final class DefaultDigesterLoader
/**
* {...@inheritdoc}
*/
- public <A extends Annotation, E extends AnnotatedElement>
DigesterLoaderHandler<A, E> newInstance(
- Class<? extends DigesterLoaderHandler<A, E>> type)
- throws DigesterLoadingException {
+ public <L extends DigesterLoaderHandler<? extends Annotation, ? extends
AnnotatedElement>> L newInstance(
+ Class<L> type) throws DigesterLoadingException {
try {
return type.newInstance();
} catch (Exception e) {
Modified:
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/spi/AnnotationRuleProviderFactory.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/spi/AnnotationRuleProviderFactory.java?rev=961832&r1=961831&r2=961832&view=diff
==============================================================================
---
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/spi/AnnotationRuleProviderFactory.java
(original)
+++
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/spi/AnnotationRuleProviderFactory.java
Thu Jul 8 16:20:17 2010
@@ -42,7 +42,7 @@ public interface AnnotationRuleProviderF
* @throws DigesterLoadingException if any error occurs while creating the
* {...@code type} instance.
*/
- <A extends Annotation, E extends AnnotatedElement, R extends Rule>
- AnnotationRuleProvider<A, E, R> newInstance(Class<? extends
AnnotationRuleProvider<A, E, R>> type) throws DigesterLoadingException;
+ <T extends AnnotationRuleProvider<? extends Annotation, ? extends
AnnotatedElement, ? extends Rule>>
+ T newInstance(Class<T> type) throws DigesterLoadingException;
}
Modified:
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/spi/DigesterLoaderHandlerFactory.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/spi/DigesterLoaderHandlerFactory.java?rev=961832&r1=961831&r2=961832&view=diff
==============================================================================
---
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/spi/DigesterLoaderHandlerFactory.java
(original)
+++
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/spi/DigesterLoaderHandlerFactory.java
Thu Jul 8 16:20:17 2010
@@ -33,14 +33,13 @@ public interface DigesterLoaderHandlerFa
/**
* Return an instance of the specified type.
*
- * @param <A>
- * @param <E>
+ * @param <L>
* @param type the class of the object to be returned.
* @return an instance of the specified class.
* @throws DigesterLoadingException if any error occurs while creating the
* {...@code type} instance.
*/
- <A extends Annotation, E extends AnnotatedElement>
DigesterLoaderHandler<A, E>
- newInstance(Class<? extends DigesterLoaderHandler<A, E>> type) throws
DigesterLoadingException;
+ <L extends DigesterLoaderHandler<? extends Annotation, ? extends
AnnotatedElement>> L newInstance(
+ Class<L> type) throws DigesterLoadingException;
}
