Finished history tree/blob links.

James Moger

2011-04-17 e299e1e9071d02ceefa2b5154f0fd1af5cbe115e

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

@@ -6,6 +6,7 @@


import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

import org.apache.wicket.markup.html.panel.Fragment;

import org.apache.wicket.markup.repeater.Item;

import org.apache.wicket.markup.repeater.data.DataView;

import org.apache.wicket.markup.repeater.data.ListDataProvider;

@@ -20,11 +21,14 @@
import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.LinkPanel;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.models.PathModel;

import com.gitblit.wicket.pages.BlobDiffPage;

import com.gitblit.wicket.pages.BlobPage;

import com.gitblit.wicket.pages.CommitDiffPage;

import com.gitblit.wicket.pages.CommitPage;

import com.gitblit.wicket.pages.HistoryPage;

import com.gitblit.wicket.pages.LogPage;

import com.gitblit.wicket.pages.TreePage;



public class HistoryPanel extends BasePanel {



@@ -41,6 +45,17 @@
      }

      

      RevCommit commit = JGitUtils.getCommit(r, objectId);      

      List<PathModel> paths = JGitUtils.getFilesInCommit(r, commit);



      PathModel matchingPath = null;

      for (PathModel p : paths) {

         if (p.path.equals(path)) {

            matchingPath = p;

            break;

         }

      }

      final boolean isTree = matchingPath == null ? true : matchingPath.isTree();



      final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);

      List<RevCommit> commits;

      if (pageResults) {

@@ -93,10 +108,18 @@


            item.add(new RefsPanel("commitRefs", repositoryName, entry, allRefs));



            // TODO links for folder

            item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

            item.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

            item.add(new BookmarkablePageLink<Void>("difftocurrent", BlobDiffPage.class, WicketUtils.newBlobDiffParameter(repositoryName, entry.getName(), objectId, path)).setEnabled(counter > 0));

            if (isTree) {

               Fragment links = new Fragment("historyLinks", "treeLinks", this);

               links.add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

               links.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

               item.add(links);

            } else {

               Fragment links = new Fragment("historyLinks", "blobLinks", this);

               links.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils.newPathParameter(repositoryName, entry.getName(), path)));

               links.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

               links.add(new BookmarkablePageLink<Void>("difftocurrent", BlobDiffPage.class, WicketUtils.newBlobDiffParameter(repositoryName, entry.getName(), objectId, path)).setEnabled(counter > 0));

               item.add(links);

            }



            WicketUtils.setAlternatingBackground(item, counter);

            counter++;