Reduce use of final to avoid Wicket serialization issues in reflogs

James Moger

2014-03-03 f7df31e369b7ddd0f7d2e61b4328a2fc4c377451

Reduce use of final to avoid Wicket serialization issues in reflogs

 src/main/java/com/gitblit/wicket/panels/DigestsPanel.java

@@ -19,7 +19,6 @@
import java.text.MessageFormat;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.List;

import java.util.TimeZone;

@@ -55,14 +54,6 @@
        super(wicketId);

        hasChanges = digests.size() > 0;



        final int hashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6);



        String dateFormat = app().settings().getString(Keys.web.datestampLongFormat, "EEEE, MMMM d, yyyy");

        final TimeZone timezone = getTimeZone();

        final DateFormat df = new SimpleDateFormat(dateFormat);

        df.setTimeZone(timezone);

        final Calendar cal = Calendar.getInstance(timezone);



        ListDataProvider<DailyLogEntry> dp = new ListDataProvider<DailyLogEntry>(digests);

        DataView<DailyLogEntry> pushView = new DataView<DailyLogEntry>("change", dp) {

            private static final long serialVersionUID = 1L;

@@ -70,6 +61,12 @@
            @Override

            public void populateItem(final Item<DailyLogEntry> logItem) {

                final DailyLogEntry change = logItem.getModelObject();



                String dateFormat = app().settings().getString(Keys.web.datestampLongFormat, "EEEE, MMMM d, yyyy");

                TimeZone timezone = getTimeZone();

                DateFormat df = new SimpleDateFormat(dateFormat);

                df.setTimeZone(timezone);



                String fullRefName = change.getChangedRefs().get(0);

                String shortRefName = fullRefName;

                boolean isTag = false;

@@ -233,6 +230,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()));


 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()));