From 2a7306a1d92522569a8bb6e5a7c0bcdd5cf4cfaa Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 26 May 2011 17:11:38 -0400 Subject: [PATCH] Findbugs. CodePro Audit. Checkstyle. Unit test refactoring. --- src/com/gitblit/wicket/pages/SearchPage.java | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/com/gitblit/wicket/pages/SearchPage.java b/src/com/gitblit/wicket/pages/SearchPage.java index 730d32d..b12beee 100644 --- a/src/com/gitblit/wicket/pages/SearchPage.java +++ b/src/com/gitblit/wicket/pages/SearchPage.java @@ -24,29 +24,42 @@ import com.gitblit.wicket.panels.SearchPanel; public class SearchPage extends RepositoryPage { - + public SearchPage(PageParameters params) { super(params); String value = WicketUtils.getSearchString(params); String type = WicketUtils.getSearchType(params); SearchType searchType = SearchType.forName(type); - + int pageNumber = WicketUtils.getPage(params); int prevPage = Math.max(0, pageNumber - 1); int nextPage = pageNumber + 1; - SearchPanel search = new SearchPanel("searchPanel", repositoryName, objectId, value, searchType, getRepository(), -1, pageNumber - 1); + SearchPanel search = new SearchPanel("searchPanel", repositoryName, objectId, value, + searchType, getRepository(), -1, pageNumber - 1); boolean hasMore = search.hasMore(); add(search); - add(new BookmarkablePageLink<Void>("firstPageTop", SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType)).setEnabled(pageNumber > 1)); - add(new BookmarkablePageLink<Void>("prevPageTop", SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType, prevPage)).setEnabled(pageNumber > 1)); - add(new BookmarkablePageLink<Void>("nextPageTop", SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType, nextPage)).setEnabled(hasMore)); + add(new BookmarkablePageLink<Void>("firstPageTop", SearchPage.class, + WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType)) + .setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("prevPageTop", SearchPage.class, + WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType, + prevPage)).setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("nextPageTop", SearchPage.class, + WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType, + nextPage)).setEnabled(hasMore)); - add(new BookmarkablePageLink<Void>("firstPageBottom", SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType)).setEnabled(pageNumber > 1)); - add(new BookmarkablePageLink<Void>("prevPageBottom", SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType, prevPage)).setEnabled(pageNumber > 1)); - add(new BookmarkablePageLink<Void>("nextPageBottom", SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType, nextPage)).setEnabled(hasMore)); + add(new BookmarkablePageLink<Void>("firstPageBottom", SearchPage.class, + WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType)) + .setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("prevPageBottom", SearchPage.class, + WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType, + prevPage)).setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("nextPageBottom", SearchPage.class, + WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType, + nextPage)).setEnabled(hasMore)); } -- Gitblit v1.9.1