Extract authorization/access selection panel to re-usable class

James Moger

2014-05-29 2c50880dbd5de292e37d2533fccfcb62f6be9f95

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

@@ -31,6 +31,7 @@
import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.models.PathModel;

import com.gitblit.servlet.RawServlet;

import com.gitblit.utils.ByteFormat;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

@@ -59,8 +60,9 @@
      List<MarkupDocument> roots = processor.getRootDocs(r, repositoryName, commitId);

      Fragment fragment = null;

      if (roots.isEmpty()) {

         // no identified root documents just show the standard document list

         // no identified root documents

         fragment = new Fragment("docs", "noIndexFragment", this);

         setResponsePage(NoDocsPage.class, params);

      } else {

         // root documents, use tabbed ui of index/root and document list

         fragment = new Fragment("docs", "tabsFragment", this);

@@ -102,8 +104,8 @@
                     WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath)));

               item.add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,

                     WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath)));

               item.add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(

                     repositoryName, commitId, doc.documentPath)));

               String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, commitId, doc.documentPath);

               item.add(new ExternalLink("rawLink", rawUrl));



               // document content

               String file = StringUtils.getLastPathElement(doc.documentPath);

@@ -138,14 +140,14 @@
            PathModel entry = item.getModelObject();

            item.add(WicketUtils.newImage("docIcon", "file_world_16x16.png"));

            item.add(new Label("docSize", byteFormat.format(entry.size)));

            item.add(new LinkPanel("docName", "list", entry.name, DocPage.class, WicketUtils

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

            item.add(new LinkPanel("docName", "list", StringUtils.stripFileExtension(entry.name),

                  DocPage.class, WicketUtils.newPathParameter(repositoryName, id, entry.path)));



            // links

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

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

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

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

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

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

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

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

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