Merged LDAP user/team pre-fetching and synchronization enhancement from msc...

James Moger

2013-02-25 64b6f382d35e1fea0172b222277dae0312f274e4

 src/com/gitblit/client/EditRepositoryDialog.java

@@ -38,7 +38,6 @@


import javax.swing.BoxLayout;

import javax.swing.ButtonGroup;

import javax.swing.DefaultComboBoxModel;

import javax.swing.DefaultListCellRenderer;

import javax.swing.ImageIcon;

import javax.swing.JButton;

@@ -117,14 +116,16 @@


   private JComboBox federationStrategy;



   private JComboBox ownerField;

   private JPalette<String> ownersPalette;



   private JComboBox headRefField;

   

   private JComboBox gcPeriod;

   

   private JTextField gcThreshold;



	
   private JComboBox maxActivityCommits;

	
   private RegistrantPermissionsPanel usersPalette;



   private JPalette<String> setsPalette;

@@ -205,7 +206,7 @@
      gcThreshold = new JTextField(8);

      gcThreshold.setText(anRepository.gcThreshold);



      ownerField = new JComboBox();

      ownersPalette = new JPalette<String>(true);



      useTickets = new JCheckBox(Translation.get("gb.useTicketsDescription"),

            anRepository.useTickets);

@@ -224,6 +225,9 @@
            anRepository.skipSummaryMetrics);

      isFrozen = new JCheckBox(Translation.get("gb.isFrozenDescription"),

            anRepository.isFrozen);



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

      maxActivityCommits.setSelectedItem(anRepository.maxActivityCommits);



      mailingListsField = new JTextField(

            ArrayUtils.isEmpty(anRepository.mailingLists) ? ""

@@ -250,7 +254,7 @@
      allowAuthenticated.addItemListener(new ItemListener() {

         @Override

         public void itemStateChanged(ItemEvent e) {

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

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

               teamsPalette.setEnabled(false);

            }

@@ -314,6 +318,8 @@
                  skipSizeCalculation));

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

            skipSummaryMetrics));

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

            maxActivityCommits));

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

            mailingListsField));



@@ -327,10 +333,10 @@


      usersPalette = new RegistrantPermissionsPanel(RegistrantType.USER);



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

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

      JPanel northFieldsPanel = new JPanel(new BorderLayout(0, 5));

      northFieldsPanel.add(newFieldPanel(Translation.get("gb.owners"), ownersPalette), BorderLayout.NORTH);

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

            accessRestriction), BorderLayout.NORTH);

            accessRestriction), BorderLayout.CENTER);



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

      northAccessPanel.add(northFieldsPanel, BorderLayout.NORTH);

@@ -462,9 +468,11 @@
         

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

@@ -547,8 +555,8 @@


      repository.name = rname;

      repository.description = descriptionField.getText();

      repository.owner = ownerField.getSelectedItem() == null ? null

            : ownerField.getSelectedItem().toString();

      repository.owners.clear();

      repository.owners.addAll(ownersPalette.getSelections());

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

            : headRefField.getSelectedItem().toString();

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

@@ -559,6 +567,7 @@
      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();

@@ -619,11 +628,8 @@
      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);

      }

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

      ownersPalette.setObjects(all, owners);

      usersPalette.setObjects(all, permissions);

   }