svnno****@sourc*****
svnno****@sourc*****
2008年 7月 31日 (木) 15:59:32 JST
Revision: 1067 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1067 Author: shinsuke Date: 2008-07-31 15:59:32 +0900 (Thu, 31 Jul 2008) Log Message: ----------- clear paging information. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java 2008-07-31 06:42:59 UTC (rev 1066) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java 2008-07-31 06:59:32 UTC (rev 1067) @@ -32,6 +32,12 @@ setLimit(PALAdminConstants.DEFAULT_PAGER_LIMIT_SIZE); } + public void clear() { + setOffset(0); + setCount(0); + setLimit(PALAdminConstants.DEFAULT_PAGER_LIMIT_SIZE); + } + /* (non-Javadoc) * @see jp.sf.pal.admin.pager.Pager#getLimit() */ Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java 2008-07-31 06:42:59 UTC (rev 1066) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java 2008-07-31 06:59:32 UTC (rev 1067) @@ -18,9 +18,7 @@ import java.io.Serializable; public class UserPager extends DefaultPager implements Serializable { - /** - * - */ + private static final long serialVersionUID = 5976446304119300112L; private String filter; @@ -33,6 +31,12 @@ authenticationProviderName = null; } + public void clear() { + super.clear(); + filter = ""; + authenticationProviderName = null; + } + /** * @return the filter */ Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2008-07-31 06:42:59 UTC (rev 1066) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2008-07-31 06:59:32 UTC (rev 1067) @@ -140,12 +140,14 @@ // } public Class<?> doSearch() { + getUserManagementService().getUserPager().clear(); getUserManagementService().updateQuery(this); return null; } public Class<?> doResetSearch() { setFilter(""); + getUserManagementService().getUserPager().clear(); getUserManagementService().updateQuery(this); return null; }