You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2007/08/08 20:24:25 UTC
svn commit: r563969 -
/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
Author: ivaynberg
Date: Wed Aug 8 11:24:20 2007
New Revision: 563969
URL: http://svn.apache.org/viewvc?view=rev&rev=563969
Log:
better isvisible logic
Modified:
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java?view=diff&rev=563969&r1=563968&r2=563969
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java Wed Aug 8 11:24:20 2007
@@ -33,9 +33,9 @@
public class NavigationToolbar extends AbstractToolbar
{
private static final long serialVersionUID = 1L;
-
+
private DataTable table;
-
+
/**
* Constructor
*
@@ -45,8 +45,8 @@
public NavigationToolbar(final DataTable table)
{
super(table);
- this.table=table;
-
+ this.table = table;
+
WebMarkupContainer span = new WebMarkupContainer("span");
add(span);
span.add(new AttributeModifier("colspan", true, new Model(String
@@ -55,8 +55,8 @@
span.add(newPagingNavigator("navigator", table));
span.add(newNavigatorLabel("navigatorLabel", table));
}
-
-
+
+
/**
* Factory method used to create the paging navigator that will be used by
* the datatable
@@ -89,12 +89,12 @@
}
/**
- * Hides this toolbar when no rows are visible or number of rows is set to Integer.MAX_VALUE
+ * Hides this toolbar when there is only one page in the table
*
* @see org.apache.wicket.Component#isVisible()
*/
public boolean isVisible()
{
- return table.getRowCount() > 0&&table.getRowsPerPage()<Integer.MAX_VALUE;
+ return table.getPageCount() > 1;
}
}