Separate management from administration in rpc servlet.

James Moger

2011-10-23 d03aff630cbcd49f02d51f08ec59ac3cf7f41d0e

 src/com/gitblit/client/GitblitPanel.java

@@ -19,11 +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;

@@ -49,6 +52,7 @@
import com.gitblit.Constants.RpcRequest;

import com.gitblit.client.ClosableTabComponent.CloseTabListener;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.SettingModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;



@@ -67,17 +71,21 @@


   private final Insets insets = new Insets(margin, margin, margin, margin);



   private GitblitModel gitblit;

   private GitblitClient gitblit;



   private JTabbedPane tabs;



   private JTable repositoriesTable;



   private RepositoriesModel repositoriesModel;

   private RepositoriesTableModel repositoriesModel;



   private JTable usersTable;



   private UsersModel usersModel;

   private UsersTableModel usersModel;



   private JTable settingsTable;



   private SettingsTableModel settingsModel;



   private JButton createRepository;



@@ -91,9 +99,11 @@


   private DefaultTableCellRenderer sizeRenderer;



   private TableRowSorter<RepositoriesModel> defaultRepositoriesSorter;

   private TableRowSorter<RepositoriesTableModel> defaultRepositoriesSorter;



   private TableRowSorter<UsersModel> defaultUsersSorter;

   private TableRowSorter<UsersTableModel> defaultUsersSorter;



   private TableRowSorter<SettingsTableModel> defaultSettingsSorter;



   private JButton editRepository;



@@ -102,8 +112,18 @@
   }



   public GitblitPanel(String url, String account, char[] password) {

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

      this.gitblit = new GitblitClient(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.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() {

@@ -160,17 +180,18 @@
      ownerRenderer.setForeground(Color.gray);

      ownerRenderer.setHorizontalAlignment(SwingConstants.CENTER);



      repositoriesModel = new RepositoriesModel();

      defaultRepositoriesSorter = new TableRowSorter<RepositoriesModel>(repositoriesModel);

      repositoriesModel = new RepositoriesTableModel();

      defaultRepositoriesSorter = new TableRowSorter<RepositoriesTableModel>(repositoriesModel);

      repositoriesTable = Utils.newTable(repositoriesModel);

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

      repositoriesTable.setRowSorter(defaultRepositoriesSorter);

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

      repositoriesTable.getRowSorter().toggleSortOrder(

            RepositoriesTableModel.Columns.Name.ordinal());



      setRepositoryRenderer(RepositoriesModel.Columns.Name, nameRenderer);

      setRepositoryRenderer(RepositoriesModel.Columns.Indicators, typeRenderer);

      setRepositoryRenderer(RepositoriesModel.Columns.Owner, ownerRenderer);

      setRepositoryRenderer(RepositoriesModel.Columns.Size, sizeRenderer);

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

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

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

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



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

         @Override

@@ -185,12 +206,20 @@
            if (selected) {

               int viewRow = repositoriesTable.getSelectedRow();

               int modelRow = repositoriesTable.convertRowIndexToModel(viewRow);

               RepositoryModel model = ((RepositoriesModel) repositoriesTable.getModel()).list

               RepositoryModel model = ((RepositoriesTableModel) repositoriesTable.getModel()).list

                     .get(modelRow);

               editRepository.setEnabled(singleSelection

                     && (gitblit.allowAdmin() || gitblit.isOwner(model)));

                     && (gitblit.allowManagement() || gitblit.isOwner(model)));

            } else {

               editRepository.setEnabled(false);

            }

         }

      });



      repositoriesTable.addMouseListener(new MouseAdapter() {

         public void mouseClicked(MouseEvent e) {

            if (e.getClickCount() == 2 && gitblit.allowManagement()) {

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

            }

         }

      });

@@ -215,19 +244,40 @@
      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);

      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(RepositoriesTableModel.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) {

@@ -258,14 +308,14 @@
         }

      });



      usersModel = new UsersModel();

      defaultUsersSorter = new TableRowSorter<UsersModel>(usersModel);

      usersModel = new UsersTableModel();

      defaultUsersSorter = new TableRowSorter<UsersTableModel>(usersModel);

      usersTable = Utils.newTable(usersModel);

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

      String name = usersTable.getColumnName(UsersTableModel.Columns.Name.ordinal());

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

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

      usersTable.setRowSorter(defaultUsersSorter);

      usersTable.getRowSorter().toggleSortOrder(UsersModel.Columns.Name.ordinal());

      usersTable.getRowSorter().toggleSortOrder(UsersTableModel.Columns.Name.ordinal());

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



         @Override

@@ -277,6 +327,14 @@
            boolean singleSelection = usersTable.getSelectedRows().length == 1;

            editUser.setEnabled(singleSelection && selected);

            delUser.setEnabled(selected);

         }

      });



      usersTable.addMouseListener(new MouseAdapter() {

         public void mouseClicked(MouseEvent e) {

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

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

            }

         }

      });



@@ -300,38 +358,98 @@
      userTablePanel.add(userFilterPanel, BorderLayout.NORTH);

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



      JPanel userControls = new JPanel();

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

      userControls.add(refreshUsers);

      userControls.add(createUser);

      userControls.add(editUser);

      userControls.add(delUser);



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

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

      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() {

      final SettingPanel settingPanel = new SettingPanel();

      settingsModel = new SettingsTableModel();

      defaultSettingsSorter = new TableRowSorter<SettingsTableModel>(settingsModel);

      settingsTable = Utils.newTable(settingsModel);

      settingsTable.setDefaultRenderer(SettingModel.class, new SettingCellRenderer());

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

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

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

      settingsTable.setRowSorter(defaultSettingsSorter);

      settingsTable.getRowSorter().toggleSortOrder(SettingsTableModel.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

            if (singleSelection) {

               int viewRow = settingsTable.getSelectedRow();

               int modelRow = settingsTable.convertRowIndexToModel(viewRow);

               SettingModel setting = settingsModel.get(modelRow);

               settingPanel.setSetting(setting);

            } else {

               settingPanel.clear();

            }

         }

      });



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

      settingsTablePanel.add(settingPanel, BorderLayout.SOUTH);



      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 {

@@ -340,7 +458,7 @@
      updateRepositoriesTable();

      Utils.packColumns(repositoriesTable, 2);



      if (gitblit.allowAdmin()) {

      if (gitblit.allowManagement()) {

         updateUsersTable();

      } else {

         // user does not have administrator privileges

@@ -350,8 +468,21 @@
         delRepository.setVisible(false);



         while (tabs.getTabCount() > 1) {

            // remove admin tabs

            // remove all management/administration tabs

            tabs.removeTabAt(1);

         }

      }



      if (gitblit.allowAdministration()) {

         updateSettingsTable();

      } else {

         // remove the settings tab

         String settingsTitle = Translation.get("gb.settings");

         for (int i= 0; i < tabs.getTabCount(); i++) {

            if (tabs.getTitleAt(i).equals(settingsTitle)) {

               tabs.removeTabAt(i);

               break;

            }				
         }

      }

   }

@@ -368,13 +499,18 @@
      usersModel.fireTableDataChanged();

   }



   private void updateSettingsTable() {

      settingsModel.setSettings(gitblit.getSettings());

      settingsModel.fireTableDataChanged();

   }



   private void filterRepositories(final String fragment) {

      if (StringUtils.isEmpty(fragment)) {

         repositoriesTable.setRowSorter(defaultRepositoriesSorter);

         return;

      }

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

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

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

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

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

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

                  return true;

@@ -383,7 +519,7 @@
            return false;

         }

      };

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

      TableRowSorter<RepositoriesTableModel> sorter = new TableRowSorter<RepositoriesTableModel>(

            repositoriesModel);

      sorter.setRowFilter(containsFilter);

      repositoriesTable.setRowSorter(sorter);

@@ -394,8 +530,8 @@
         usersTable.setRowSorter(defaultUsersSorter);

         return;

      }

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

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

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

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

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

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

                  return true;

@@ -404,9 +540,30 @@
            return false;

         }

      };

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

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

      sorter.setRowFilter(containsFilter);

      usersTable.setRowSorter(sorter);

   }



   private void filterSettings(final String fragment) {

      if (StringUtils.isEmpty(fragment)) {

         settingsTable.setRowSorter(defaultSettingsSorter);

         return;

      }

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

         public boolean include(Entry<? extends SettingsTableModel, ? 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<SettingsTableModel> sorter = new TableRowSorter<SettingsTableModel>(

            settingsModel);

      sorter.setRowFilter(containsFilter);

      settingsTable.setRowSorter(sorter);

   }



   private List<RepositoryModel> getSelectedRepositories() {

@@ -462,6 +619,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);

@@ -508,9 +666,11 @@
    */

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

      dialog.setRepositories(gitblit.getRepositories());

      dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets);

      dialog.setVisible(true);

      final RepositoryModel revisedRepository = dialog.getRepository();

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

               }

               if (success) {

                  gitblit.refreshRepositories();

                  gitblit.refreshUsers();

               }

               return success;

@@ -609,6 +770,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);

@@ -650,6 +812,8 @@
    */

   protected void editUser(final UserModel user) {

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

      dialog.setLocationRelativeTo(GitblitPanel.this);

      dialog.setUsers(gitblit.getUsers());

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

      dialog.setVisible(true);

      final UserModel revisedUser = dialog.getUser();