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/HistoryPanel.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.java b/src/com/gitblit/wicket/panels/HistoryPanel.java
index 180a248..36a7680 100644
--- a/src/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/com/gitblit/wicket/panels/HistoryPanel.java
@@ -30,12 +30,13 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
+import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.PathModel;
import com.gitblit.models.PathModel.PathChangeModel;
+import com.gitblit.models.RefModel;
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.BlobDiffPage;
@@ -73,7 +74,7 @@
}
final boolean isTree = matchingPath == null ? true : matchingPath.isTree();
- final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);
+ final Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(r);
List<RevCommit> commits;
if (pageResults) {
// Paging result set
@@ -108,8 +109,8 @@
String author = entry.getAuthorIdent().getName();
LinkPanel authorLink = new LinkPanel("commitAuthor", "list", author,
SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId,
- author, SearchType.AUTHOR));
- setPersonSearchTooltip(authorLink, author, SearchType.AUTHOR);
+ author, Constants.SearchType.AUTHOR));
+ setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);
item.add(authorLink);
// merge icon
@@ -120,7 +121,12 @@
}
String shortMessage = entry.getShortMessage();
- String trimmedMessage = StringUtils.trimShortLog(shortMessage);
+ String trimmedMessage = shortMessage;
+ if (allRefs.containsKey(entry.getId())) {
+ trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG_REFS);
+ } else {
+ trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG);
+ }
LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject",
trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(
repositoryName, entry.getName()));
--
Gitblit v1.9.1