James Moger
2013-01-05 9e186eedf1a09ca7ac4fbdea32b00e7e5331f7eb
src/com/gitblit/wicket/pages/TreePage.java
@@ -20,7 +20,6 @@
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;
@@ -30,14 +29,13 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.DownloadZipServlet;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.PathModel;
import com.gitblit.models.SubmoduleModel;
import com.gitblit.utils.ByteFormat;
import com.gitblit.utils.JGitUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.CommitHeaderPanel;
import com.gitblit.wicket.panels.CompressedDownloadsPanel;
import com.gitblit.wicket.panels.LinkPanel;
import com.gitblit.wicket.panels.PathBreadcrumbsPanel;
@@ -57,9 +55,8 @@
            WicketUtils.newPathParameter(repositoryName, objectId, path)));
      add(new BookmarkablePageLink<Void>("headLink", TreePage.class,
            WicketUtils.newPathParameter(repositoryName, Constants.HEAD, path)));
      add(new ExternalLink("zipLink", DownloadZipServlet.asLink(getRequest()
            .getRelativePathPrefixToContextRoot(), repositoryName, objectId, path))
            .setVisible(GitBlit.getBoolean(Keys.web.allowZipDownloads, true)));
      add(new CompressedDownloadsPanel("compressedLinks", getRequest()
            .getRelativePathPrefixToContextRoot(), repositoryName, objectId, path));
      add(new CommitHeaderPanel("commitHeader", repositoryName, commit));
@@ -71,12 +68,14 @@
         if (path.lastIndexOf('/') > -1) {
            parentPath = path.substring(0, path.lastIndexOf('/'));
         }
         PathModel model = new PathModel("..", parentPath, 0, FileMode.TREE.getBits(), objectId);
         PathModel model = new PathModel("..", parentPath, 0, FileMode.TREE.getBits(), null, objectId);
         model.isParentPath = true;
         paths.add(0, model);
      }
      final ByteFormat byteFormat = new ByteFormat();
      final String baseUrl = WicketUtils.getGitblitURL(getRequest());
      // changed paths list
      ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);
@@ -92,7 +91,8 @@
               item.add(WicketUtils.newBlankImage("pathIcon"));
               item.add(new Label("pathSize", ""));
               item.add(new LinkPanel("pathName", null, entry.name, TreePage.class,
                     newPathParameter(entry.path)));
                     WicketUtils
                           .newPathParameter(repositoryName, entry.commitId, entry.path)));
               item.add(new Label("pathLinks", ""));
            } else {
               if (entry.isTree()) {
@@ -100,7 +100,8 @@
                  item.add(WicketUtils.newImage("pathIcon", "folder_16x16.png"));
                  item.add(new Label("pathSize", ""));
                  item.add(new LinkPanel("pathName", "list", entry.name, TreePage.class,
                        newPathParameter(entry.path)));
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                              entry.path)));
                  // links
                  Fragment links = new Fragment("pathLinks", "treeLinks", this);
@@ -109,31 +110,65 @@
                              entry.path)));
                  links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                              entry.path)));
                  links.add(new ExternalLink("zip", DownloadZipServlet.asLink(getRequest()
                        .getRelativePathPrefixToContextRoot(), repositoryName, objectId,
                        entry.path)).setVisible(GitBlit.getBoolean(
                        Keys.web.allowZipDownloads, true)));
                              entry.path)));
                  links.add(new CompressedDownloadsPanel("compressedLinks", baseUrl,
                        repositoryName, objectId, entry.path));
                  item.add(links);
               } else if (entry.isSubmodule()) {
                  // submodule
                  String submoduleId = entry.objectId;
                  String submodulePath;
                  boolean hasSubmodule = false;
                  SubmoduleModel submodule = getSubmodule(entry.path);
                  submodulePath = submodule.gitblitPath;
                  hasSubmodule = submodule.hasSubmodule;
                  item.add(WicketUtils.newImage("pathIcon", "git-orange-16x16.png"));
                  item.add(new Label("pathSize", ""));
                  item.add(new LinkPanel("pathName", "list", entry.name + " @ " +
                        getShortObjectId(submoduleId), TreePage.class,
                        WicketUtils.newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule));
                  Fragment links = new Fragment("pathLinks", "submoduleLinks", this);
                  links.add(new BookmarkablePageLink<Void>("view", SummaryPage.class,
                        WicketUtils.newRepositoryParameter(submodulePath)).setEnabled(hasSubmodule));
                  links.add(new BookmarkablePageLink<Void>("tree", TreePage.class,
                        WicketUtils.newPathParameter(submodulePath, submoduleId,
                              "")).setEnabled(hasSubmodule));
                  links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,
                        WicketUtils.newPathParameter(submodulePath, submoduleId,
                              "")).setEnabled(hasSubmodule));
                  links.add(new CompressedDownloadsPanel("compressedLinks", baseUrl,
                        submodulePath, submoduleId, "").setEnabled(hasSubmodule));
                  item.add(links);
               } else {
                  // blob link
                  String displayPath = entry.name;
                  String path = entry.path;
                  if (entry.isSymlink()) {
                     path = JGitUtils.getStringContent(getRepository(), getCommit().getTree(), path);
                     displayPath = entry.name + " -> " + path;
                  }
                  item.add(WicketUtils.getFileImage("pathIcon", entry.name));
                  item.add(new Label("pathSize", byteFormat.format(entry.size)));
                  item.add(new LinkPanel("pathName", "list", entry.name, BlobPage.class,
                        newPathParameter(entry.path)));
                  item.add(new LinkPanel("pathName", "list", displayPath, BlobPage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                              path)));
                  // links
                  Fragment links = new Fragment("pathLinks", "blobLinks", this);
                  links.add(new BookmarkablePageLink<Void>("view", BlobPage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                              entry.path)));
                              path)));
                  links.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils
                        .newPathParameter(repositoryName, entry.commitId, entry.path)));
                  links.add(new BookmarkablePageLink<Void>("blame", BlobPage.class)
                        .setEnabled(false));
                        .newPathParameter(repositoryName, entry.commitId, path)));
                  links.add(new BookmarkablePageLink<Void>("blame", BlamePage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                              path)));
                  links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,
                        WicketUtils.newPathParameter(repositoryName, entry.commitId,
                              entry.path)));
                              path)));
                  item.add(links);
               }
            }