James Moger
2012-02-16 3cc6e2de29a0fa33dd585e938e1614a6dd5f9755
src/com/gitblit/wicket/panels/BranchesPanel.java
@@ -29,11 +29,11 @@
import org.apache.wicket.model.StringResourceModel;
import org.eclipse.jgit.lib.Repository;
import com.gitblit.Constants;
import com.gitblit.SyndicationServlet;
import com.gitblit.models.RefModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.JGitUtils.SearchType;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.BranchesPage;
@@ -94,22 +94,22 @@
            String author = entry.getAuthorIdent().getName();
            LinkPanel authorLink = new LinkPanel("branchAuthor", "list", author,
                  SearchPage.class, WicketUtils.newSearchParameter(model.name, entry.getName(),
                        author, SearchType.AUTHOR));
            setPersonSearchTooltip(authorLink, author, SearchType.AUTHOR);
                  SearchPage.class, WicketUtils.newSearchParameter(model.name,
                        entry.getName(), author, Constants.SearchType.AUTHOR));
            setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);
            item.add(authorLink);
            // short message
            String shortMessage = entry.getShortMessage();
            String trimmedMessage = StringUtils.trimShortLog(shortMessage);
            LinkPanel shortlog = new LinkPanel("branchLog", "list subject",
                  trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(
                        model.name, entry.getName()));
            LinkPanel shortlog = new LinkPanel("branchLog", "list subject", trimmedMessage,
                  CommitPage.class, WicketUtils.newObjectParameter(model.name,
                        entry.getName()));
            if (!shortMessage.equals(trimmedMessage)) {
               WicketUtils.setHtmlTooltip(shortlog, shortMessage);
            }
            item.add(shortlog);
            if (maxCount <= 0) {
               Fragment fragment = new Fragment("branchLinks", "branchPageLinks", this);
               fragment.add(new BookmarkablePageLink<Void>("log", LogPage.class, WicketUtils
@@ -142,7 +142,9 @@
               this, null), BranchesPage.class, WicketUtils.newRepositoryParameter(model.name)));
      }
      // We always have 1 branch
      hasBranches = branches.size() > 1;
      hasBranches = (branches.size() > 1)
            || ((branches.size() == 1) && !branches.get(0).displayName
                  .equalsIgnoreCase("master"));
   }
   public BranchesPanel hideIfEmpty() {