Management of registrations. Usability improvements.

James Moger

2011-10-18 f14f761a9fbebb41a93e54880513ac6a5cdd1c16

 src/com/gitblit/client/GitblitPanel.java

@@ -19,9 +19,14 @@
import java.awt.Color;

import java.awt.Component;

import java.awt.Desktop;

import java.awt.FlowLayout;

import java.awt.Insets;

import java.awt.event.ActionEvent;

import java.awt.event.ActionListener;

import java.awt.event.KeyAdapter;

import java.awt.event.KeyEvent;

import java.awt.event.MouseAdapter;

import java.awt.event.MouseEvent;

import java.io.IOException;

import java.net.URI;

import java.text.MessageFormat;

@@ -77,7 +82,9 @@


   private UsersModel usersModel;



   private JPanel usersPanel;

   private JTable settingsTable;



   private SettingsModel settingsModel;



   private JButton createRepository;



@@ -95,6 +102,8 @@


   private TableRowSorter<UsersModel> defaultUsersSorter;



   private TableRowSorter<SettingsModel> defaultSettingsSorter;



   private JButton editRepository;



   public GitblitPanel(GitblitRegistration reg) {

@@ -104,6 +113,17 @@
   public GitblitPanel(String url, String account, char[] password) {

      this.gitblit = new GitblitModel(url, account, password);



      tabs = new JTabbedPane(JTabbedPane.BOTTOM);

      tabs.addTab(Translation.get("gb.repositories"), createRepositoriesPanel());

      tabs.addTab(Translation.get("gb.users"), createUsersPanel());

      tabs.addTab(Translation.get("gb.federation"), new JPanel());

      tabs.addTab(Translation.get("gb.settings"), createSettingsPanel());



      setLayout(new BorderLayout());

      add(tabs, BorderLayout.CENTER);

   }



   private JPanel createRepositoriesPanel() {

      final JButton browseRepository = new JButton(Translation.get("gb.browse"));

      browseRepository.setEnabled(false);

      browseRepository.addActionListener(new ActionListener() {

@@ -167,10 +187,10 @@
      repositoriesTable.setRowSorter(defaultRepositoriesSorter);

      repositoriesTable.getRowSorter().toggleSortOrder(RepositoriesModel.Columns.Name.ordinal());



      setRepositoryRenderer(RepositoriesModel.Columns.Name, nameRenderer);

      setRepositoryRenderer(RepositoriesModel.Columns.Indicators, typeRenderer);

      setRepositoryRenderer(RepositoriesModel.Columns.Owner, ownerRenderer);

      setRepositoryRenderer(RepositoriesModel.Columns.Size, sizeRenderer);

      setRepositoryRenderer(RepositoriesModel.Columns.Name, nameRenderer, -1);

      setRepositoryRenderer(RepositoriesModel.Columns.Indicators, typeRenderer, 100);

      setRepositoryRenderer(RepositoriesModel.Columns.Owner, ownerRenderer, -1);

      setRepositoryRenderer(RepositoriesModel.Columns.Size, sizeRenderer, 60);



      repositoriesTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {

         @Override

@@ -194,6 +214,14 @@
            }

         }

      });

		
      repositoriesTable.addMouseListener(new MouseAdapter() {

         public void mouseClicked(MouseEvent e) {

            if (e.getClickCount() == 2) {

               editRepository(getSelectedRepositories().get(0));

            }

         }

      });



      final JTextField repositoryFilter = new JTextField();

      repositoryFilter.addActionListener(new ActionListener() {

@@ -201,28 +229,54 @@
            filterRepositories(repositoryFilter.getText());

         }

      });

      repositoryFilter.addKeyListener(new KeyAdapter() {

         public void keyReleased(KeyEvent e) {

            filterRepositories(repositoryFilter.getText());

         }

      });



      JPanel filterPanel = new JPanel(new BorderLayout(margin, margin));

      filterPanel.add(new JLabel(Translation.get("gb.filter")), BorderLayout.WEST);

      filterPanel.add(repositoryFilter, BorderLayout.CENTER);

      JPanel repositoryFilterPanel = new JPanel(new BorderLayout(margin, margin));

      repositoryFilterPanel.add(new JLabel(Translation.get("gb.filter")), BorderLayout.WEST);

      repositoryFilterPanel.add(repositoryFilter, BorderLayout.CENTER);



      JPanel tablePanel = new JPanel(new BorderLayout(margin, margin));

      tablePanel.add(filterPanel, BorderLayout.NORTH);

      tablePanel.add(new JScrollPane(repositoriesTable), BorderLayout.CENTER);

      JPanel repositoryTablePanel = new JPanel(new BorderLayout(margin, margin));

      repositoryTablePanel.add(repositoryFilterPanel, BorderLayout.NORTH);

      repositoryTablePanel.add(new JScrollPane(repositoriesTable), BorderLayout.CENTER);



      JPanel repositoryControls = new JPanel();

      JPanel repositoryControls = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));

      repositoryControls.add(refreshRepositories);

      repositoryControls.add(browseRepository);

      repositoryControls.add(createRepository);

      repositoryControls.add(editRepository);

      repositoryControls.add(delRepository);



      JPanel repositoriesPanel = new JPanel(new BorderLayout(margin, margin));

      repositoriesPanel.add(newHeaderLabel(Translation.get("gb.repositories")),

            BorderLayout.NORTH);

      repositoriesPanel.add(tablePanel, BorderLayout.CENTER);

      JPanel repositoriesPanel = new JPanel(new BorderLayout(margin, margin)) {



         private static final long serialVersionUID = 1L;



         public Insets getInsets() {

            return insets;

         }

      };

      repositoriesPanel.add(new HeaderPanel(Translation.get("gb.repositories"),

            "gitweb-favicon.png"), BorderLayout.NORTH);

      repositoriesPanel.add(repositoryTablePanel, BorderLayout.CENTER);

      repositoriesPanel.add(repositoryControls, BorderLayout.SOUTH);



      return repositoriesPanel;

   }



   private void setRepositoryRenderer(RepositoriesModel.Columns col, TableCellRenderer renderer,

         int maxWidth) {

      String name = repositoriesTable.getColumnName(col.ordinal());

      repositoriesTable.getColumn(name).setCellRenderer(renderer);

      if (maxWidth > 0) {

         repositoriesTable.getColumn(name).setMinWidth(maxWidth);

         repositoriesTable.getColumn(name).setMaxWidth(maxWidth);

      }

   }



   private JPanel createUsersPanel() {

      JButton refreshUsers = new JButton(Translation.get("gb.refresh"));

      refreshUsers.addActionListener(new ActionListener() {

         public void actionPerformed(ActionEvent e) {

@@ -274,39 +328,116 @@
            delUser.setEnabled(selected);

         }

      });

		
      usersTable.addMouseListener(new MouseAdapter() {

         public void mouseClicked(MouseEvent e) {

            if (e.getClickCount() == 2) {

               editUser(getSelectedUsers().get(0));

            }

         }

      });



      JPanel userControls = new JPanel();

      final JTextField userFilter = new JTextField();

      userFilter.addActionListener(new ActionListener() {

         public void actionPerformed(ActionEvent e) {

            filterUsers(userFilter.getText());

         }

      });

      userFilter.addKeyListener(new KeyAdapter() {

         public void keyReleased(KeyEvent e) {

            filterUsers(userFilter.getText());

         }

      });



      JPanel userFilterPanel = new JPanel(new BorderLayout(margin, margin));

      userFilterPanel.add(new JLabel(Translation.get("gb.filter")), BorderLayout.WEST);

      userFilterPanel.add(userFilter, BorderLayout.CENTER);



      JPanel userTablePanel = new JPanel(new BorderLayout(margin, margin));

      userTablePanel.add(userFilterPanel, BorderLayout.NORTH);

      userTablePanel.add(new JScrollPane(usersTable), BorderLayout.CENTER);



      JPanel userControls = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));

      userControls.add(refreshUsers);

      userControls.add(createUser);

      userControls.add(editUser);

      userControls.add(delUser);



      usersPanel = new JPanel(new BorderLayout(margin, margin));

      usersPanel.add(newHeaderLabel(Translation.get("gb.users")), BorderLayout.NORTH);

      usersPanel.add(new JScrollPane(usersTable), BorderLayout.CENTER);

      JPanel usersPanel = new JPanel(new BorderLayout(margin, margin)) {



         private static final long serialVersionUID = 1L;



         public Insets getInsets() {

            return insets;

         }

      };

      usersPanel.add(new HeaderPanel(Translation.get("gb.users"), "user_16x16.png"),

            BorderLayout.NORTH);

      usersPanel.add(userTablePanel, BorderLayout.CENTER);

      usersPanel.add(userControls, BorderLayout.SOUTH);



      tabs = new JTabbedPane(JTabbedPane.BOTTOM);

      tabs.addTab(Translation.get("gb.repositories"), repositoriesPanel);

      tabs.addTab(Translation.get("gb.users"), usersPanel);

      tabs.addTab(Translation.get("gb.federation"), new JPanel());



      setLayout(new BorderLayout());

      add(tabs, BorderLayout.CENTER);

      return usersPanel;

   }



   private JLabel newHeaderLabel(String text) {

      JLabel label = new JLabel(text);

      label.setOpaque(true);

      label.setForeground(Color.white);

      label.setBackground(Color.gray);

      label.setFont(label.getFont().deriveFont(14f));

      return label;

   }

   private JPanel createSettingsPanel() {

      settingsModel = new SettingsModel();

      defaultSettingsSorter = new TableRowSorter<SettingsModel>(settingsModel);

      settingsTable = Utils.newTable(settingsModel);

      String name = settingsTable.getColumnName(UsersModel.Columns.Name.ordinal());

      settingsTable.setRowHeight(nameRenderer.getFont().getSize() + 8);

      settingsTable.getColumn(name).setCellRenderer(nameRenderer);

      settingsTable.setRowSorter(defaultSettingsSorter);

      settingsTable.getRowSorter().toggleSortOrder(SettingsModel.Columns.Name.ordinal());

      settingsTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {



   private void setRepositoryRenderer(RepositoriesModel.Columns col, TableCellRenderer renderer) {

      String name = repositoriesTable.getColumnName(col.ordinal());

      repositoriesTable.getColumn(name).setCellRenderer(renderer);

         @Override

         public void valueChanged(ListSelectionEvent e) {

            if (e.getValueIsAdjusting()) {

               return;

            }

            boolean selected = settingsTable.getSelectedRow() > -1;

            boolean singleSelection = settingsTable.getSelectedRows().length == 1;

            // TODO enable/disable setting buttons

         }

      });



      final JTextField settingFilter = new JTextField();

      settingFilter.addActionListener(new ActionListener() {

         public void actionPerformed(ActionEvent e) {

            filterSettings(settingFilter.getText());

         }

      });

      settingFilter.addKeyListener(new KeyAdapter() {

         public void keyReleased(KeyEvent e) {

            filterSettings(settingFilter.getText());

         }

      });



      JPanel settingFilterPanel = new JPanel(new BorderLayout(margin, margin));

      settingFilterPanel.add(new JLabel(Translation.get("gb.filter")), BorderLayout.WEST);

      settingFilterPanel.add(settingFilter, BorderLayout.CENTER);



      JPanel settingsTablePanel = new JPanel(new BorderLayout(margin, margin));

      settingsTablePanel.add(settingFilterPanel, BorderLayout.NORTH);

      settingsTablePanel.add(new JScrollPane(settingsTable), BorderLayout.CENTER);



      JPanel settingsControls = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));

      // TODO update setting?



      JPanel settingsPanel = new JPanel(new BorderLayout(margin, margin)) {



         private static final long serialVersionUID = 1L;



         public Insets getInsets() {

            return insets;

         }

      };

      settingsPanel.add(new HeaderPanel(Translation.get("gb.settings"), "settings_16x16.png"),

            BorderLayout.NORTH);

      settingsPanel.add(settingsTablePanel, BorderLayout.CENTER);

      settingsPanel.add(settingsControls, BorderLayout.SOUTH);



      return settingsPanel;

   }



   public void login() throws IOException {

@@ -317,15 +448,13 @@


      if (gitblit.allowAdmin()) {

         updateUsersTable();

         updateSettingsTable();

      } else {

         // user does not have administrator privileges

         // hide admin repository buttons

         createRepository.setVisible(false);

         editRepository.setVisible(false);

         delRepository.setVisible(false);



         // hide users panel

         usersPanel.setVisible(false);



         while (tabs.getTabCount() > 1) {

            // remove admin tabs

@@ -346,6 +475,11 @@
      usersModel.fireTableDataChanged();

   }



   private void updateSettingsTable() {

      settingsModel.setSettings(gitblit.getSettings());

      settingsModel.fireTableDataChanged();

   }



   private void filterRepositories(final String fragment) {

      if (StringUtils.isEmpty(fragment)) {

         repositoriesTable.setRowSorter(defaultRepositoriesSorter);

@@ -361,10 +495,50 @@
            return false;

         }

      };

      RepositoriesModel model = (RepositoriesModel) repositoriesTable.getModel();

      TableRowSorter<RepositoriesModel> sorter = new TableRowSorter<RepositoriesModel>(model);

      TableRowSorter<RepositoriesModel> sorter = new TableRowSorter<RepositoriesModel>(

            repositoriesModel);

      sorter.setRowFilter(containsFilter);

      repositoriesTable.setRowSorter(sorter);

   }



   private void filterUsers(final String fragment) {

      if (StringUtils.isEmpty(fragment)) {

         usersTable.setRowSorter(defaultUsersSorter);

         return;

      }

      RowFilter<UsersModel, Object> containsFilter = new RowFilter<UsersModel, Object>() {

         public boolean include(Entry<? extends UsersModel, ? extends Object> entry) {

            for (int i = entry.getValueCount() - 1; i >= 0; i--) {

               if (entry.getStringValue(i).toLowerCase().contains(fragment.toLowerCase())) {

                  return true;

               }

            }

            return false;

         }

      };

      TableRowSorter<UsersModel> sorter = new TableRowSorter<UsersModel>(usersModel);

      sorter.setRowFilter(containsFilter);

      usersTable.setRowSorter(sorter);

   }



   private void filterSettings(final String fragment) {

      if (StringUtils.isEmpty(fragment)) {

         settingsTable.setRowSorter(defaultSettingsSorter);

         return;

      }

      RowFilter<SettingsModel, Object> containsFilter = new RowFilter<SettingsModel, Object>() {

         public boolean include(Entry<? extends SettingsModel, ? extends Object> entry) {

            for (int i = entry.getValueCount() - 1; i >= 0; i--) {

               if (entry.getStringValue(i).toLowerCase().contains(fragment.toLowerCase())) {

                  return true;

               }

            }

            return false;

         }

      };

      TableRowSorter<SettingsModel> sorter = new TableRowSorter<SettingsModel>(settingsModel);

      sorter.setRowFilter(containsFilter);

      settingsTable.setRowSorter(sorter);

   }



   private List<RepositoryModel> getSelectedRepositories() {

@@ -397,7 +571,7 @@
      gitblit = null;

   }



   protected void refreshRepositories() {

   protected void refreshRepositories() {		
      GitblitWorker worker = new GitblitWorker(GitblitPanel.this, RpcRequest.LIST_REPOSITORIES) {

         @Override

         protected Boolean doRequest() throws IOException {

@@ -420,6 +594,7 @@
    */

   protected void createRepository() {

      EditRepositoryDialog dialog = new EditRepositoryDialog();

      dialog.setLocationRelativeTo(GitblitPanel.this);

      dialog.setUsers(null, gitblit.getUsernames(), null);

      dialog.setRepositories(gitblit.getRepositories());

      dialog.setVisible(true);

@@ -466,6 +641,7 @@
    */

   protected void editRepository(final RepositoryModel repository) {

      EditRepositoryDialog dialog = new EditRepositoryDialog(repository);

      dialog.setLocationRelativeTo(GitblitPanel.this);

      List<String> usernames = gitblit.getUsernames();

      List<String> members = gitblit.getPermittedUsernames(repository);

      dialog.setUsers(repository.owner, usernames, members);

@@ -524,6 +700,7 @@
                  success &= gitblit.deleteRepository(repository);

               }

               if (success) {

                  gitblit.refreshRepositories();

                  gitblit.refreshUsers();

               }

               return success;

@@ -567,6 +744,7 @@
    */

   protected void createUser() {

      EditUserDialog dialog = new EditUserDialog(gitblit.getSettings());

      dialog.setLocationRelativeTo(GitblitPanel.this);

      dialog.setUsers(gitblit.getUsers());

      dialog.setRepositories(gitblit.getRepositories(), null);

      dialog.setVisible(true);

@@ -608,6 +786,7 @@
    */

   protected void editUser(final UserModel user) {

      EditUserDialog dialog = new EditUserDialog(user, gitblit.getSettings());

      dialog.setLocationRelativeTo(GitblitPanel.this);

      dialog.setRepositories(gitblit.getRepositories(), new ArrayList<String>(user.repositories));

      dialog.setVisible(true);

      final UserModel revisedUser = dialog.getUser();