Polish the Lucene search page. Integrate both search mechanisms.

James Moger

2012-03-19 4e1930a8d9a4e1e90dadf36641f491fdda09f216

 src/com/gitblit/wicket/panels/LogPanel.java

@@ -35,14 +35,11 @@
import com.gitblit.models.RefModel;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebApp;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.BasePage;

import com.gitblit.wicket.pages.CommitDiffPage;

import com.gitblit.wicket.pages.CommitPage;

import com.gitblit.wicket.pages.LogPage;

import com.gitblit.wicket.pages.SearchPage;

import com.gitblit.wicket.pages.GitSearchPage;

import com.gitblit.wicket.pages.TreePage;



public class LogPanel extends BasePanel {

@@ -85,9 +82,6 @@
               WicketUtils.newRepositoryParameter(repositoryName)));

      }



      GitBlitWebApp app = (GitBlitWebApp) GitBlitWebSession.get().getApplication();

      final Class<? extends BasePage> searchPageClass = app.getSearchPageClass();



      ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);

      DataView<RevCommit> logView = new DataView<RevCommit>("commit", dp) {

         private static final long serialVersionUID = 1L;

@@ -102,8 +96,8 @@
            // author search link

            String author = entry.getAuthorIdent().getName();

            LinkPanel authorLink = new LinkPanel("commitAuthor", "list", author,

                  searchPageClass, WicketUtils.newSearchParameter(repositoryName, objectId,

                        author, Constants.SearchType.AUTHOR));

                  GitSearchPage.class, WicketUtils.newSearchParameter(repositoryName,

                        objectId, author, Constants.SearchType.AUTHOR));

            setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);

            item.add(authorLink);