Polish the Lucene search page. Integrate both search mechanisms.

James Moger

2012-03-19 4e1930a8d9a4e1e90dadf36641f491fdda09f216

 src/com/gitblit/wicket/pages/GitSearchPage.java

File was renamed from src/com/gitblit/wicket/pages/SearchPage.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));