From 6fa6abf07be67bba86e9781a4028c4b3863b50f7 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 05 Mar 2012 16:32:18 -0500 Subject: [PATCH] Replace ChoiceRenderer with StringChoiceRenderer (issue 71) --- src/com/gitblit/wicket/panels/BranchesPanel.java | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.java b/src/com/gitblit/wicket/panels/BranchesPanel.java index d784354..0d2fe4a 100644 --- a/src/com/gitblit/wicket/panels/BranchesPanel.java +++ b/src/com/gitblit/wicket/panels/BranchesPanel.java @@ -27,14 +27,13 @@ import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.model.StringResourceModel; -import org.eclipse.jgit.lib.Constants; 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; @@ -42,7 +41,6 @@ import com.gitblit.wicket.pages.LogPage; import com.gitblit.wicket.pages.MetricsPage; import com.gitblit.wicket.pages.SearchPage; -import com.gitblit.wicket.pages.SummaryPage; import com.gitblit.wicket.pages.TreePage; public class BranchesPanel extends BasePanel { @@ -74,9 +72,7 @@ null), BranchesPage.class, WicketUtils.newRepositoryParameter(model.name))); } else { // branches page - // show repository summary page link - add(new LinkPanel("branches", "title", model.name, SummaryPage.class, - WicketUtils.newRepositoryParameter(model.name))); + add(new Label("branches", new StringResourceModel("gb.branches", this, null))); } ListDataProvider<RefModel> branchesDp = new ListDataProvider<RefModel>(branches); @@ -96,13 +92,13 @@ 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); + 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); + String trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG); LinkPanel shortlog = new LinkPanel("branchLog", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(model.name, entry.getName())); -- Gitblit v1.9.1