Checkbox to automatically set the new ssl certificate alias

James Moger

2012-12-05 d63157b22bb8a7294080be29ca0fca8ecda96db9

 src/com/gitblit/client/EditRepositoryDialog.java

@@ -24,18 +24,22 @@
import java.awt.Insets;

import java.awt.event.ActionEvent;

import java.awt.event.ActionListener;

import java.awt.event.ItemEvent;

import java.awt.event.ItemListener;

import java.awt.event.KeyEvent;

import java.text.MessageFormat;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;

import java.util.HashSet;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Map;

import java.util.Set;



import javax.swing.Box;

import javax.swing.BoxLayout;

import javax.swing.ButtonGroup;

import javax.swing.DefaultComboBoxModel;

import javax.swing.DefaultListCellRenderer;

import javax.swing.ImageIcon;

import javax.swing.JButton;

import javax.swing.JCheckBox;

@@ -46,6 +50,7 @@
import javax.swing.JList;

import javax.swing.JOptionPane;

import javax.swing.JPanel;

import javax.swing.JRadioButton;

import javax.swing.JRootPane;

import javax.swing.JScrollPane;

import javax.swing.JTabbedPane;

@@ -55,7 +60,10 @@
import javax.swing.ScrollPaneConstants;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Constants.FederationStrategy;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.RepositoryModel;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.StringUtils;

@@ -98,18 +106,32 @@
   private JTextField mailingListsField;



   private JComboBox accessRestriction;

	
   private JRadioButton allowAuthenticated;

	
   private JRadioButton allowNamed;

	
   private JCheckBox allowForks;



   private JCheckBox verifyCommitter;



   private JComboBox federationStrategy;



   private JComboBox ownerField;



   private JComboBox headRefField;

	
   private JComboBox gcPeriod;

	
   private JTextField gcThreshold;

	
   private JComboBox maxActivityCommits;



   private JPalette<String> usersPalette;

   private RegistrantPermissionsPanel usersPalette;



   private JPalette<String> setsPalette;



   private JPalette<String> teamsPalette;

   private RegistrantPermissionsPanel teamsPalette;

   

   private JPalette<String> indexedBranchesPalette;



@@ -124,6 +146,8 @@
   private Set<String> repositoryNames;

   

   private JPanel customFieldsPanel;

	
   private List<JTextField> customTextfields;



   public EditRepositoryDialog(int protocolVersion) {

      this(protocolVersion, new RepositoryModel());

@@ -175,6 +199,13 @@
               anRepository.availableRefs.toArray());

         headRefField.setSelectedItem(anRepository.HEAD);

      }

		
      Integer []  gcPeriods =  { 1, 2, 3, 4, 5, 7, 10, 14 };

      gcPeriod = new JComboBox(gcPeriods);

      gcPeriod.setSelectedItem(anRepository.gcPeriod);

		
      gcThreshold = new JTextField(8);

      gcThreshold.setText(anRepository.gcThreshold);



      ownerField = new JComboBox();



@@ -196,6 +227,10 @@
      isFrozen = new JCheckBox(Translation.get("gb.isFrozenDescription"),

            anRepository.isFrozen);



      maxActivityCommits = new JComboBox(new Integer [] { 0, 25, 50, 75, 100, 150, 250, 500 });

      maxActivityCommits.setSelectedItem(anRepository.maxActivityCommits);





      mailingListsField = new JTextField(

            ArrayUtils.isEmpty(anRepository.mailingLists) ? ""

                  : StringUtils.flattenStrings(anRepository.mailingLists,

@@ -204,6 +239,52 @@
      accessRestriction = new JComboBox(AccessRestrictionType.values());

      accessRestriction.setRenderer(new AccessRestrictionRenderer());

      accessRestriction.setSelectedItem(anRepository.accessRestriction);

      accessRestriction.addItemListener(new ItemListener() {

         @Override

         public void itemStateChanged(ItemEvent e) {

            if (e.getStateChange() == ItemEvent.SELECTED) {

               AccessRestrictionType art = (AccessRestrictionType) accessRestriction.getSelectedItem();

               EditRepositoryDialog.this.setupAccessPermissions(art);

            }

         }

      });

		
      boolean authenticated = anRepository.authorizationControl != null 
            && AuthorizationControl.AUTHENTICATED.equals(anRepository.authorizationControl);

      allowAuthenticated = new JRadioButton(Translation.get("gb.allowAuthenticatedDescription"));

      allowAuthenticated.setSelected(authenticated);

      allowAuthenticated.addItemListener(new ItemListener() {

         @Override

         public void itemStateChanged(ItemEvent e) {

            if (e.getStateChange() == ItemEvent.SELECTED) {					
               usersPalette.setEnabled(false);

               teamsPalette.setEnabled(false);

            }

         }

      });

		
      allowNamed = new JRadioButton(Translation.get("gb.allowNamedDescription"));

      allowNamed.setSelected(!authenticated);

      allowNamed.addItemListener(new ItemListener() {

         @Override

         public void itemStateChanged(ItemEvent e) {

            if (e.getStateChange() == ItemEvent.SELECTED) {

               usersPalette.setEnabled(true);

               teamsPalette.setEnabled(true);

            }

         }

      });

		
      ButtonGroup group = new ButtonGroup();

      group.add(allowAuthenticated);

      group.add(allowNamed);

		
      JPanel authorizationPanel = new JPanel(new GridLayout(0, 1));

      authorizationPanel.add(allowAuthenticated);

      authorizationPanel.add(allowNamed);

		
      allowForks = new JCheckBox(Translation.get("gb.allowForksDescription"), anRepository.allowForks);

      verifyCommitter = new JCheckBox(Translation.get("gb.verifyCommitterDescription"), anRepository.verifyCommitter);



      // federation strategies - remove ORIGIN choice if this repository has

      // no origin.

@@ -223,7 +304,8 @@
      fieldsPanel

            .add(newFieldPanel(Translation.get("gb.origin"), originField));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.headRef"), headRefField));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.gcPeriod"), gcPeriod));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.gcThreshold"), gcThreshold));



      fieldsPanel.add(newFieldPanel(Translation.get("gb.enableTickets"),

            useTickets));

@@ -238,24 +320,41 @@
                  skipSizeCalculation));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.skipSummaryMetrics"),

            skipSummaryMetrics));

      fieldsPanel

            .add(newFieldPanel(Translation.get("gb.isFrozen"), isFrozen));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.maxActivityCommits"),

            maxActivityCommits));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.mailingLists"),

            mailingListsField));



      usersPalette = new JPalette<String>();

      JPanel clonePushPanel = new JPanel(new GridLayout(0, 1));

      clonePushPanel

      .add(newFieldPanel(Translation.get("gb.isFrozen"), isFrozen));

      clonePushPanel

      .add(newFieldPanel(Translation.get("gb.allowForks"), allowForks));

      clonePushPanel

      .add(newFieldPanel(Translation.get("gb.verifyCommitter"), verifyCommitter));



      usersPalette = new RegistrantPermissionsPanel(RegistrantType.USER);



      JPanel northFieldsPanel = new JPanel(new GridLayout(0, 1, 0, 5));

      northFieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField));

      northFieldsPanel.add(newFieldPanel(Translation.get("gb.accessRestriction"),

            accessRestriction), BorderLayout.NORTH);



      JPanel northAccessPanel = new JPanel(new BorderLayout(5, 5));

      northAccessPanel.add(northFieldsPanel, BorderLayout.NORTH);

      northAccessPanel.add(newFieldPanel(Translation.get("gb.authorizationControl"),

            authorizationPanel), BorderLayout.CENTER);

      northAccessPanel.add(clonePushPanel, BorderLayout.SOUTH);



      JPanel accessPanel = new JPanel(new BorderLayout(5, 5));

      accessPanel.add(

            newFieldPanel(Translation.get("gb.accessRestriction"),

                  accessRestriction), BorderLayout.NORTH);

      accessPanel.add(

            newFieldPanel(Translation.get("gb.permittedUsers"),

      accessPanel.add(northAccessPanel, BorderLayout.NORTH);

      accessPanel.add(newFieldPanel(Translation.get("gb.userPermissions"),

                  usersPalette), BorderLayout.CENTER);



      teamsPalette = new JPalette<String>();

      teamsPalette = new RegistrantPermissionsPanel(RegistrantType.TEAM);

      JPanel teamsPanel = new JPanel(new BorderLayout(5, 5));

      teamsPanel.add(

            newFieldPanel(Translation.get("gb.permittedTeams"),

            newFieldPanel(Translation.get("gb.teamPermissions"),

                  teamsPalette), BorderLayout.CENTER);



      setsPalette = new JPalette<String>();

@@ -306,6 +405,8 @@
      

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

      



      setupAccessPermissions(anRepository.accessRestriction);



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

      createButton.addActionListener(new ActionListener() {

@@ -361,6 +462,27 @@
      panel.add(comp);

      return panel;

   }

	
   private void setupAccessPermissions(AccessRestrictionType art) {

      if (AccessRestrictionType.NONE.equals(art)) {

         usersPalette.setEnabled(false);

         teamsPalette.setEnabled(false);

			
         allowAuthenticated.setEnabled(false);

         allowNamed.setEnabled(false);

         verifyCommitter.setEnabled(false);

      } else {

         allowAuthenticated.setEnabled(true);

         allowNamed.setEnabled(true);

         verifyCommitter.setEnabled(true);

			
         if (allowNamed.isSelected()) {

            usersPalette.setEnabled(true);

            teamsPalette.setEnabled(true);

         }

      }



   }



   private boolean validateFields() {

      String rname = nameField.getText();

@@ -386,6 +508,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

@@ -436,13 +561,19 @@
            : ownerField.getSelectedItem().toString();

      repository.HEAD = headRefField.getSelectedItem() == null ? null

            : headRefField.getSelectedItem().toString();

      repository.gcPeriod = (Integer) gcPeriod.getSelectedItem();

      repository.gcThreshold = gcThreshold.getText();

      repository.useTickets = useTickets.isSelected();

      repository.useDocs = useDocs.isSelected();

      repository.showRemoteBranches = showRemoteBranches.isSelected();

      repository.showReadme = showReadme.isSelected();

      repository.skipSizeCalculation = skipSizeCalculation.isSelected();

      repository.skipSummaryMetrics = skipSummaryMetrics.isSelected();

      repository.maxActivityCommits = (Integer) maxActivityCommits.getSelectedItem();

		
      repository.isFrozen = isFrozen.isSelected();

      repository.allowForks = allowForks.isSelected();

      repository.verifyCommitter = verifyCommitter.isSelected();



      String ml = mailingListsField.getText();

      if (!StringUtils.isEmpty(ml)) {

@@ -458,6 +589,8 @@


      repository.accessRestriction = (AccessRestrictionType) accessRestriction

            .getSelectedItem();

      repository.authorizationControl = allowAuthenticated.isSelected() ? 
            AuthorizationControl.AUTHENTICATED : AuthorizationControl.NAMED;

      repository.federationStrategy = (FederationStrategy) federationStrategy

            .getSelectedItem();



@@ -470,13 +603,14 @@
      repository.postReceiveScripts = postReceivePalette.getSelections();

      

      // Custom Fields

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

		
      for (Component aCustomFieldPanel : customFieldsPanel.getComponents()) {

         JTextField textField = (JTextField) ((JPanel)aCustomFieldPanel).getComponent(1);

         repository.customFields.put(textField.getName(), textField.getText());

      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;

   }



@@ -484,17 +618,28 @@
      JOptionPane.showMessageDialog(EditRepositoryDialog.this, message,

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

   }

	
   public void setAccessRestriction(AccessRestrictionType restriction) {

      this.accessRestriction.setSelectedItem(restriction);

      setupAccessPermissions(restriction);

   }



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

   public void setAuthorizationControl(AuthorizationControl authorization) {

      boolean authenticated = authorization != null && AuthorizationControl.AUTHENTICATED.equals(authorization);

      this.allowAuthenticated.setSelected(authenticated);

      this.allowNamed.setSelected(!authenticated);

   }



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

      ownerField.setModel(new DefaultComboBoxModel(all.toArray()));

      if (!StringUtils.isEmpty(owner)) {

         ownerField.setSelectedItem(owner);

      }

      usersPalette.setObjects(all, selected);

      usersPalette.setObjects(all, permissions);

   }



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

      teamsPalette.setObjects(all, selected);

   public void setTeams(List<String> all, List<RegistrantAccessPermission> permissions) {

      teamsPalette.setObjects(all, permissions);

   }



   public void setRepositories(List<RepositoryModel> repositories) {

@@ -547,32 +692,50 @@
      return repository;

   }



   public List<String> getPermittedUsers() {

      return usersPalette.getSelections();

   public List<RegistrantAccessPermission> getUserAccessPermissions() {

      return usersPalette.getPermissions();

   }



   public List<String> getPermittedTeams() {

      return teamsPalette.getSelections();

   public List<RegistrantAccessPermission> getTeamAccessPermissions() {

      return teamsPalette.getPermissions();

   }

   

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

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

      customFieldsPanel.removeAll();

      customTextfields = new ArrayList<JTextField>();

      

      for (String customFieldDef : customFields) {

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

         String fieldName = customFieldProperty[0];

         String fieldLabel = customFieldProperty[1];

			
         JTextField textField = new JTextField(repository.customFields.get(fieldName), 50);

         textField.setName(fieldName);

			
         customFieldsPanel.add(newFieldPanel(fieldLabel, 250, textField));

      }

      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;

         }

      };		
      

      if (customFields.size() < 14) {

         customFieldsPanel.add(Box.createVerticalGlue());

         customFieldsPanel.add(Box.createRigidArea(new Dimension(300, 300 - (customFields.size() * 22))));

      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);

   }



   /**

@@ -580,14 +743,15 @@
    * restriction.

    * 

    */

   private class AccessRestrictionRenderer extends JLabel implements

         ListCellRenderer {

   private class AccessRestrictionRenderer extends DefaultListCellRenderer {



      private static final long serialVersionUID = 1L;



      @Override

      public Component getListCellRendererComponent(JList list, Object value,

            int index, boolean isSelected, boolean cellHasFocus) {

         super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);

			
         if (value instanceof AccessRestrictionType) {

            AccessRestrictionType restriction = (AccessRestrictionType) value;

            switch (restriction) {