Repository: tapestry-5 Updated Branches: refs/heads/master c2a4b9698 -> 3288d3767
TAP5-2449: sort the class's own property descriptors last so that they ultimately control the property order Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/3288d376 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/3288d376 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/3288d376 Branch: refs/heads/master Commit: 3288d376767d7d6585d3f5c8e93920dff114bc72 Parents: c2a4b96 Author: Jochen Kemnade <[email protected]> Authored: Thu Jul 14 10:22:46 2016 +0200 Committer: Jochen Kemnade <[email protected]> Committed: Thu Jul 14 10:22:46 2016 +0200 ---------------------------------------------------------------------- .../tapestry5/ioc/internal/services/PropertyAccessImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3288d376/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java ---------------------------------------------------------------------- diff --git a/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java b/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java index 21fcfc3..0c7b942 100644 --- a/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java +++ b/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java @@ -100,7 +100,6 @@ public class PropertyAccessImpl implements PropertyAccess List<PropertyDescriptor> descriptors = CollectionFactory.newList(); - addAll(descriptors, info.getPropertyDescriptors()); // Introspector misses: // - interface methods not implemented in an abstract class (TAP5-921) // - default methods (TAP5-2449) @@ -108,6 +107,8 @@ public class PropertyAccessImpl implements PropertyAccess addPropertiesFromScala(forClass, descriptors); + addAll(descriptors, info.getPropertyDescriptors()); + return new ClassPropertyAdapterImpl(forClass, descriptors); } catch (Throwable ex)
