Reverse line links in blob view (issue-309)

James Moger

2013-09-19 4f0f65fed0613cd69eba1cb8a80d0d18d0a79983

 src/main/java/com/gitblit/wicket/pages/CommitDiffPage.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;
@@ -29,18 +30,24 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;

import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.models.GitNote;
import com.gitblit.models.SubmoduleModel;
import com.gitblit.utils.DiffUtils;
import com.gitblit.utils.DiffUtils.DiffOutputType;
import com.gitblit.utils.JGitUtils;
import com.gitblit.wicket.CacheControl;
import com.gitblit.wicket.CacheControl.LastModified;
import com.gitblit.wicket.WicketUtils;
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;

@CacheControl(LastModified.BOOT)
public class CommitDiffPage extends RepositoryPage {

   public CommitDiffPage(PageParameters params) {
@@ -48,12 +55,9 @@

      Repository r = getRepository();

      DiffOutputType diffType = DiffOutputType.forName(GitBlit.getString(Keys.web.diffStyle,
            DiffOutputType.GITBLIT.name()));

      RevCommit commit = getCommit();

      String diff = DiffUtils.getCommitDiff(r, commit, diffType);
      String diff = DiffUtils.getCommitDiff(r, commit, DiffOutputType.HTML);

      List<String> parents = new ArrayList<String>();
      if (commit.getParentCount() > 0) {
@@ -76,6 +80,28 @@

      add(new CommitHeaderPanel("commitHeader", repositoryName, commit));

      addFullText("fullMessage", commit.getFullMessage());

      // git notes
      List<GitNote> notes = JGitUtils.getNotesOnCommit(r, commit);
      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(), getTimeUtils()));
            item.add(new Label("noteContent", GitBlit.self().processPlainCommitMessage(repositoryName,
                  entry.content)).setEscapeModelStrings(false));
         }
      };
      add(notesView.setVisible(notes.size() > 0));
		
      // changed paths list
      List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, commit);