From 43e32ec71a508e1bb68b247fdca74f64bcf629b3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 28 Feb 2012 22:41:31 -0500
Subject: [PATCH] Draft integration of Lucene search mechanism and web ui
---
src/com/gitblit/wicket/panels/ActivityPanel.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java
index 2ee437d..dc94f3c 100644
--- a/src/com/gitblit/wicket/panels/ActivityPanel.java
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.java
@@ -28,7 +28,6 @@
import com.gitblit.models.Activity;
import com.gitblit.models.Activity.RepositoryCommit;
import com.gitblit.utils.StringUtils;
-import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.CommitDiffPage;
import com.gitblit.wicket.pages.CommitPage;
@@ -58,12 +57,11 @@
public void populateItem(final Item<Activity> item) {
final Activity entry = item.getModelObject();
- item.add(WicketUtils.createDatestampLabel("title", entry.startDate, GitBlitWebSession
- .get().getTimezone()));
+ item.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone()));
// display the commits in chronological order
DataView<RepositoryCommit> commits = new DataView<RepositoryCommit>("commits",
- new ListDataProvider<RepositoryCommit>(entry.commits)) {
+ new ListDataProvider<RepositoryCommit>(entry.getCommits())) {
private static final long serialVersionUID = 1L;
public void populateItem(final Item<RepositoryCommit> item) {
@@ -72,7 +70,7 @@
// time of day
fragment.add(WicketUtils.createTimeLabel("time", commit.getAuthorIdent()
- .getWhen(), GitBlitWebSession.get().getTimezone()));
+ .getWhen(), getTimeZone()));
// avatar
fragment.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36));
@@ -115,7 +113,12 @@
// message/commit link
String shortMessage = commit.getShortMessage();
- String trimmedMessage = StringUtils.trimShortLog(shortMessage);
+ String trimmedMessage = shortMessage;
+ if (commit.getRefs() != null && commit.getRefs().size() > 0) {
+ trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG_REFS);
+ } else {
+ trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG);
+ }
LinkPanel shortlog = new LinkPanel("message", "list subject",
trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(
commit.repository, commit.getName()), true);
--
Gitblit v1.9.1