Preserve key index when re-adding an existing key

James Moger

2014-03-27 ab07d0d86d8b64b4f7c88b45bc81f1eec22105db

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

@@ -87,7 +87,7 @@
      // set stateless page preference

      setStatelessHint(true);



      any = new TicketResponsible("any", "[* TO *]", null);

      any = new TicketResponsible(getString("gb.any"), "[* TO *]", null);



      UserModel user = GitBlitWebSession.get().getUser();

      boolean isAuthenticated = user != null && user.isAuthenticated;

@@ -185,16 +185,16 @@
         milestonePanel.add(label);



         milestonePanel.add(new LinkPanel("openTickets", null,

               currentMilestone.getOpenTickets() + " open",

               MessageFormat.format(getString("gb.nOpenTickets"), currentMilestone.getOpenTickets()),

               TicketsPage.class,

               queryParameters(null, currentMilestone.name, openStatii, null, sortBy, desc, 1)));



         milestonePanel.add(new LinkPanel("closedTickets", null,

               currentMilestone.getClosedTickets() + " closed",

               MessageFormat.format(getString("gb.nClosedTickets"), currentMilestone.getClosedTickets()),

               TicketsPage.class,

               queryParameters(null, currentMilestone.name, closedStatii, null, sortBy, desc, 1)));



         milestonePanel.add(new Label("totalTickets", currentMilestone.getTotalTickets() + " total"));

         milestonePanel.add(new Label("totalTickets", MessageFormat.format(getString("gb.nTotalTickets"), currentMilestone.getTotalTickets())));

         add(milestonePanel);

      }



@@ -397,7 +397,8 @@
      add(new BookmarkablePageLink<Void>("allTickets", TicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, 1)));



      // by status

      List<Status> statii = Arrays.asList(Status.values());

      List<Status> statii = new ArrayList<Status>(Arrays.asList(Status.values()));

      statii.remove(Status.Closed);

      ListDataProvider<Status> resolutionsDp = new ListDataProvider<Status>(statii);

      DataView<Status> statiiLinks = new DataView<Status>("statii", resolutionsDp) {

         private static final long serialVersionUID = 1L;

@@ -529,7 +530,7 @@


               @Override

               public void populateItem(final Item<String> labelItem) {

                  String content = messageProcessor().processPlainCommitMessage(getRepository(), repositoryName, labelItem.getModelObject());

                  String content = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, labelItem.getModelObject());

                  Label label = new Label("label", content);

                  label.setEscapeModelStrings(false);

                  TicketLabel tLabel = app().tickets().getLabel(getRepositoryModel(), labelItem.getModelObject());