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

[hl...@apache.org]

Author: hlship
Date: Wed Jan  6 18:05:40 2010
New Revision: 896585

URL: http://svn.apache.org/viewvc?rev=896585&view=rev
Log:
Allow for a method with the @PageReset annotation, or simply named "pageReset"

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

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageResetAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageResetAnnotationWorker.java?rev=896585&r1=896584&r2=896585&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageResetAnnotationWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageResetAnnotationWorker.java Wed Jan  6 18:05:40 2010
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,6 +21,7 @@
 import org.apache.tapestry5.model.MutableComponentModel;
 import org.apache.tapestry5.services.ClassTransformation;
 import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.MethodFilter;
 import org.apache.tapestry5.services.TransformConstants;
 import org.apache.tapestry5.services.TransformMethodSignature;
 
@@ -38,10 +39,18 @@
     private static final TransformMethodSignature CONTAINING_PAGE_DID_RESET = new TransformMethodSignature(
             "containingPageDidReset");
 
-    public void transform(ClassTransformation transformation, MutableComponentModel model)
+    public void transform(final ClassTransformation transformation, MutableComponentModel model)
     {
-        List<TransformMethodSignature> methods = transformation
-                .findMethodsWithAnnotation(PageReset.class);
+        MethodFilter filter = new MethodFilter()
+        {
+            public boolean accept(TransformMethodSignature signature)
+            {
+                return signature.getMethodName().equalsIgnoreCase("pageReset")
+                        || transformation.getMethodAnnotation(signature, PageReset.class) != null;
+            }
+        };
+
+        List<TransformMethodSignature> methods = transformation.findMethods(filter);
 
         if (methods.isEmpty())
             return;