Improve relative path determination using Java 7 Paths

James Moger

2014-10-10 a74ddc24545ec45d0bb82ca2bb8f628ffdaa9da3

 src/main/java/com/gitblit/wicket/pages/CommitPage.java

@@ -32,10 +32,10 @@
import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.Constants;

import com.gitblit.GitBlit;

import com.gitblit.models.GitNote;

import com.gitblit.models.PathModel.PathChangeModel;

import com.gitblit.models.SubmoduleModel;

import com.gitblit.servlet.RawServlet;

import com.gitblit.utils.JGitUtils;

import com.gitblit.wicket.CacheControl;

import com.gitblit.wicket.CacheControl.LastModified;

@@ -136,7 +136,7 @@
            item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));

            item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef

                  .getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));

            item.add(new Label("noteContent", GitBlit.self().processPlainCommitMessage(repositoryName,

            item.add(new Label("noteContent", bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName,

                  entry.content)).setEscapeModelStrings(false));

         }

      };

@@ -199,8 +199,11 @@
                           .newPathParameter(repositoryName, entry.commitId, path)));

            }





            // quick links

            if (entry.isSubmodule()) {

               item.add(new ExternalLink("raw", "").setEnabled(false));



               // submodule

               item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils

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

@@ -219,6 +222,9 @@
                           && !entry.changeType.equals(ChangeType.DELETE)));

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

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

                     .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));

               String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, entry.commitId, entry.path);

               item.add(new ExternalLink("raw", rawUrl)

                     .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));

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

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

@@ -242,6 +248,11 @@
   }



   @Override

   protected boolean isCommitPage() {

      return true;

   }



   @Override

   protected Class<? extends BasePage> getRepoNavPageClass() {

      return LogPage.class;

   }