Ensure that the welcome message is interpreted as UTF-8 (issue 74)

James Moger

2012-03-16 86bea9e0016b2890db8ba83049dd4e89653a0a5e

 src/com/gitblit/wicket/panels/BranchesPanel.java

@@ -35,13 +35,15 @@
import com.gitblit.models.RepositoryModel;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebApp;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.BasePage;

import com.gitblit.wicket.pages.BranchesPage;

import com.gitblit.wicket.pages.CommitPage;

import com.gitblit.wicket.pages.LogPage;

import com.gitblit.wicket.pages.MetricsPage;

import com.gitblit.wicket.pages.SearchPage;

import com.gitblit.wicket.pages.SummaryPage;

import com.gitblit.wicket.pages.TreePage;



public class BranchesPanel extends BasePanel {

@@ -73,10 +75,11 @@
               null), BranchesPage.class, WicketUtils.newRepositoryParameter(model.name)));

      } else {

         // branches page

         // show repository summary page link

         add(new LinkPanel("branches", "title", model.name, SummaryPage.class,

               WicketUtils.newRepositoryParameter(model.name)));

         add(new Label("branches", new StringResourceModel("gb.branches", this, null)));

      }



      GitBlitWebApp app = (GitBlitWebApp) GitBlitWebSession.get().getApplication();

      final Class<? extends BasePage> searchPageClass = app.getSearchPageClass();



      ListDataProvider<RefModel> branchesDp = new ListDataProvider<RefModel>(branches);

      DataView<RefModel> branchesView = new DataView<RefModel>("branch", branchesDp) {

@@ -94,14 +97,14 @@


            String author = entry.getAuthorIdent().getName();

            LinkPanel authorLink = new LinkPanel("branchAuthor", "list", author,

                  SearchPage.class, WicketUtils.newSearchParameter(model.name,

                  searchPageClass, WicketUtils.newSearchParameter(model.name,

                        entry.getName(), author, Constants.SearchType.AUTHOR));

            setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);

            item.add(authorLink);



            // short message

            String shortMessage = entry.getShortMessage();

            String trimmedMessage = StringUtils.trimShortLog(shortMessage);

            String trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG);

            LinkPanel shortlog = new LinkPanel("branchLog", "list subject", trimmedMessage,

                  CommitPage.class, WicketUtils.newObjectParameter(model.name,

                        entry.getName()));