commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject svn commit: r987963 - in /commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations: DigesterLoader.java handlers/MethodHandler.java
Date Mon, 23 Aug 2010 01:07:39 GMT
Author: rahul
Date: Mon Aug 23 01:07:39 2010
New Revision: 987963

URL: http://svn.apache.org/viewvc?rev=987963&view=rev
Log:
Humor the Sun compiler on XP.

Modified:
    commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/DigesterLoader.java
    commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/handlers/MethodHandler.java

Modified: commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/DigesterLoader.java
URL: http://svn.apache.org/viewvc/commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/DigesterLoader.java?rev=987963&r1=987962&r2=987963&view=diff
==============================================================================
--- commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/DigesterLoader.java
(original)
+++ commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/DigesterLoader.java
Mon Aug 23 01:07:39 2010
@@ -182,7 +182,7 @@ public final class DigesterLoader {
      * @param element the current visited element.
      */
     @SuppressWarnings("unchecked")
-    private <A extends Annotation, E extends AnnotatedElement> void handle(A annotation,
E element, FromAnnotationsRuleSet ruleSet) {
+    private <A extends Annotation, E extends AnnotatedElement, R extends Rule> void
handle(A annotation, E element, FromAnnotationsRuleSet ruleSet) {
         Class<?> annotationType = annotation.annotationType();
 
         // check if it is one of the @*.List annotation
@@ -198,7 +198,7 @@ public final class DigesterLoader {
             DigesterRule digesterRule = annotationType.getAnnotation(DigesterRule.class);
 
             if (DefaultLoaderHandler.class == digesterRule.handledBy()) {
-                Class<? extends AnnotationRuleProvider<A, E, ? extends Rule>>
providerType = (Class<? extends AnnotationRuleProvider<A, E, ? extends Rule>>)
digesterRule.providedBy();
+                Class<? extends AnnotationRuleProvider<A, E, R>> providerType
= (Class<? extends AnnotationRuleProvider<A, E, R>>) digesterRule.providedBy();
                 ruleSet.addRuleProvider(AnnotationUtils.getAnnotationPattern(annotation),
                         providerType,
                         annotation,

Modified: commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/handlers/MethodHandler.java
URL: http://svn.apache.org/viewvc/commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/handlers/MethodHandler.java?rev=987963&r1=987962&r2=987963&view=diff
==============================================================================
--- commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/handlers/MethodHandler.java
(original)
+++ commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/handlers/MethodHandler.java
Mon Aug 23 01:07:39 2010
@@ -106,13 +106,13 @@ public final class MethodHandler impleme
     }
 
     @SuppressWarnings("unchecked")
-    private <A extends Annotation> void doHandle(A methodAnnotation, Annotation annotation,
Method method, Class<?> type, FromAnnotationsRuleSet ruleSet) {
+    private <A extends Annotation, R extends Rule> void doHandle(A methodAnnotation,
Annotation annotation, Method method, Class<?> type, FromAnnotationsRuleSet ruleSet)
{
         if (annotation.annotationType().isAnnotationPresent(DigesterRule.class)
                 && annotation.annotationType().isAnnotationPresent(CreationRule.class))
{
             ruleSet.addRules(type);
 
             DigesterRule digesterRule = methodAnnotation.annotationType().getAnnotation(DigesterRule.class);
-            Class<? extends AnnotationRuleProvider<A, Method, ? extends Rule>>
providerType = (Class<? extends AnnotationRuleProvider<A, Method, ? extends Rule>>)
digesterRule.providedBy();
+            Class<? extends AnnotationRuleProvider<A, Method, R>> providerType
= (Class<? extends AnnotationRuleProvider<A, Method, R>>) digesterRule.providedBy();
             ruleSet.addRuleProvider(AnnotationUtils.getAnnotationPattern(annotation),
                     providerType,
                     methodAnnotation,



Mime
View raw message