Return-Path: 
 <commits-return-7009-apmail-tapestry-dev-archive=tapestry.apache.org@tapestry.apache.org>
Delivered-To: apmail-tapestry-dev-archive@www.apache.org
Received: (qmail 90476 invoked from network); 7 Jan 2010 02:16:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 7 Jan 2010 02:16:55 -0000
Received: (qmail 36360 invoked by uid 500); 7 Jan 2010 02:16:55 -0000
Delivered-To: apmail-tapestry-dev-archive@tapestry.apache.org
Received: (qmail 36282 invoked by uid 500); 7 Jan 2010 02:16:54 -0000
Mailing-List: contact commits-help@tapestry.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@tapestry.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@tapestry.apache.org>
List-Post: <mailto:commits@tapestry.apache.org>
List-Id: <commits.tapestry.apache.org>
Reply-To: dev@tapestry.apache.org
Delivered-To: mailing list commits@tapestry.apache.org
Received: (qmail 36233 invoked by uid 99); 7 Jan 2010 02:16:54 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jan 2010 02:16:54 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jan 2010 02:16:52 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id DC47D2388906; Thu,  7 Jan 2010 02:16:31 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r896737 -
 /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java
Date: Thu, 07 Jan 2010 02:16:31 -0000
To: commits@tapestry.apache.org
From: hlship@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100107021631.DC47D2388906@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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();