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

[hl...@apache.org]

Author: hlship
Date: Fri Apr 29 22:56:28 2011
New Revision: 1098009

URL: http://svn.apache.org/viewvc?rev=1098009&view=rev
Log:
TAP5-853: Change getMethodIdentifier() to include the fully qualified class name as well as method name, etc.

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

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BridgeClassTransformation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BridgeClassTransformation.java?rev=1098009&r1=1098008&r2=1098009&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BridgeClassTransformation.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BridgeClassTransformation.java Fri Apr 29 22:56:28 2011
@@ -259,7 +259,7 @@ public class BridgeClassTransformation i
         }
     };
 
-    private static class BridgeTransformMethod implements TransformMethod
+    private class BridgeTransformMethod implements TransformMethod
     {
         private final PlasticMethod plasticMethod;
 
@@ -454,7 +454,7 @@ public class BridgeClassTransformation i
 
         public String getMethodIdentifier()
         {
-            return getSignature().getMediumDescription();
+            return String.format("%s.%s", plasticClass.getClassName(), getSignature().getMediumDescription());
         }
 
         public boolean isOverride()
@@ -468,7 +468,7 @@ public class BridgeClassTransformation i
         }
     }
 
-    private static final Mapper<PlasticMethod, TransformMethod> TO_TRANSFORM_METHOD = new Mapper<PlasticMethod, TransformMethod>()
+    private final Mapper<PlasticMethod, TransformMethod> toTransformMethod = new Mapper<PlasticMethod, TransformMethod>()
     {
         public TransformMethod map(PlasticMethod element)
         {
@@ -511,12 +511,12 @@ public class BridgeClassTransformation i
 
     public List<TransformMethod> matchMethods(Predicate<TransformMethod> predicate)
     {
-        return F.flow(plasticClass.getMethods()).map(TO_TRANSFORM_METHOD).filter(predicate).toList();
+        return F.flow(plasticClass.getMethods()).map(toTransformMethod).filter(predicate).toList();
     }
 
     public List<TransformMethod> matchMethodsWithAnnotation(Class<? extends Annotation> annotationType)
     {
-        return F.flow(plasticClass.getMethodsWithAnnotation(annotationType)).map(TO_TRANSFORM_METHOD).toList();
+        return F.flow(plasticClass.getMethodsWithAnnotation(annotationType)).map(toTransformMethod).toList();
     }
 
     public List<TransformField> matchFields(Predicate<TransformField> predicate)