Replace ChoiceRenderer with StringChoiceRenderer (issue 71)

James Moger

2012-03-05 6fa6abf07be67bba86e9781a4028c4b3863b50f7

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

@@ -94,10 +92,11 @@
                  fragment.add(authorLink);



                  // repository

                  String repoName = StringUtils.stripDotGit(commit.repository);

                  LinkPanel repositoryLink = new LinkPanel("repository", null,

                        commit.repository, SummaryPage.class,

                        repoName, SummaryPage.class,

                        WicketUtils.newRepositoryParameter(commit.repository), true);

                  WicketUtils.setCssBackground(repositoryLink, commit.repository);

                  WicketUtils.setCssBackground(repositoryLink, repoName);

                  fragment.add(repositoryLink);



                  // repository branch

@@ -114,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);