James Moger
2011-09-29 fd6ac68c0b1136182b5d713ec88ea94e26c4a76d
src/com/gitblit/wicket/pages/CommitDiffPage.java
@@ -24,19 +24,20 @@
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.utils.DiffUtils;
import com.gitblit.utils.DiffUtils.DiffOutputType;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.JGitUtils.DiffOutputType;
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.LinkPanel;
public class CommitDiffPage extends RepositoryPage {
@@ -47,7 +48,7 @@
      RevCommit commit = getCommit();
      DiffOutputType diffType = DiffOutputType.forName(GitBlit.getString(Keys.web.diffStyle,
            DiffOutputType.GITBLIT.name()));
      String diff = JGitUtils.getCommitDiff(r, commit, diffType);
      String diff = DiffUtils.getCommitDiff(r, commit, diffType);
      List<String> parents = new ArrayList<String>();
      if (commit.getParentCount() > 0) {
@@ -87,19 +88,23 @@
            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>("patch", PatchPage.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>("patch", PatchPage.class, WicketUtils
                  .newPathParameter(repositoryName, entry.commitId, entry.path)));
            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)));
            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++;