Improve relative path determination using Java 7 Paths

James Moger

2014-10-10 a74ddc24545ec45d0bb82ca2bb8f628ffdaa9da3

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

@@ -19,6 +19,8 @@
import java.util.Arrays;

import java.util.Collections;

import java.util.List;

import java.util.Set;

import java.util.TreeSet;



import org.apache.wicket.PageParameters;

import org.apache.wicket.ajax.AjaxRequestTarget;

@@ -35,6 +37,7 @@


import com.gitblit.Constants;

import com.gitblit.Constants.AccessPermission;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.TicketModel;

import com.gitblit.models.TicketModel.Change;

@@ -46,8 +49,6 @@
import com.gitblit.tickets.TicketResponsible;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.SafeTextModel;

import com.gitblit.wicket.SafeTextModel.Mode;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.MarkdownTextArea;



@@ -89,8 +90,8 @@
      }



      typeModel = Model.of(TicketModel.Type.defaultType);

      titleModel = SafeTextModel.none();

      topicModel = SafeTextModel.none();

      titleModel = Model.of();

      topicModel = Model.of();

      mergeToModel = Model.of(Repository.shortenRefName(getRepositoryModel().mergeTo));

      responsibleModel = Model.of();

      milestoneModel = Model.of();

@@ -105,7 +106,7 @@
      form.add(new TextField<String>("title", titleModel));

      form.add(new TextField<String>("topic", topicModel));



      final SafeTextModel markdownPreviewModel = new SafeTextModel(Mode.none);

      final IModel<String> markdownPreviewModel = Model.of();

      descriptionPreview = new Label("descriptionPreview", markdownPreviewModel);

      descriptionPreview.setEscapeModelStrings(false);

      descriptionPreview.setOutputMarkupId(true);

@@ -117,23 +118,27 @@


      if (currentUser.canAdmin(null, getRepositoryModel())) {

         // responsible

         List<TicketResponsible> responsibles = new ArrayList<TicketResponsible>();

         if (UserModel.ANONYMOUS.canPush(getRepositoryModel())) {

            // anonymous push allowed

            for (UserModel user : app().users().getAllUsers()) {

               if (!user.disabled) {

                  responsibles.add(new TicketResponsible(user));

         Set<String> userlist = new TreeSet<String>();



         if (UserModel.ANONYMOUS.canPush(getRepositoryModel())

               || AuthorizationControl.AUTHENTICATED == getRepositoryModel().authorizationControl) {

            //    authorization is ANONYMOUS or AUTHENTICATED (i.e. all users can be set responsible)

            userlist.addAll(app().users().getAllUsernames());

         } else {

            // authorization is by NAMED users (users with PUSH permission can be set responsible)

            for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {

               if (rp.permission.atLeast(AccessPermission.PUSH)) {

                  userlist.add(rp.registrant);

               }

            }

         } else {

            // authenticated push

            for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {

               if (rp.permission.atLeast(AccessPermission.PUSH) && !rp.isTeam()) {

                  UserModel user = app().users().getUserModel(rp.registrant);

                  if (user != null && !user.disabled) {

                     responsibles.add(new TicketResponsible(user));

                  }

               }

         }



         List<TicketResponsible> responsibles = new ArrayList<TicketResponsible>();

         for (String username : userlist) {

            UserModel user = app().users().getUserModel(username);

            if (user != null && !user.disabled) {

               TicketResponsible responsible = new TicketResponsible(user);

               responsibles.add(responsible);

            }

         }

         Collections.sort(responsibles);

@@ -217,7 +222,8 @@
            if (ticket != null) {

               TicketNotifier notifier = app().tickets().createNotifier();

               notifier.sendMailing(ticket);

               setResponsePage(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));



               redirectTo(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));

            } else {

               // TODO error

            }