svn commit: r896584 - in /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal: structure/PageImpl.java structure/PageResetListener.java transform/PageResetAnnotationWorker.java

[hl...@apache.org]

Author: hlship
Date: Wed Jan  6 18:05:36 2010
New Revision: 896584

URL: http://svn.apache.org/viewvc?rev=896584&view=rev
Log:
Rename the notification method to be longer and, therefore, less likely to conflict with a user-selected method name

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResetListener.java
    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/structure/PageImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java?rev=896584&r1=896583&r2=896584&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java Wed Jan  6 18:05:36 2010
@@ -205,7 +205,7 @@
     {
         for (PageResetListener l : resetListeners)
         {
-            l.pageDidReset();
+            l.containingPageDidReset();
         }
     }
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResetListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResetListener.java?rev=896584&r1=896583&r2=896584&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResetListener.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResetListener.java Wed Jan  6 18:05:36 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,
@@ -14,10 +14,20 @@
 
 package org.apache.tapestry5.internal.structure;
 
+import org.apache.tapestry5.annotations.PageReset;
+
+/**
+ * Optional interface implemented to support resetting of the page state.
+ * 
+ * @since 5.2.0
+ * @see PageReset
+ */
 public interface PageResetListener
 {
     /**
-     * Invoked when the page is first accessed 
+     * Invoked when the page is accessed from some other page. This notification will be sent
+     * <em>after</em> the page
+     * has been activated.
      */
-    void pageDidReset();
+    void containingPageDidReset();
 }

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=896584&r1=896583&r2=896584&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:36 2010
@@ -35,8 +35,8 @@
 {
     private static final String META_KEY = "tapestry.page-reset-listener";
 
-    private static final TransformMethodSignature PAGE_DID_RESET = new TransformMethodSignature(
-            "pageDidReset");
+    private static final TransformMethodSignature CONTAINING_PAGE_DID_RESET = new TransformMethodSignature(
+            "containingPageDidReset");
 
     public void transform(ClassTransformation transformation, MutableComponentModel model)
     {
@@ -70,7 +70,7 @@
                                         "Method %s of class %s is invalid: methods with the @PageReset annotation must return void, and have no parameters or thrown exceptions.",
                                         sig, model.getComponentClassName()));
 
-            transformation.extendMethod(PAGE_DID_RESET, sig.getMethodName() + "();");
+            transformation.extendMethod(CONTAINING_PAGE_DID_RESET, sig.getMethodName() + "();");
         }
 
     }