svn commit: r896737 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java

[hlship]

Author: hlship
Date: Thu Jan  7 02:16:30 2010
New Revision: 896737

URL: http://svn.apache.org/viewvc?rev=896737&view=rev
Log:
TAP5-266: Tweak the tricky type signatures of a couple of maps

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java?rev=896737&r1=896736&r2=896737&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java
 Thu Jan  7 02:16:30 2010
@@ -14,6 +14,7 @@
 
 package org.apache.tapestry5.internal.transform;
 
+import java.lang.annotation.Annotation;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -52,13 +53,15 @@
 
     private final MethodInvocationBuilder invocationBuilder = new 
MethodInvocationBuilder();
 
-    private final Map<Class, TransformMethodSignature> annotationToSignature = 
CollectionFactory
+    private final Map<Class<? extends Annotation>, TransformMethodSignature> 
annotationToSignature = CollectionFactory
             .newMap();
 
-    private final Map<String, Class> nameToAnnotation = 
CollectionFactory.newCaseInsensitiveMap();
+    private final Map<String, Class<? extends Annotation>> nameToAnnotation = 
CollectionFactory
+            .newCaseInsensitiveMap();
 
-    private final Set<Class> reverseAnnotations = 
CollectionFactory.newSet(AfterRenderBody.class,
-            AfterRenderTemplate.class, AfterRender.class, CleanupRender.class);
+    private final Set<Class<? extends Annotation>> reverseAnnotations = 
CollectionFactory.newSet(
+            AfterRenderBody.class, AfterRenderTemplate.class, 
AfterRender.class,
+            CleanupRender.class);
 
     private final Set<TransformMethodSignature> lifecycleMethods = 
CollectionFactory.newSet();