svn commit: r941969 - in /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5: beaneditor/BeanModel.java internal/beaneditor/BeanModelImpl.java

[hl...@apache.org]

Author: hlship
Date: Thu May  6 23:22:52 2010
New Revision: 941969

URL: http://svn.apache.org/viewvc?rev=941969&view=rev
Log:
TAP5-898: BeanModel methods reorder, include and exclude should return BeanModel<T> (not BeanModel<?>)

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java?rev=941969&r1=941968&r2=941969&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java Thu May  6 23:22:52 2010
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2007, 2008, 2009, 2010 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -123,7 +123,7 @@ public interface BeanModel<T>
      * @param propertyNames the names of properties to be removed (case insensitive)
      * @return the model for further modifications
      */
-    BeanModel exclude(String... propertyNames);
+    BeanModel<T> exclude(String... propertyNames);
 
     /**
      * Re-orders the properties of the model into the specified order. Existing properties that are not indicated are
@@ -132,7 +132,7 @@ public interface BeanModel<T>
      * @param propertyNames property names in order they should be displayed (case insensitive)
      * @return the model for further modifications
      */
-    BeanModel reorder(String... propertyNames);
+    BeanModel<T> reorder(String... propertyNames);
 
     /**
      * Re-orders the properties of the model into the specified order. Existing properties that are not indicated are
@@ -141,5 +141,5 @@ public interface BeanModel<T>
      * @param propertyNames the names of properties to be retained
      * @return the model for further modifications
      */
-    BeanModel include(String... propertyNames);
+    BeanModel<T> include(String... propertyNames);
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java?rev=941969&r1=941968&r2=941969&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java Thu May  6 23:22:52 2010
@@ -181,7 +181,7 @@ public class BeanModelImpl<T> implements
         return CollectionFactory.newList(propertyNames);
     }
 
-    public BeanModel exclude(String... propertyNames)
+    public BeanModel<T> exclude(String... propertyNames)
     {
         for (String propertyName : propertyNames)
         {
@@ -202,7 +202,7 @@ public class BeanModelImpl<T> implements
         return this;
     }
 
-    public BeanModel reorder(String... propertyNames)
+    public BeanModel<T> reorder(String... propertyNames)
     {
         List<String> remainingPropertyNames = CollectionFactory.newList(this.propertyNames);
         List<String> reorderedPropertyNames = CollectionFactory.newList();
@@ -228,7 +228,7 @@ public class BeanModelImpl<T> implements
         return this;
     }
 
-    public BeanModel include(String... propertyNames)
+    public BeanModel<T> include(String... propertyNames)
     {
         List<String> reorderedPropertyNames = CollectionFactory.newList();
         Map<String, PropertyModel> reduced = CollectionFactory.newCaseInsensitiveMap();