Author: ivaynberg
Date: Wed May  6 16:01:45 2009
New Revision: 772336

URL: http://svn.apache.org/viewvc?rev=772336&view=rev
Log:
WICKET-2260 NavigatorLabel should support PageableListView

Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java?rev=772336&r1=772335&r2=772336&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
 Wed May  6 16:01:45 2009
@@ -19,6 +19,7 @@
 
 import org.apache.wicket.IClusterable;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.PageableListView;
 import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.StringResourceModel;
@@ -26,9 +27,9 @@
 
 /**
  * Label that provides Showing x to y of z message given for a DataTable. The 
message can be
- * overridden using the <code>NavigatorLabel</code> property key, the default 
message is used is
- * of the format <code>Showing ${from} to ${to} of ${of}</code>. The message 
can also be
- * configured pragmatically by setting it as the model object of the label.
+ * overridden using the <code>NavigatorLabel</code> property key, the default 
message is used is of
+ * the format <code>Showing ${from} to ${to} of ${of}</code>. The message can 
also be configured
+ * pragmatically by setting it as the model object of the label.
  * 
  * @author Igor Vaynberg (ivaynberg)
  * 
@@ -60,7 +61,7 @@
         * @param id
         *            component id
         * @param table
-        *            dataview
+        *            table
         */
        public NavigatorLabel(final String id, final DataTable<?> table)
        {
@@ -94,6 +95,37 @@
        /**
         * @param id
         *            component id
+        * @param list
+        *            listview
+        */
+       public NavigatorLabel(final String id, final PageableListView<?> list)
+       {
+               this(id, new PageableComponent()
+               {
+                       private static final long serialVersionUID = 1L;
+
+                       public int getCurrentPage()
+                       {
+                               return list.getCurrentPage();
+                       }
+
+                       public int getRowCount()
+                       {
+                               return list.getModelObject().size();
+                       }
+
+                       public int getRowsPerPage()
+                       {
+                               return list.getRowsPerPage();
+                       }
+
+               });
+
+       }
+
+       /**
+        * @param id
+        *            component id
         * @param table
         *            pageable view
         */


Reply via email to