You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/04/30 00:56:42 UTC
svn commit: r1098012 - in /tapestry/tapestry5/trunk/plastic/src:
main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
test/groovy/org/apache/tapestry5/plastic/ClassAnnotationAccess.groovy
Author: hlship
Date: Fri Apr 29 22:56:41 2011
New Revision: 1098012
URL: http://svn.apache.org/viewvc?rev=1098012&view=rev
Log:
TAP5-853: Have annotation proxies provide a reasonable value for toString()
Modified:
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
tapestry/tapestry5/trunk/plastic/src/test/groovy/org/apache/tapestry5/plastic/ClassAnnotationAccess.groovy
Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java?rev=1098012&r1=1098011&r2=1098012&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java (original)
+++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java Fri Apr 29 22:56:41 2011
@@ -74,8 +74,16 @@ public class AnnotationBuilder extends A
Object defaultValue = m.getDefaultValue();
if (defaultValue != null)
+ {
attributes.put(m.getName(), defaultValue);
+ }
}
+
+ if (!attributes.containsKey("toString"))
+ {
+ attributes.put("toString", "@" + annotationType.getName());
+ }
+
}
protected void store(String name, Object value)
Modified: tapestry/tapestry5/trunk/plastic/src/test/groovy/org/apache/tapestry5/plastic/ClassAnnotationAccess.groovy
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/test/groovy/org/apache/tapestry5/plastic/ClassAnnotationAccess.groovy?rev=1098012&r1=1098011&r2=1098012&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/plastic/src/test/groovy/org/apache/tapestry5/plastic/ClassAnnotationAccess.groovy (original)
+++ tapestry/tapestry5/trunk/plastic/src/test/groovy/org/apache/tapestry5/plastic/ClassAnnotationAccess.groovy Fri Apr 29 22:56:41 2011
@@ -30,6 +30,8 @@ class ClassAnnotationAccess extends Spec
a instanceof SimpleAnnotation
a.annotationType() == SimpleAnnotation.class
+
+ a.toString() == "@testannotations.SimpleAnnotation"
}
def "inherited class annotations visible in subclass"() {