From 4e1930a8d9a4e1e90dadf36641f491fdda09f216 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 19 Mar 2012 22:12:08 -0400
Subject: [PATCH] Polish the Lucene search page. Integrate both search mechanisms.
---
src/com/gitblit/wicket/pages/GitSearchPage.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/SearchPage.java b/src/com/gitblit/wicket/pages/GitSearchPage.java
similarity index 81%
rename from src/com/gitblit/wicket/pages/SearchPage.java
rename to src/com/gitblit/wicket/pages/GitSearchPage.java
index d4728d7..ca813ac 100644
--- a/src/com/gitblit/wicket/pages/SearchPage.java
+++ b/src/com/gitblit/wicket/pages/GitSearchPage.java
@@ -22,9 +22,9 @@
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.SearchPanel;
-public class SearchPage extends RepositoryPage {
+public class GitSearchPage extends RepositoryPage {
- public SearchPage(PageParameters params) {
+ public GitSearchPage(PageParameters params) {
super(params);
String value = WicketUtils.getSearchString(params);
@@ -40,23 +40,23 @@
boolean hasMore = search.hasMore();
add(search);
- add(new BookmarkablePageLink<Void>("firstPageTop", SearchPage.class,
+ add(new BookmarkablePageLink<Void>("firstPageTop", GitSearchPage.class,
WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType))
.setEnabled(pageNumber > 1));
- add(new BookmarkablePageLink<Void>("prevPageTop", SearchPage.class,
+ add(new BookmarkablePageLink<Void>("prevPageTop", GitSearchPage.class,
WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType,
prevPage)).setEnabled(pageNumber > 1));
- add(new BookmarkablePageLink<Void>("nextPageTop", SearchPage.class,
+ add(new BookmarkablePageLink<Void>("nextPageTop", GitSearchPage.class,
WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType,
nextPage)).setEnabled(hasMore));
- add(new BookmarkablePageLink<Void>("firstPageBottom", SearchPage.class,
+ add(new BookmarkablePageLink<Void>("firstPageBottom", GitSearchPage.class,
WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType))
.setEnabled(pageNumber > 1));
- add(new BookmarkablePageLink<Void>("prevPageBottom", SearchPage.class,
+ add(new BookmarkablePageLink<Void>("prevPageBottom", GitSearchPage.class,
WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType,
prevPage)).setEnabled(pageNumber > 1));
- add(new BookmarkablePageLink<Void>("nextPageBottom", SearchPage.class,
+ add(new BookmarkablePageLink<Void>("nextPageBottom", GitSearchPage.class,
WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType,
nextPage)).setEnabled(hasMore));
--
Gitblit v1.9.1