From 2f3c342b5751f0ea41b0711b6d8757471572a79c Mon Sep 17 00:00:00 2001 From: aholland <aholland@a1dutch.co.uk> Date: Mon, 24 Feb 2014 17:44:39 -0500 Subject: [PATCH] openshift war support (non express) --- src/main/java/com/gitblit/wicket/panels/ActivityPanel.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java b/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java index b509f65..bbb7608 100644 --- a/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java @@ -25,7 +25,6 @@ import org.eclipse.jgit.lib.Repository; import com.gitblit.Constants; -import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.Activity; import com.gitblit.models.RepositoryCommit; @@ -40,9 +39,9 @@ /** * Renders activity in day-blocks in reverse-chronological order. - * + * * @author James Moger - * + * */ public class ActivityPanel extends BasePanel { @@ -52,12 +51,13 @@ super(wicketId); Collections.sort(recentActivity); - - final int shortHashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6); + + final int shortHashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6); DataView<Activity> activityView = new DataView<Activity>("activity", new ListDataProvider<Activity>(recentActivity)) { private static final long serialVersionUID = 1L; + @Override public void populateItem(final Item<Activity> activityItem) { final Activity entry = activityItem.getModelObject(); activityItem.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone(), getTimeUtils())); @@ -67,6 +67,7 @@ new ListDataProvider<RepositoryCommit>(entry.getCommits())) { private static final long serialVersionUID = 1L; + @Override public void populateItem(final Item<RepositoryCommit> commitItem) { final RepositoryCommit commit = commitItem.getModelObject(); @@ -138,7 +139,7 @@ WicketUtils.newObjectParameter(commit.repository, commit.getName())) .setEnabled(commit.getParentCount() > 0)); commitItem.add(new BookmarkablePageLink<Void>("tree", TreePage.class, - WicketUtils.newObjectParameter(commit.repository, commit.getName()))); + WicketUtils.newObjectParameter(commit.repository, commit.getName()))); } }; activityItem.add(commits); -- Gitblit v1.9.1