Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

 src/main/java/com/gitblit/wicket/panels/RefsPanel.java

@@ -25,7 +25,6 @@
import org.apache.wicket.Component;

import org.apache.wicket.markup.html.WebPage;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.panel.Panel;

import org.apache.wicket.markup.repeater.Item;

import org.apache.wicket.markup.repeater.data.DataView;

import org.apache.wicket.markup.repeater.data.ListDataProvider;

@@ -34,13 +33,15 @@


import com.gitblit.Constants;

import com.gitblit.models.RefModel;

import com.gitblit.models.RepositoryModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.CommitPage;

import com.gitblit.wicket.pages.LogPage;

import com.gitblit.wicket.pages.TagPage;

import com.gitblit.wicket.pages.TicketsPage;



public class RefsPanel extends Panel {

public class RefsPanel extends BasePanel {



   private static final long serialVersionUID = 1L;



@@ -88,6 +89,8 @@
         }

      }

      final boolean shouldBreak = remoteCount < refs.size();

      RepositoryModel repository = app().repositories().getRepositoryModel(repositoryName);

      final boolean hasTickets = app().tickets().hasTickets(repository);



      ListDataProvider<RefModel> refsDp = new ListDataProvider<RefModel>(refs);

      DataView<RefModel> refsView = new DataView<RefModel>("ref", refsDp) {

@@ -103,7 +106,13 @@
            Class<? extends WebPage> linkClass = CommitPage.class;

            String cssClass = "";

            String tooltip = "";

            if (name.startsWith(Constants.R_HEADS)) {

            if (name.startsWith(Constants.R_TICKET)) {

               // Gitblit ticket ref

               objectid = name.substring(Constants.R_TICKET.length());

               name = name.substring(Constants.R_HEADS.length());

               linkClass = TicketsPage.class;

               cssClass = "localBranch";

            } else if (name.startsWith(Constants.R_HEADS)) {

               // local branch

               linkClass = LogPage.class;

               name = name.substring(Constants.R_HEADS.length());

@@ -113,20 +122,32 @@
               linkClass = LogPage.class;

               cssClass = "headRef";

            } else if (name.startsWith(Constants.R_CHANGES)) {

               // Gerrit change ref

               // Gitblit change ref

               name = name.substring(Constants.R_CHANGES.length());

               // strip leading nn/ from nn/#####nn/ps = #####nn-ps

               name = name.substring(name.indexOf('/') + 1).replace('/', '-');

               String [] values = name.split("-");

               // Gerrit change

               tooltip = MessageFormat.format(getString("gb.reviewPatchset"), values[0], values[1]);

               cssClass = "otherRef";

            } else if (name.startsWith(Constants.R_TICKETS_PATCHSETS)) {

               // Gitblit patchset ref

               name = name.substring(Constants.R_TICKETS_PATCHSETS.length());

               // strip leading nn/ from nn/#####nn/ps = #####nn-ps

               name = name.substring(name.indexOf('/') + 1).replace('/', '-');

               String [] values = name.split("-");

               tooltip = MessageFormat.format(getString("gb.ticketPatchset"), values[0], values[1]);

               linkClass = LogPage.class;

               cssClass = "otherRef";

            } else if (name.startsWith(Constants.R_PULL)) {

               // Pull Request ref

               name = "pull #" + name.substring(Constants.R_PULL.length());

               if (name.endsWith("/head")) {

               String num = name.substring(Constants.R_PULL.length());

               if (num.endsWith("/head")) {

                  // strip pull request head from name

                  name = name.substring(0, name.length() - "/head".length());

                  num = num.substring(0, num.length() - "/head".length());

               }

               name = "pr #" + num;

               tooltip = "pull request #" + num;

               cssClass = "pullRef";

            } else if (name.startsWith(Constants.R_REMOTES)) {

               // remote branch

@@ -152,11 +173,11 @@
               // codereview refs

               linkClass = CommitPage.class;

               cssClass = "otherRef";

            } else if (name.startsWith(com.gitblit.Constants.R_GITBLIT)) {

               // gitblit refs

            } else if (name.startsWith(com.gitblit.Constants.R_META)) {

               // internal meta refs

               linkClass = LogPage.class;

               cssClass = "otherRef";

               name = name.substring(com.gitblit.Constants.R_GITBLIT.length());

               name = name.substring(com.gitblit.Constants.R_META.length());

            }



            Component c = new LinkPanel("refName", null, name, linkClass,