Fix linefeed problem for Prettify (issue 130)

James Moger

2012-09-17 5c6afb3a068c21d990187c6b199e7bd3c876745d

 src/com/gitblit/wicket/pages/TreePage.java

@@ -26,19 +26,20 @@
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.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.LinkPanel;

import com.gitblit.wicket.RepositoryPage;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.models.PathModel;

import com.gitblit.wicket.panels.CommitHeaderPanel;

import com.gitblit.wicket.panels.LinkPanel;

import com.gitblit.wicket.panels.PathBreadcrumbsPanel;



public class TreePage extends RepositoryPage {

@@ -53,25 +54,38 @@
      List<PathModel> paths = JGitUtils.getFilesInPath(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 ExternalLink("zipLink", DownloadZipServlet.asLink(getRequest().getRelativePathPrefixToContextRoot(), repositoryName, objectId, path)).setVisible(GitBlit.self().settings().getBoolean(Keys.web.allowZipDownloads, true)));

      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 ExternalLink("zipLink", DownloadZipServlet.asLink(getRequest()

            .getRelativePathPrefixToContextRoot(), repositoryName, objectId, path))

            .setVisible(GitBlit.getBoolean(Keys.web.allowZipDownloads, true)));



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



      // breadcrumbs

      add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));

      if (path != null && path.trim().length() > 0) {

         paths.add(0, PathModel.getParentPath(path, objectId));

         // add .. parent path entry

         String parentPath = null;

         if (path.lastIndexOf('/') > -1) {

            parentPath = path.substring(0, path.lastIndexOf('/'));

         }

         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);

      DataView<PathModel> pathsView = new DataView<PathModel>("changedPath", pathsDp) {

         private static final long serialVersionUID = 1L;

         int counter = 0;

         int counter;



         public void populateItem(final Item<PathModel> item) {

            PathModel entry = item.getModelObject();

@@ -80,33 +94,80 @@
               // parent .. path

               item.add(WicketUtils.newBlankImage("pathIcon"));

               item.add(new Label("pathSize", ""));

               item.add(new LinkPanel("pathName", null, entry.name, TreePage.class, newPathParameter(entry.path)));

               item.add(new LinkPanel("pathName", null, entry.name, TreePage.class,

                     WicketUtils

                           .newPathParameter(repositoryName, entry.commitId, entry.path)));

               item.add(new Label("pathLinks", ""));

            } else {

               if (entry.isTree()) {

                  // folder/tree link

                  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)));

                  item.add(new LinkPanel("pathName", "list", entry.name, TreePage.class,

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                              entry.path)));



                  // links

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

                  links.add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, 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.self().settings().getBoolean(Keys.web.allowZipDownloads, true)));

                  links.add(new BookmarkablePageLink<Void>("tree", TreePage.class,

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                              entry.path)));

                  links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                              entry.path)));

                  links.add(new ExternalLink("zip", DownloadZipServlet.asLink(baseUrl,

                        repositoryName, objectId, entry.path)).setVisible(GitBlit

                        .getBoolean(Keys.web.allowZipDownloads, true)));

                  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 ExternalLink("zip", DownloadZipServlet.asLink(baseUrl,

                        submodulePath, submoduleId, "")).setVisible(GitBlit

                        .getBoolean(Keys.web.allowZipDownloads, true)).setEnabled(hasSubmodule));

                  item.add(links);						
               } else {

                  // blob link

                  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", entry.name, BlobPage.class,

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                              entry.path)));



                  // links

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

                  links.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.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));

                  links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));

                  links.add(new BookmarkablePageLink<Void>("view", BlobPage.class,

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                              entry.path)));

                  links.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils

                        .newPathParameter(repositoryName, entry.commitId, entry.path)));

                  links.add(new BookmarkablePageLink<Void>("blame", BlamePage.class,

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                              entry.path)));

                  links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                              entry.path)));

                  item.add(links);

               }

            }