From 99d0d4fd66f3490b61c700065b7d16bc4e73f226 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 26 Nov 2013 16:07:04 -0500 Subject: [PATCH] Eliminate nearly all direct GitBlit singleton references in Wicket --- src/main/java/com/gitblit/wicket/panels/ReflogPanel.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/ReflogPanel.java b/src/main/java/com/gitblit/wicket/panels/ReflogPanel.java index d63f26c..abd4ecd 100644 --- a/src/main/java/com/gitblit/wicket/panels/ReflogPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/ReflogPanel.java @@ -33,7 +33,6 @@ import org.eclipse.jgit.transport.ReceiveCommand.Type; import com.gitblit.Constants; -import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.RefLogEntry; import com.gitblit.models.RepositoryCommit; @@ -61,7 +60,7 @@ public ReflogPanel(String wicketId, final RepositoryModel model, Repository r, int limit, int pageOffset) { super(wicketId); boolean pageResults = limit <= 0; - int changesPerPage = GitBlit.getInteger(Keys.web.reflogChangesPerPage, 10); + int changesPerPage = app().settings().getInteger(Keys.web.reflogChangesPerPage, 10); if (changesPerPage <= 1) { changesPerPage = 10; } @@ -111,9 +110,9 @@ } protected void setup(List<RefLogEntry> changes) { - final int hashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6); + final int hashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6); - String dateFormat = GitBlit.getString(Keys.web.datetimestampLongFormat, "EEEE, MMMM d, yyyy HH:mm Z"); + String dateFormat = app().settings().getString(Keys.web.datetimestampLongFormat, "EEEE, MMMM d, yyyy HH:mm Z"); final TimeZone timezone = getTimeZone(); final DateFormat df = new SimpleDateFormat(dateFormat); df.setTimeZone(timezone); -- Gitblit v1.9.1