Fix linefeed problem for Prettify (issue 130)

James Moger

2012-09-17 5c6afb3a068c21d990187c6b199e7bd3c876745d

 src/com/gitblit/wicket/pages/EditRepositoryPage.java

@@ -16,15 +16,14 @@
package com.gitblit.wicket.pages;



import java.text.MessageFormat;

import java.util.AbstractMap;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.HashSet;

import java.util.Iterator;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Map;

import java.util.Map.Entry;

import java.util.Set;



import org.apache.wicket.PageParameters;

@@ -37,9 +36,10 @@
import org.apache.wicket.markup.html.form.DropDownChoice;

import org.apache.wicket.markup.html.form.Form;

import org.apache.wicket.markup.html.form.IChoiceRenderer;

import org.apache.wicket.markup.html.form.Radio;

import org.apache.wicket.markup.html.form.RadioGroup;

import org.apache.wicket.markup.html.form.TextField;

import org.apache.wicket.markup.html.list.ListItem;

import org.apache.wicket.markup.html.list.ListItemModel;

import org.apache.wicket.markup.html.list.ListView;

import org.apache.wicket.model.CompoundPropertyModel;

import org.apache.wicket.model.IModel;

@@ -49,6 +49,7 @@


import com.gitblit.Constants;

import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Constants.FederationStrategy;

import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

@@ -74,7 +75,12 @@
      // create constructor

      super();

      isCreate = true;

      setupPage(new RepositoryModel());

      RepositoryModel model = new RepositoryModel();

      String restriction = GitBlit.getString(Keys.git.defaultAccessRestriction, null);

      model.accessRestriction = AccessRestrictionType.fromName(restriction);

      String authorization = GitBlit.getString(Keys.git.defaultAuthorizationControl, null);

      model.authorizationControl = AuthorizationControl.fromName(authorization);

      setupPage(model);

   }



   public EditRepositoryPage(PageParameters params) {

@@ -157,22 +163,24 @@
                  .self().getPostReceiveScriptsUnused(repositoryModel)),

            new StringChoiceRenderer(), 12, true);

      

      // Dynamic Custom Defined Properties Properties

      final List<Entry<String, String>> definedProperties = new ArrayList<Entry<String, String>>();

      List<String> customFields = GitBlit.getStrings(Keys.repository.customFields);

      for (String customFieldDef : customFields) {

         String[] customFieldProperty = customFieldDef.split("=");

         definedProperties.add(new AbstractMap.SimpleEntry<String, String>(customFieldProperty[0], customFieldProperty[1]));

      }

		
      final ListView<Entry<String, String>> customFieldsListView = new ListView<Entry<String, String>>("customFieldsListView", definedProperties) {

      // custom fields

      final Map<String, String> customFieldsMap = GitBlit.getMap(Keys.groovy.customFields);

      List<String> customKeys = new ArrayList<String>(customFieldsMap.keySet());

      final ListView<String> customFieldsListView = new ListView<String>("customFieldsListView", customKeys) {

			
         private static final long serialVersionUID = 1L;



         @Override

         protected void populateItem(ListItem<Entry<String, String>> item) {

            String value = repositoryModel.customFields.get(item.getModelObject().getKey());

         protected void populateItem(ListItem<String> item) {

            String key = item.getModelObject();

            item.add(new Label("customFieldLabel", customFieldsMap.get(key)));

            

            item.add(new Label(item.getModelObject().getKey(), item.getModelObject().getValue()));      // Used to get the key later

            item.add(new Label("customFieldLabel", item.getModelObject().getValue()));

            item.add(new TextField<String>("customFieldValue", new Model<String>(value)));

            String value = "";

            if (repositoryModel.customFields != null && repositoryModel.customFields.containsKey(key)) {

               value = repositoryModel.customFields.get(key);

            }

            TextField<String> field = new TextField<String>("customFieldValue", new Model<String>(value));

            item.add(field);

         }

      };

      customFieldsListView.setReuseItems(true);

@@ -209,6 +217,9 @@
               if (repositoryModel.name.contains("/../")) {

                  error(getString("gb.illegalRelativeSlash"));

                  return;

               }					
               if (repositoryModel.name.endsWith("/")) {

                  repositoryModel.name = repositoryModel.name.substring(0, repositoryModel.name.length() - 1);

               }



               // confirm valid characters in repository name

@@ -277,11 +288,14 @@
               }

               repositoryModel.postReceiveScripts = postReceiveScripts;

               

               // Loop over each of the user defined properties

               // custom fields

               repositoryModel.customFields = new LinkedHashMap<String, String>();

               for (int i = 0; i < customFieldsListView.size(); i++) {

                  ListItem<ListItemModel<String>> item = (ListItem<ListItemModel<String>>) customFieldsListView.get(i);

                  String key = item.get(0).getId();      // Item 0 is our 'fake' label

                  String value = ((TextField<String>)item.get(2)).getValue();      // Item 2 is out text box

                  ListItem<String> child = (ListItem<String>) customFieldsListView.get(i);

                  String key = child.getModelObject();



                  TextField<String> field = (TextField<String>) child.get("customFieldValue");

                  String value = field.getValue();

                  

                  repositoryModel.customFields.put(key, value);

               }

@@ -361,23 +375,27 @@
            : StringUtils.flattenStrings(repositoryModel.mailingLists, " "));

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

      form.add(indexedBranchesPalette);

		
      RadioGroup<AuthorizationControl> group = new RadioGroup<AuthorizationControl>("authorizationControl");

      Radio<AuthorizationControl> allowAuthenticated = new Radio<AuthorizationControl>("allowAuthenticated", new Model<AuthorizationControl>(AuthorizationControl.AUTHENTICATED));		
      Radio<AuthorizationControl> allowNamed = new Radio<AuthorizationControl>("allowNamed", new Model<AuthorizationControl>(AuthorizationControl.NAMED));

      group.add(allowAuthenticated);

      group.add(allowNamed);

      form.add(group);

				
      form.add(usersPalette);

      form.add(teamsPalette);

      form.add(federationSetsPalette);

      form.add(preReceivePalette);

      form.add(new BulletListPanel("inheritedPreReceive", "inherited", GitBlit.self()

      form.add(new BulletListPanel("inheritedPreReceive", getString("gb.inherited"), GitBlit.self()

            .getPreReceiveScriptsInherited(repositoryModel)));

      form.add(postReceivePalette);

      form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self()

      form.add(new BulletListPanel("inheritedPostReceive", getString("gb.inherited"), GitBlit.self()

            .getPostReceiveScriptsInherited(repositoryModel)));

      

      WebMarkupContainer customFiledsSection = new WebMarkupContainer("customFiledsSection") {

         public boolean isVisible() {

            return GitBlit.getString(Keys.repository.customFields, "").isEmpty() == false;

         };

      };

      customFiledsSection.add(customFieldsListView);

      form.add(customFiledsSection);

      WebMarkupContainer customFieldsSection = new WebMarkupContainer("customFieldsSection");

      customFieldsSection.add(customFieldsListView);

      form.add(customFieldsSection.setVisible(!GitBlit.getString(Keys.groovy.customFields, "").isEmpty()));



      form.add(new Button("save"));

      Button cancel = new Button("cancel") {

@@ -412,13 +430,13 @@
         if (authenticateAdmin) {

            if (user == null) {

               // No Login Available

               error("Administration requires a login", true);

               error(getString("gb.errorAdminLoginRequired"), true);

            }

            if (isCreate) {

               // Create Repository

               if (!user.canAdmin) {

                  // Only Administrators May Create

                  error("Only an administrator may create a repository", true);

                  error(getString("gb.errorOnlyAdminMayCreateRepository"), true);

               }

            } else {

               // Edit Repository

@@ -429,14 +447,14 @@
               } else {

                  if (!model.owner.equalsIgnoreCase(user.username)) {

                     // User is not an Admin nor Owner

                     error("Only an administrator or the owner may edit a repository", true);

                     error(getString("gb.errorOnlyAdminOrOwnerMayEditRepository"), true);

                  }

               }

            }

         }

      } else {

         // No Administration Permitted

         error("Administration is disabled", true);

         error(getString("gb.errorAdministrationDisabled"), true);

      }

   }