From f7df31e369b7ddd0f7d2e61b4328a2fc4c377451 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 03 Mar 2014 17:28:19 -0500
Subject: [PATCH] Reduce use of final to avoid Wicket serialization issues in reflogs
---
src/main/java/com/gitblit/wicket/panels/ReflogPanel.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/ReflogPanel.java b/src/main/java/com/gitblit/wicket/panels/ReflogPanel.java
index 35fd681..70f5986 100644
--- a/src/main/java/com/gitblit/wicket/panels/ReflogPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/ReflogPanel.java
@@ -110,13 +110,6 @@
}
protected void setup(List<RefLogEntry> changes) {
- final int hashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6);
-
- 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);
- final Calendar cal = Calendar.getInstance(timezone);
ListDataProvider<RefLogEntry> dp = new ListDataProvider<RefLogEntry>(changes);
DataView<RefLogEntry> changeView = new DataView<RefLogEntry>("change", dp) {
@@ -125,6 +118,13 @@
@Override
public void populateItem(final Item<RefLogEntry> changeItem) {
final RefLogEntry change = changeItem.getModelObject();
+
+ String dateFormat = app().settings().getString(Keys.web.datetimestampLongFormat, "EEEE, MMMM d, yyyy HH:mm Z");
+ TimeZone timezone = getTimeZone();
+ DateFormat df = new SimpleDateFormat(dateFormat);
+ df.setTimeZone(timezone);
+ Calendar cal = Calendar.getInstance(timezone);
+
String fullRefName = change.getChangedRefs().get(0);
String shortRefName = fullRefName;
boolean isTag = false;
@@ -286,6 +286,7 @@
commitItem.add(shortlog);
// commit hash link
+ int hashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6);
LinkPanel commitHash = new LinkPanel("hashLink", null, commit.getName().substring(0, hashLen),
CommitPage.class, WicketUtils.newObjectParameter(
change.repository, commit.getName()));
--
Gitblit v1.9.1