Forgot to commit UserModel with cookie field

James Moger

2012-07-11 a31cf95ac0787eb559cb78f48c52bc6b79e970d8

 src/com/gitblit/client/EditRepositoryDialog.java

@@ -29,9 +29,12 @@
import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashSet;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Map;

import java.util.Set;



import javax.swing.BoxLayout;

import javax.swing.DefaultComboBoxModel;

import javax.swing.ImageIcon;

import javax.swing.JButton;

@@ -44,10 +47,12 @@
import javax.swing.JOptionPane;

import javax.swing.JPanel;

import javax.swing.JRootPane;

import javax.swing.JScrollPane;

import javax.swing.JTabbedPane;

import javax.swing.JTextField;

import javax.swing.KeyStroke;

import javax.swing.ListCellRenderer;

import javax.swing.ScrollPaneConstants;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.FederationStrategy;

@@ -117,6 +122,10 @@
   private JLabel postReceiveInherited;



   private Set<String> repositoryNames;

	
   private JPanel customFieldsPanel;

	
   private List<JTextField> customTextfields;



   public EditRepositoryDialog(int protocolVersion) {

      this(protocolVersion, new RepositoryModel());

@@ -277,6 +286,12 @@
      JPanel postReceivePanel = new JPanel(new BorderLayout(5, 5));

      postReceivePanel.add(postReceivePalette, BorderLayout.CENTER);

      postReceivePanel.add(postReceiveInherited, BorderLayout.WEST);

		
      customFieldsPanel = new JPanel();

      customFieldsPanel.setLayout(new BoxLayout(customFieldsPanel, BoxLayout.Y_AXIS));

      JScrollPane customFieldsScrollPane = new JScrollPane(customFieldsPanel);

      customFieldsScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);

      customFieldsScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);



      JTabbedPane panel = new JTabbedPane(JTabbedPane.TOP);

      panel.addTab(Translation.get("gb.general"), fieldsPanel);

@@ -290,6 +305,9 @@
      }

      panel.addTab(Translation.get("gb.preReceiveScripts"), preReceivePanel);

      panel.addTab(Translation.get("gb.postReceiveScripts"), postReceivePanel);

		
      panel.addTab(Translation.get("gb.customFields"), customFieldsScrollPane);

		


      JButton createButton = new JButton(Translation.get("gb.save"));

      createButton.addActionListener(new ActionListener() {

@@ -331,11 +349,15 @@
      pack();

      nameField.requestFocus();

   }



	
   private JPanel newFieldPanel(String label, JComponent comp) {

      return newFieldPanel(label, 150, comp);

   }



   private JPanel newFieldPanel(String label, int labelSize, JComponent comp) {

      JLabel fieldLabel = new JLabel(label);

      fieldLabel.setFont(fieldLabel.getFont().deriveFont(Font.BOLD));

      fieldLabel.setPreferredSize(new Dimension(150, 20));

      fieldLabel.setPreferredSize(new Dimension(labelSize, 20));

      JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0));

      panel.add(fieldLabel);

      panel.add(comp);

@@ -366,6 +388,9 @@
      if (rname.contains("/../")) {

         error("Relative folder references (../) are prohibited.");

         return false;

      }

      if (rname.endsWith("/")) {

         rname = rname.substring(0, rname.length() - 1);

      }



      // confirm valid characters in repository name

@@ -448,12 +473,26 @@
      repository.indexedBranches = indexedBranchesPalette.getSelections();

      repository.preReceiveScripts = preReceivePalette.getSelections();

      repository.postReceiveScripts = postReceivePalette.getSelections();

		
      // Custom Fields

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

      if (customTextfields != null) {

         for (JTextField field : customTextfields) {

            String key = field.getName();

            String value = field.getText();

            repository.customFields.put(key, value);

         }

      }

      return true;

   }



   private void error(String message) {

      JOptionPane.showMessageDialog(EditRepositoryDialog.this, message,

            Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);

   }

	
   public void setAccessRestriction(AccessRestrictionType restriction) {

      this.accessRestriction.setSelectedItem(restriction);

   }



   public void setUsers(String owner, List<String> all, List<String> selected) {

@@ -525,6 +564,44 @@
   public List<String> getPermittedTeams() {

      return teamsPalette.getSelections();

   }

	
   public void setCustomFields(RepositoryModel repository, Map<String, String> customFields) {

      customFieldsPanel.removeAll();

      customTextfields = new ArrayList<JTextField>();

		
      final Insets insets = new Insets(5, 5, 5, 5);

      JPanel fields = new JPanel(new GridLayout(0, 1, 0, 5)) {



         private static final long serialVersionUID = 1L;



         @Override

         public Insets getInsets() {

            return insets;

         }

      };		
		
      for (Map.Entry<String, String> entry : customFields.entrySet()) {

         String field = entry.getKey();

         String value = "";

         if (repository.customFields != null && repository.customFields.containsKey(field)) {

            value = repository.customFields.get(field);

         }

         JTextField textField = new JTextField(value);

         textField.setName(field);

			
         textField.setPreferredSize(new Dimension(450, 26));

			
         fields.add(newFieldPanel(entry.getValue(), 250, textField));

			
         customTextfields.add(textField);

      }

      JScrollPane jsp = new JScrollPane(fields);		
      jsp.getVerticalScrollBar().setBlockIncrement(100);

      jsp.getVerticalScrollBar().setUnitIncrement(100);

      jsp.setViewportBorder(null);

      customFieldsPanel.setLayout(new FlowLayout(FlowLayout.LEFT));

      customFieldsPanel.add(jsp);

   }



   /**

    * ListCellRenderer to display descriptive text about the access