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:55:28 UTC
svn commit: r1097994 - in /tapestry/tapestry5/trunk/plastic/src:
main/java/org/apache/tapestry5/internal/plastic/
main/java/org/apache/tapestry5/plastic/
test/groovy/org/apache/tapestry5/plastic/
Author: hlship
Date: Fri Apr 29 22:55:27 2011
New Revision: 1097994
URL: http://svn.apache.org/viewvc?rev=1097994&view=rev
Log:
TAP5-853: Change getFieldsWithAnnotation() to return all non-introduced fields, regardless of whether they are claimed
Modified:
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticClass.java
tapestry/tapestry5/trunk/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldAnnotationAccess.groovy
Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java?rev=1097994&r1=1097993&r2=1097994&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java (original)
+++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java Fri Apr 29 22:55:27 2011
@@ -1693,7 +1693,7 @@ public class PlasticClassImpl extends Lo
{
check();
- List<PlasticField> result = getUnclaimedFields();
+ List<PlasticField> result = getAllFields();
Iterator<PlasticField> iterator = result.iterator();
Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticClass.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticClass.java?rev=1097994&r1=1097993&r2=1097994&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticClass.java (original)
+++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticClass.java Fri Apr 29 22:55:27 2011
@@ -42,7 +42,7 @@ public interface PlasticClass extends An
String getClassName();
/**
- * Matches all unclaimed fields that have the given annotation. Returns the fields in sorted order.
+ * Matches all fields (claimed or not) that have the given annotation. Returns the fields in sorted order.
*
* @return Unmodifiable List of fields.
*/
Modified: tapestry/tapestry5/trunk/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldAnnotationAccess.groovy
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldAnnotationAccess.groovy?rev=1097994&r1=1097993&r2=1097994&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldAnnotationAccess.groovy (original)
+++ tapestry/tapestry5/trunk/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldAnnotationAccess.groovy Fri Apr 29 22:55:27 2011
@@ -19,18 +19,4 @@ class FieldAnnotationAccess extends Spec
fields.size() == 1
fields[0].name == "hasMaybeAnnotation"
}
-
- def "claimed fields not visible to getFieldsWithAnnotation()"() {
- setup:
- def pc = mgr.getPlasticClass("testsubjects.AnnotationSubject")
-
- when:
- def fields = pc.getFieldsWithAnnotation(Maybe.class)
-
- fields[0].claim(this)
-
- then:
-
- pc.getFieldsWithAnnotation(Maybe.class).empty
- }
}