You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2015/10/02 13:15:09 UTC

tapestry-5 git commit: extract constant

Repository: tapestry-5
Updated Branches:
  refs/heads/master 36301cc42 -> db1b19361


extract constant


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/db1b1936
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/db1b1936
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/db1b1936

Branch: refs/heads/master
Commit: db1b19361f81fc0690c7f570ef51997f8d6940bf
Parents: 36301cc
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Fri Oct 2 13:14:26 2015 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Fri Oct 2 13:14:26 2015 +0200

----------------------------------------------------------------------
 .../internal/transform/OnEventWorker.java       | 36 +++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/db1b1936/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
index c640158..fb4502b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
@@ -69,6 +69,24 @@ public class OnEventWorker implements ComponentClassTransformWorker2
         }
     };
 
+    private final static Predicate<PlasticMethod> IS_EVENT_HANDLER = new Predicate<PlasticMethod>()
+    {
+      public boolean accept(PlasticMethod method)
+      {
+          return (hasCorrectPrefix(method) || hasAnnotation(method)) && !method.isOverride();
+      }
+
+      private boolean hasCorrectPrefix(PlasticMethod method)
+      {
+          return method.getDescription().methodName.startsWith("on");
+      }
+
+      private boolean hasAnnotation(PlasticMethod method)
+      {
+          return method.hasAnnotation(OnEvent.class);
+      }
+  };
+
     class ComponentIdValidator
     {
         final String componentId;
@@ -399,23 +417,7 @@ public class OnEventWorker implements ComponentClassTransformWorker2
 
     private Flow<PlasticMethod> matchEventHandlerMethods(PlasticClass plasticClass)
     {
-        return F.flow(plasticClass.getMethods()).filter(new Predicate<PlasticMethod>()
-        {
-            public boolean accept(PlasticMethod method)
-            {
-                return (hasCorrectPrefix(method) || hasAnnotation(method)) && !method.isOverride();
-            }
-
-            private boolean hasCorrectPrefix(PlasticMethod method)
-            {
-                return method.getDescription().methodName.startsWith("on");
-            }
-
-            private boolean hasAnnotation(PlasticMethod method)
-            {
-                return method.hasAnnotation(OnEvent.class);
-            }
-        });
+        return F.flow(plasticClass.getMethods()).filter(IS_EVENT_HANDLER);
     }