James Moger
2012-01-05 cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef
src/com/gitblit/wicket/pages/CommitPage.java
@@ -16,6 +16,7 @@
package com.gitblit.wicket.pages;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.wicket.PageParameters;
@@ -26,20 +27,23 @@
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.StringResourceModel;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.Constants;
import com.gitblit.DownloadZipServlet;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.GitNote;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.JGitUtils.SearchType;
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.PathModel.PathChangeModel;
import com.gitblit.wicket.panels.CommitHeaderPanel;
import com.gitblit.wicket.panels.CommitLegendPanel;
import com.gitblit.wicket.panels.GravatarImage;
import com.gitblit.wicket.panels.LinkPanel;
import com.gitblit.wicket.panels.RefsPanel;
public class CommitPage extends RepositoryPage {
@@ -61,8 +65,8 @@
         add(new Label("parentLink", "none"));
         add(new Label("commitdiffLink", getString("gb.commitdiff")));
      } else {
         add(new LinkPanel("parentLink", null, parents.get(0).substring(0, 8), CommitPage.class,
               newCommitParameter(parents.get(0))));
         add(new LinkPanel("parentLink", null, getShortObjectId(parents.get(0)),
               CommitPage.class, newCommitParameter(parents.get(0))));
         add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff",
               this, null), CommitDiffPage.class, WicketUtils.newObjectParameter(
               repositoryName, objectId)));
@@ -75,12 +79,13 @@
      addRefs(r, c);
      // author
      add(createPersonPanel("commitAuthor", c.getAuthorIdent(), SearchType.AUTHOR));
      add(createPersonPanel("commitAuthor", c.getAuthorIdent(), Constants.SearchType.AUTHOR));
      add(WicketUtils.createTimestampLabel("commitAuthorDate", c.getAuthorIdent().getWhen(),
            getTimeZone()));
      add(new GravatarImage("authorAvatar", c.getAuthorIdent()));
      // committer
      add(createPersonPanel("commitCommitter", c.getCommitterIdent(), SearchType.COMMITTER));
      add(createPersonPanel("commitCommitter", c.getCommitterIdent(), Constants.SearchType.COMMITTER));
      add(WicketUtils.createTimestampLabel("commitCommitterDate",
            c.getCommitterIdent().getWhen(), getTimeZone()));
@@ -89,9 +94,9 @@
      add(new LinkPanel("commitTree", "list", c.getTree().getName(), TreePage.class,
            newCommitParameter()));
      add(new BookmarkablePageLink<Void>("treeLink", TreePage.class, newCommitParameter()));
      add(new ExternalLink("zipLink", DownloadZipServlet.asLink(getRequest()
            .getRelativePathPrefixToContextRoot(), repositoryName, objectId, null))
            .setVisible(GitBlit.getBoolean(Keys.web.allowZipDownloads, true)));
      final String baseUrl = WicketUtils.getGitblitURL(getRequest());
      add(new ExternalLink("zipLink", DownloadZipServlet.asLink(baseUrl, repositoryName,
            objectId, null)).setVisible(GitBlit.getBoolean(Keys.web.allowZipDownloads, true)));
      // Parent Commits
      ListDataProvider<String> parentsDp = new ListDataProvider<String>(parents);
@@ -112,6 +117,26 @@
      addFullText("fullMessage", c.getFullMessage(), true);
      // git notes
      List<GitNote> notes = JGitUtils.getNotesOnCommit(r, c);
      ListDataProvider<GitNote> notesDp = new ListDataProvider<GitNote>(notes);
      DataView<GitNote> notesView = new DataView<GitNote>("notes", notesDp) {
         private static final long serialVersionUID = 1L;
         public void populateItem(final Item<GitNote> item) {
            GitNote entry = item.getModelObject();
            item.add(new RefsPanel("refName", repositoryName, Arrays.asList(entry.notesRef)));
            item.add(createPersonPanel("authorName", entry.notesRef.getAuthorIdent(),
                  Constants.SearchType.AUTHOR));
            item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));
            item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef
                  .getAuthorIdent().getWhen(), getTimeZone()));
            item.add(new Label("noteContent", GitBlit.self().processCommitMessage(
                  repositoryName, entry.content)).setEscapeModelStrings(false));
         }
      };
      add(notesView.setVisible(notes.size() > 0));
      // changed paths list
      List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, c);
      add(new CommitLegendPanel("commitLegend", paths));
@@ -128,19 +153,26 @@
            item.add(changeType);
            if (entry.isTree()) {
               item.add(new LinkPanel("pathName", null, entry.path, TreePage.class,
                     newPathParameter(entry.path)));
                     WicketUtils
                           .newPathParameter(repositoryName, entry.commitId, entry.path)));
            } else {
               item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class,
                     newPathParameter(entry.path)));
                     WicketUtils
                           .newPathParameter(repositoryName, entry.commitId, entry.path)));
            }
            item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class,
                  newPathParameter(entry.path)));
            item.add(new BookmarkablePageLink<Void>("view", BlobPage.class,
                  newPathParameter(entry.path)));
            item.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false));
            item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,
                  newPathParameter(entry.path)));
            item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils
                  .newPathParameter(repositoryName, entry.commitId, entry.path))
                  .setEnabled(!entry.changeType.equals(ChangeType.ADD)
                        && !entry.changeType.equals(ChangeType.DELETE)));
            item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
                  .newPathParameter(repositoryName, entry.commitId, entry.path)));
            item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
                  .newPathParameter(repositoryName, entry.commitId, entry.path))
                  .setEnabled(!entry.changeType.equals(ChangeType.ADD)));
            item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
                  .newPathParameter(repositoryName, entry.commitId, entry.path))
                  .setEnabled(!entry.changeType.equals(ChangeType.ADD)));
            WicketUtils.setAlternatingBackground(item, counter);
            counter++;