Fixed minor bug in flatten strings

James Moger

2011-10-21 6e666fcdbbafedb583a13186fefac3fdd2c1a791

 src/com/gitblit/client/EditRepositoryDialog.java

@@ -24,6 +24,7 @@
import java.awt.Insets;

import java.awt.event.ActionEvent;

import java.awt.event.ActionListener;

import java.awt.event.KeyEvent;

import java.text.MessageFormat;

import java.util.ArrayList;

import java.util.Arrays;

@@ -42,7 +43,10 @@
import javax.swing.JList;

import javax.swing.JOptionPane;

import javax.swing.JPanel;

import javax.swing.JRootPane;

import javax.swing.JTabbedPane;

import javax.swing.JTextField;

import javax.swing.KeyStroke;

import javax.swing.ListCellRenderer;



import com.gitblit.Constants.AccessRestrictionType;

@@ -77,6 +81,8 @@


   private JCheckBox showReadme;



   private JCheckBox skipSizeCalculation;



   private JCheckBox isFrozen;



   private JComboBox accessRestriction;

@@ -104,14 +110,31 @@
      this.isCreate = false;

      initialize(aRepository);

      setModal(true);

      setResizable(false);

      setTitle(Translation.get("gb.edit") + ": " + aRepository.name);

      setIconImage(new ImageIcon(getClass().getResource("/gitblt-favicon.png")).getImage());

   }

	
   @Override

   protected JRootPane createRootPane() {

      KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);

      JRootPane rootPane = new JRootPane();

      rootPane.registerKeyboardAction(new ActionListener() {

         public void actionPerformed(ActionEvent actionEvent) {

            setVisible(false);

         }

      }, stroke, JComponent.WHEN_IN_FOCUSED_WINDOW);

      return rootPane;

   }



   private void initialize(RepositoryModel anRepository) {

      nameField = new JTextField(anRepository.name == null ? "" : anRepository.name, 35);

      descriptionField = new JTextField(anRepository.description == null ? ""

            : anRepository.description, 35);



      JTextField originField = new JTextField(anRepository.origin == null ? ""

            : anRepository.origin, 40);

      originField.setEditable(false);



      ownerField = new JComboBox();



@@ -122,6 +145,8 @@
            anRepository.showRemoteBranches);

      showReadme = new JCheckBox(Translation.get("gb.showReadmeDescription"),

            anRepository.showReadme);

      skipSizeCalculation = new JCheckBox(Translation.get("gb.skipSizeCalculationDescription"),

            anRepository.skipSizeCalculation);

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



      accessRestriction = new JComboBox(AccessRestrictionType.values());

@@ -142,6 +167,7 @@
      JPanel fieldsPanel = new JPanel(new GridLayout(0, 1));

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

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

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

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



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

@@ -149,6 +175,7 @@
      fieldsPanel

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

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

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

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



      usersPalette = new JPalette<String>();

@@ -166,10 +193,10 @@
      federationPanel.add(newFieldPanel(Translation.get("gb.federationSets"), setsPalette),

            BorderLayout.CENTER);



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

      panel.add(fieldsPanel, BorderLayout.NORTH);

      panel.add(accessPanel, BorderLayout.CENTER);

      panel.add(federationPanel, BorderLayout.SOUTH);

      JTabbedPane panel = new JTabbedPane(JTabbedPane.TOP);

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

      panel.addTab(Translation.get("gb.accessRestriction"), accessPanel);

      panel.addTab(Translation.get("gb.federation"), federationPanel);



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

      createButton.addActionListener(new ActionListener() {

@@ -209,7 +236,6 @@
      getContentPane().setLayout(new BorderLayout(5, 5));

      getContentPane().add(centerPanel, BorderLayout.CENTER);

      pack();

      setLocationRelativeTo(null);

   }



   private JPanel newFieldPanel(String label, JComponent comp) {

@@ -286,6 +312,7 @@
      repository.useDocs = useDocs.isSelected();

      repository.showRemoteBranches = showRemoteBranches.isSelected();

      repository.showReadme = showReadme.isSelected();

      repository.skipSizeCalculation = skipSizeCalculation.isSelected();

      repository.isFrozen = isFrozen.isSelected();



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