svn commit: r484965 - in /incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater: ContactsDatabase.java SortableContactDataProvider.java SortingPage.java

[jcompagner]

Author: jcompagner
Date: Sat Dec  9 03:03:26 2006
New Revision: 484965

URL: http://svn.apache.org/viewvc?view=rev&rev=484965
Log:
improved docs for IDataProvider
made some java5 generics in the repeater package

Modified:
    
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/ContactsDatabase.java
    
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/SortableContactDataProvider.java
    
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/SortingPage.java

Modified: 
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/ContactsDatabase.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/ContactsDatabase.java?view=diff&rev=484965&r1=484964&r2=484965
==============================================================================
--- 
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/ContactsDatabase.java
 (original)
+++ 
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/ContactsDatabase.java
 Sat Dec  9 03:03:26 2006
@@ -88,13 +88,13 @@
         * @param sortAsc
         * @return list of contacts
         */
-       public List find(int first, int count, String sortProperty, boolean 
sortAsc)
+       public List<Contact> find(int first, int count, String sortProperty, 
boolean sortAsc)
        {
-               List sublist = getIndex(sortProperty, sortAsc).subList(first, 
first + count);
+               List<Contact> sublist = getIndex(sortProperty, 
sortAsc).subList(first, first + count);
                return sublist;
        }
 
-       protected List getIndex(String prop, boolean asc)
+       protected List<Contact> getIndex(String prop, boolean asc)
        {
                if (prop == null)
                {

Modified: 
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/SortableContactDataProvider.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/SortableContactDataProvider.java?view=diff&rev=484965&r1=484964&r2=484965
==============================================================================
--- 
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/SortableContactDataProvider.java
 (original)
+++ 
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/SortableContactDataProvider.java
 Sat Dec  9 03:03:26 2006
@@ -31,7 +31,7 @@
  * @author igor
  * 
  */
-public class SortableContactDataProvider extends SortableDataProvider
+public class SortableContactDataProvider extends SortableDataProvider<Contact>
 {
        /**
         * constructor
@@ -51,7 +51,7 @@
         * @see 
wicket.extensions.markup.html.repeater.data.IDataProvider#iterator(int,
         *      int)
         */
-       public Iterator iterator(int first, int count)
+       public Iterator<Contact> iterator(int first, int count)
        {
                SortParam sp = getSort();
                return getContactsDB().find(first, count, sp.getProperty(), 
sp.isAscending()).iterator();
@@ -68,9 +68,9 @@
        /**
         * @see 
wicket.extensions.markup.html.repeater.data.IDataProvider#model(java.lang.Object)
         */
-       public IModel model(Object object)
+       public IModel<Contact> model(Contact object)
        {
-               return new DetachableContactModel((Contact)object);
+               return new DetachableContactModel(object);
        }
 
 }

Modified: 
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/SortingPage.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/SortingPage.java?view=diff&rev=484965&r1=484964&r2=484965
==============================================================================
--- 
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/SortingPage.java
 (original)
+++ 
incubator/wicket/trunk/wicket-examples/src/main/java/wicket/examples/repeater/SortingPage.java
 Sat Dec  9 03:03:26 2006
@@ -44,12 +44,12 @@
        public SortingPage()
        {
                SortableContactDataProvider dp = new 
SortableContactDataProvider();
-               final DataView dataView = new DataView(this, "sorting", dp)
+               final DataView<Contact> dataView = new DataView<Contact>(this, 
"sorting", dp)
                {
                        @Override
-                       protected void populateItem(final Item item)
+                       protected void populateItem(final Item<Contact> item)
                        {
-                               Contact contact = 
(Contact)item.getModelObject();
+                               Contact contact = item.getModelObject();
                                new ActionPanel(item, "actions", 
item.getModel());
                                new Label(item, "contactid", 
String.valueOf(contact.getId()));
                                new Label(item, "firstname", 
contact.getFirstName());