James Moger
2015-11-19 e41e8f8c3bc9f5edab1d271464364f95620ece8c
src/main/java/com/gitblit/wicket/pages/TreePage.java
@@ -20,17 +20,18 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.ExternalLink;
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;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.models.PathModel;
import com.gitblit.models.SubmoduleModel;
import com.gitblit.servlet.RawServlet;
import com.gitblit.utils.ByteFormat;
import com.gitblit.utils.JGitUtils;
import com.gitblit.wicket.CacheControl;
@@ -51,13 +52,11 @@
      Repository r = getRepository();
      RevCommit commit = getCommit();
      List<PathModel> paths = JGitUtils.getFilesInPath(r, path, commit);
      List<PathModel> paths = JGitUtils.getFilesInPath2(r, path, commit);
      // tree page links
      add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,
            WicketUtils.newPathParameter(repositoryName, objectId, path)));
      add(new BookmarkablePageLink<Void>("headLink", TreePage.class,
            WicketUtils.newPathParameter(repositoryName, Constants.HEAD, path)));
      add(new CompressedDownloadsPanel("compressedLinks", getRequest()
            .getRelativePathPrefixToContextRoot(), repositoryName, objectId, path));
@@ -76,8 +75,8 @@
         paths.add(0, model);
      }
      final String id = getBestCommitId(commit);
      final ByteFormat byteFormat = new ByteFormat();
      final String baseUrl = WicketUtils.getGitblitURL(getRequest());
      // changed paths list
@@ -96,7 +95,7 @@
               item.add(new Label("pathSize", ""));
               item.add(new LinkPanel("pathName", null, entry.name, TreePage.class,
                     WicketUtils
                           .newPathParameter(repositoryName, entry.commitId, entry.path)));
                           .newPathParameter(repositoryName, id, entry.path)));
               item.add(new Label("pathLinks", ""));
            } else {
               if (entry.isTree()) {
@@ -104,16 +103,16 @@
                  item.add(WicketUtils.newImage("pathIcon", "folder_16x16.png"));
                  item.add(new Label("pathSize", ""));
                  item.add(new LinkPanel("pathName", "list", entry.name, TreePage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                        WicketUtils.newPathParameter(repositoryName, id,
                              entry.path)));
                  // links
                  Fragment links = new Fragment("pathLinks", "treeLinks", this);
                  links.add(new BookmarkablePageLink<Void>("tree", TreePage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                        WicketUtils.newPathParameter(repositoryName, id,
                              entry.path)));
                  links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                        WicketUtils.newPathParameter(repositoryName, id,
                              entry.path)));
                  links.add(new CompressedDownloadsPanel("compressedLinks", baseUrl,
                        repositoryName, objectId, entry.path));
@@ -141,7 +140,7 @@
                        WicketUtils.newPathParameter(submodulePath, submoduleId,
                              "")).setEnabled(hasSubmodule));
                  links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                        WicketUtils.newPathParameter(repositoryName, id,
                              entry.path)));
                  links.add(new CompressedDownloadsPanel("compressedLinks", baseUrl,
                        submodulePath, submoduleId, "").setEnabled(hasSubmodule));
@@ -157,21 +156,21 @@
                  item.add(WicketUtils.getFileImage("pathIcon", entry.name));
                  item.add(new Label("pathSize", byteFormat.format(entry.size)));
                  item.add(new LinkPanel("pathName", "list", displayPath, BlobPage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                        WicketUtils.newPathParameter(repositoryName, id,
                              path)));
                  // links
                  Fragment links = new Fragment("pathLinks", "blobLinks", this);
                  links.add(new BookmarkablePageLink<Void>("view", BlobPage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                        WicketUtils.newPathParameter(repositoryName, id,
                              path)));
                  links.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils
                        .newPathParameter(repositoryName, entry.commitId, path)));
                  String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, id, path);
                  links.add(new ExternalLink("raw", rawUrl));
                  links.add(new BookmarkablePageLink<Void>("blame", BlamePage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                        WicketUtils.newPathParameter(repositoryName, id,
                              path)));
                  links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                        WicketUtils.newPathParameter(repositoryName, id,
                              path)));
                  item.add(links);
               }
@@ -187,4 +186,10 @@
   protected String getPageName() {
      return getString("gb.tree");
   }
   @Override
   protected boolean isCommitPage() {
      return true;
   }
}