From fe326255202dcfac8b0991ca9d28e3cf4bcc4fe6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 23 Oct 2011 12:28:48 -0400
Subject: [PATCH] Per-repository setting to skip summary metrics
---
src/com/gitblit/client/GitblitPanel.java | 847 +++++++++++++++++++++++++++++---------------------------
1 files changed, 440 insertions(+), 407 deletions(-)
diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/com/gitblit/client/GitblitPanel.java
index a6be156..31de44e 100644
--- a/src/com/gitblit/client/GitblitPanel.java
+++ b/src/com/gitblit/client/GitblitPanel.java
@@ -19,23 +19,22 @@
import java.awt.Color;
import java.awt.Component;
import java.awt.Desktop;
-import java.awt.Dimension;
-import java.awt.GridLayout;
+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;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
import java.util.List;
-import java.util.Map;
import javax.swing.JButton;
import javax.swing.JLabel;
-import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
@@ -44,25 +43,17 @@
import javax.swing.JTextField;
import javax.swing.RowFilter;
import javax.swing.SwingConstants;
-import javax.swing.SwingWorker;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumn;
import javax.swing.table.TableRowSorter;
import com.gitblit.Constants.RpcRequest;
-import com.gitblit.GitBlitException.ForbiddenException;
-import com.gitblit.GitBlitException.UnauthorizedException;
-import com.gitblit.IStoredSettings;
-import com.gitblit.Keys;
import com.gitblit.client.ClosableTabComponent.CloseTabListener;
-import com.gitblit.models.FederationModel;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.SettingModel;
import com.gitblit.models.UserModel;
-import com.gitblit.utils.RpcUtils;
import com.gitblit.utils.StringUtils;
/**
@@ -80,27 +71,21 @@
private final Insets insets = new Insets(margin, margin, margin, margin);
- private final String url;
-
- private final String account;
-
- private final char[] password;
-
- private volatile boolean isAdmin;
-
- private volatile List<UserModel> allUsers;
-
- private volatile IStoredSettings settings;
+ private GitblitClient gitblit;
private JTabbedPane tabs;
private JTable repositoriesTable;
- private RepositoriesModel repositoriesModel;
+ private RepositoriesTableModel repositoriesModel;
- private JList usersList;
+ private JTable usersTable;
- private JPanel usersPanel;
+ private UsersTableModel usersModel;
+
+ private JTable settingsTable;
+
+ private SettingsTableModel settingsModel;
private JButton createRepository;
@@ -114,25 +99,37 @@
private DefaultTableCellRenderer sizeRenderer;
- private TableRowSorter<RepositoriesModel> defaultSorter;
+ private TableRowSorter<RepositoriesTableModel> defaultRepositoriesSorter;
- private List<RepositoryModel> allRepositories;
+ private TableRowSorter<UsersTableModel> defaultUsersSorter;
+
+ private TableRowSorter<SettingsTableModel> defaultSettingsSorter;
+
+ private JButton editRepository;
public GitblitPanel(GitblitRegistration reg) {
this(reg.url, reg.account, reg.password);
}
public GitblitPanel(String url, String account, char[] password) {
- this.url = url;
- this.account = account;
- this.password = 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() {
public void actionPerformed(ActionEvent e) {
RepositoryModel model = getSelectedRepositories().get(0);
- String u = MessageFormat.format("{0}/summary/{1}", GitblitPanel.this.url,
+ String u = MessageFormat.format("{0}/summary/{1}", gitblit.url,
StringUtils.encodeURL(model.name));
try {
Desktop.getDesktop().browse(new URI(u));
@@ -145,15 +142,7 @@
JButton refreshRepositories = new JButton(Translation.get("gb.refresh"));
refreshRepositories.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- try {
- refreshRepositoriesTable();
- } catch (ForbiddenException x) {
- explainForbidden(RpcRequest.LIST_REPOSITORIES);
- } catch (UnauthorizedException x) {
- explainUnauthorized(RpcRequest.LIST_REPOSITORIES);
- } catch (Throwable t) {
- showException(t);
- }
+ refreshRepositories();
}
});
@@ -164,7 +153,7 @@
}
});
- final JButton editRepository = new JButton(Translation.get("gb.edit"));
+ editRepository = new JButton(Translation.get("gb.edit"));
editRepository.setEnabled(false);
editRepository.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -180,16 +169,6 @@
}
});
- final JButton cloneRepository = new JButton(Translation.get("gb.clone"));
- cloneRepository.setEnabled(false);
- cloneRepository.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- for (RepositoryModel model : getSelectedRepositories()) {
- System.out.println("TODO Clone " + model);
- }
- }
- });
-
nameRenderer = new NameRenderer();
typeRenderer = new IndicatorsRenderer();
@@ -201,24 +180,18 @@
ownerRenderer.setForeground(Color.gray);
ownerRenderer.setHorizontalAlignment(SwingConstants.CENTER);
- repositoriesModel = new RepositoriesModel();
- defaultSorter = new TableRowSorter<RepositoriesModel>(repositoriesModel);
- repositoriesTable = new JTable(repositoriesModel);
- repositoriesTable.setRowSorter(defaultSorter);
- repositoriesTable.getRowSorter().toggleSortOrder(RepositoriesModel.Columns.Name.ordinal());
-
- repositoriesTable.setCellSelectionEnabled(false);
- repositoriesTable.setRowSelectionAllowed(true);
+ repositoriesModel = new RepositoriesTableModel();
+ defaultRepositoriesSorter = new TableRowSorter<RepositoriesTableModel>(repositoriesModel);
+ repositoriesTable = Utils.newTable(repositoriesModel);
repositoriesTable.setRowHeight(nameRenderer.getFont().getSize() + 8);
- repositoriesTable.getTableHeader().setReorderingAllowed(false);
- repositoriesTable.setGridColor(new Color(0xd9d9d9));
- repositoriesTable.setBackground(Color.white);
- repositoriesTable.setDefaultRenderer(Date.class,
- new DateCellRenderer(null, Color.orange.darker()));
- setRenderer(RepositoriesModel.Columns.Name, nameRenderer);
- setRenderer(RepositoriesModel.Columns.Indicators, typeRenderer);
- setRenderer(RepositoriesModel.Columns.Owner, ownerRenderer);
- setRenderer(RepositoriesModel.Columns.Size, sizeRenderer);
+ repositoriesTable.setRowSorter(defaultRepositoriesSorter);
+ repositoriesTable.getRowSorter().toggleSortOrder(
+ RepositoriesTableModel.Columns.Name.ordinal());
+
+ 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
@@ -230,16 +203,23 @@
boolean selected = repositoriesTable.getSelectedRow() > -1;
browseRepository.setEnabled(singleSelection);
delRepository.setEnabled(selected);
- cloneRepository.setEnabled(selected);
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
- && (isAdmin || model.owner.equalsIgnoreCase(GitblitPanel.this.account)));
+ && (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));
}
}
});
@@ -250,40 +230,58 @@
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(cloneRepository);
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(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) {
- try {
- refreshUsersTable();
- } catch (ForbiddenException x) {
- explainForbidden(RpcRequest.LIST_USERS);
- } catch (UnauthorizedException x) {
- explainUnauthorized(RpcRequest.LIST_USERS);
- } catch (Throwable t) {
- showException(t);
- }
+ refreshUsers();
}
});
@@ -310,117 +308,209 @@
}
});
- usersList = new JList();
- usersList.addListSelectionListener(new ListSelectionListener() {
+ usersModel = new UsersTableModel();
+ defaultUsersSorter = new TableRowSorter<UsersTableModel>(usersModel);
+ usersTable = Utils.newTable(usersModel);
+ 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(UsersTableModel.Columns.Name.ordinal());
+ usersTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) {
if (e.getValueIsAdjusting()) {
return;
}
- boolean selected = usersList.getSelectedIndex() > -1;
- boolean singleSelection = usersList.getSelectedIndices().length == 1;
+ boolean selected = usersTable.getSelectedRow() > -1;
+ boolean singleSelection = usersTable.getSelectedRows().length == 1;
editUser.setEnabled(singleSelection && selected);
delUser.setEnabled(selected);
}
});
- JPanel userControls = new JPanel(new GridLayout(0, 2));
+ usersTable.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent e) {
+ if (e.getClickCount() == 2) {
+ editUser(getSelectedUsers().get(0));
+ }
+ }
+ });
+
+ 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(usersList), 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);
- /*
- * Assemble the main panel
- */
- JPanel mainPanel = new JPanel(new BorderLayout(margin, margin));
- mainPanel.add(repositoriesPanel, BorderLayout.CENTER);
- mainPanel.add(usersPanel, BorderLayout.EAST);
-
- tabs = new JTabbedPane(JTabbedPane.BOTTOM);
- tabs.addTab(Translation.get("gb.repositories"), mainPanel);
- 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() {
+
+ @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 {
- refreshRepositoriesTable();
+ gitblit.login();
- try {
- refreshUsersTable();
- refreshSettings();
- isAdmin = true;
- refreshFederationPanel();
- } catch (ForbiddenException e) {
+ updateRepositoriesTable();
+ Utils.packColumns(repositoriesTable, 2);
+
+ if (gitblit.allowManagement()) {
+ updateUsersTable();
+ } 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 all management/administration tabs
+ tabs.removeTabAt(1);
+ }
+ }
- // remove federation tab
- tabs.removeTabAt(1);
- } catch (IOException e) {
- System.err.println(e.getMessage());
+ 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;
+ }
+ }
}
}
- private void refreshRepositoriesTable() throws IOException {
- Map<String, RepositoryModel> repositories = RpcUtils
- .getRepositories(url, account, password);
- allRepositories = new ArrayList<RepositoryModel>(repositories.values());
- Collections.sort(allRepositories);
+ private void updateRepositoriesTable() {
repositoriesModel.list.clear();
- repositoriesModel.list.addAll(allRepositories);
+ repositoriesModel.list.addAll(gitblit.getRepositories());
repositoriesModel.fireTableDataChanged();
- packColumns(repositoriesTable, 2);
}
- private void setRenderer(RepositoriesModel.Columns col, TableCellRenderer renderer) {
- String name = repositoriesTable.getColumnName(col.ordinal());
- repositoriesTable.getColumn(name).setCellRenderer(renderer);
+ private void updateUsersTable() {
+ usersModel.list.clear();
+ usersModel.list.addAll(gitblit.getUsers());
+ usersModel.fireTableDataChanged();
}
- private void refreshUsersTable() throws IOException {
- allUsers = RpcUtils.getUsers(url, account, password);
- usersList.setListData(allUsers.toArray());
- }
-
- private void refreshSettings() throws IOException {
- settings = RpcUtils.getSettings(url, account, password);
- }
-
- private void refreshFederationPanel() throws IOException {
- List<FederationModel> registrations = RpcUtils.getFederationRegistrations(url, account,
- password);
+ private void updateSettingsTable() {
+ settingsModel.setSettings(gitblit.getSettings());
+ settingsModel.fireTableDataChanged();
}
private void filterRepositories(final String fragment) {
if (StringUtils.isEmpty(fragment)) {
- repositoriesTable.setRowSorter(defaultSorter);
+ 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;
@@ -429,18 +519,58 @@
return false;
}
};
- RepositoriesModel model = (RepositoriesModel) repositoriesTable.getModel();
- TableRowSorter<RepositoriesModel> sorter = new TableRowSorter<RepositoriesModel>(model);
+ TableRowSorter<RepositoriesTableModel> sorter = new TableRowSorter<RepositoriesTableModel>(
+ repositoriesModel);
sorter.setRowFilter(containsFilter);
repositoriesTable.setRowSorter(sorter);
+ }
+
+ private void filterUsers(final String fragment) {
+ if (StringUtils.isEmpty(fragment)) {
+ usersTable.setRowSorter(defaultUsersSorter);
+ return;
+ }
+ 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;
+ }
+ }
+ return false;
+ }
+ };
+ 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() {
List<RepositoryModel> repositories = new ArrayList<RepositoryModel>();
for (int viewRow : repositoriesTable.getSelectedRows()) {
int modelRow = repositoriesTable.convertRowIndexToModel(viewRow);
- RepositoryModel model = ((RepositoriesModel) repositoriesTable.getModel()).list
- .get(modelRow);
+ RepositoryModel model = repositoriesModel.list.get(modelRow);
repositories.add(model);
}
return repositories;
@@ -448,50 +578,12 @@
private List<UserModel> getSelectedUsers() {
List<UserModel> users = new ArrayList<UserModel>();
- for (int viewRow : usersList.getSelectedIndices()) {
- UserModel model = (UserModel) usersList.getModel().getElementAt(viewRow);
+ for (int viewRow : usersTable.getSelectedRows()) {
+ int modelRow = usersTable.convertRowIndexToModel(viewRow);
+ UserModel model = usersModel.list.get(modelRow);
users.add(model);
}
return users;
- }
-
- private void packColumns(JTable table, int margin) {
- for (int c = 0; c < table.getColumnCount(); c++) {
- packColumn(table, c, 4);
- }
- }
-
- // Sets the preferred width of the visible column specified by vColIndex.
- // The column will be just wide enough to show the column head and the
- // widest cell in the column. margin pixels are added to the left and right
- // (resulting in an additional width of 2*margin pixels).
- private void packColumn(JTable table, int vColIndex, int margin) {
- DefaultTableColumnModel colModel = (DefaultTableColumnModel) table.getColumnModel();
- TableColumn col = colModel.getColumn(vColIndex);
- int width = 0;
-
- // Get width of column header
- TableCellRenderer renderer = col.getHeaderRenderer();
- if (renderer == null) {
- renderer = table.getTableHeader().getDefaultRenderer();
- }
- Component comp = renderer.getTableCellRendererComponent(table, col.getHeaderValue(), false,
- false, 0, 0);
- width = comp.getPreferredSize().width;
-
- // Get maximum width of column data
- for (int r = 0; r < table.getRowCount(); r++) {
- renderer = table.getCellRenderer(r, vColIndex);
- comp = renderer.getTableCellRendererComponent(table, table.getValueAt(r, vColIndex),
- false, false, r, vColIndex);
- width = Math.max(width, comp.getPreferredSize().width);
- }
-
- // Add margin
- width += 2 * margin;
-
- // Set the width
- col.setPreferredWidth(width);
}
@Override
@@ -500,15 +592,24 @@
}
@Override
- public Dimension getPreferredSize() {
- if (isAdmin) {
- return new Dimension(950, 550);
- }
- return new Dimension(775, 450);
+ public void closeTab(Component c) {
+ gitblit = null;
}
- @Override
- public void closeTab(Component c) {
+ protected void refreshRepositories() {
+ GitblitWorker worker = new GitblitWorker(GitblitPanel.this, RpcRequest.LIST_REPOSITORIES) {
+ @Override
+ protected Boolean doRequest() throws IOException {
+ gitblit.refreshRepositories();
+ return true;
+ }
+
+ @Override
+ protected void onSuccess() {
+ updateRepositoriesTable();
+ }
+ };
+ worker.execute();
}
/**
@@ -517,14 +618,10 @@
*
*/
protected void createRepository() {
- List<String> usernames = new ArrayList<String>();
- for (UserModel user : this.allUsers) {
- usernames.add(user.username);
- }
- Collections.sort(usernames);
EditRepositoryDialog dialog = new EditRepositoryDialog();
- dialog.setUsers(null, usernames, null);
- dialog.setRepositories(allRepositories);
+ dialog.setLocationRelativeTo(GitblitPanel.this);
+ dialog.setUsers(null, gitblit.getUsernames(), null);
+ dialog.setRepositories(gitblit.getRepositories());
dialog.setVisible(true);
final RepositoryModel newRepository = dialog.getRepository();
final List<String> permittedUsers = dialog.getPermittedUsers();
@@ -532,44 +629,30 @@
return;
}
- final RpcRequest request = RpcRequest.CREATE_REPOSITORY;
- SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.CREATE_REPOSITORY) {
@Override
- protected Boolean doInBackground() throws IOException {
- boolean success = true;
- success &= RpcUtils.createRepository(newRepository, url, account, password);
- if (permittedUsers.size() > 0) {
- // if new repository has named members, set them
- success &= RpcUtils.setRepositoryMembers(newRepository, permittedUsers, url,
- account, password);
+ protected Boolean doRequest() throws IOException {
+ boolean success = gitblit.createRepository(newRepository, permittedUsers);
+ if (success) {
+ gitblit.refreshRepositories();
+ if (permittedUsers.size() > 0) {
+ gitblit.refreshUsers();
+ }
}
return success;
}
@Override
- protected void done() {
- try {
- boolean success = get();
- if (success) {
- refreshRepositoriesTable();
- if (permittedUsers.size() > 0) {
- refreshUsersTable();
- }
- } else {
- String msg = MessageFormat.format(
- "Failed to execute request \"{0}\" for repository \"{1}\".",
- request.name(), newRepository.name);
- JOptionPane.showMessageDialog(GitblitPanel.this, msg,
- Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
- }
- } catch (ForbiddenException e) {
- explainForbidden(request);
- } catch (UnauthorizedException e) {
- explainUnauthorized(request);
- } catch (Throwable t) {
- showException(t);
- }
+ protected void onSuccess() {
+ updateRepositoriesTable();
+ updateUsersTable();
+ }
+
+ @Override
+ protected void onFailure() {
+ showFailure("Failed to execute request \"{0}\" for repository \"{1}\".",
+ getRequestType(), newRepository.name);
}
};
worker.execute();
@@ -583,18 +666,12 @@
*/
protected void editRepository(final RepositoryModel repository) {
EditRepositoryDialog dialog = new EditRepositoryDialog(repository);
- List<String> members = new ArrayList<String>();
- List<String> usernames = new ArrayList<String>();
- for (UserModel user : this.allUsers) {
- usernames.add(user.username);
- if (user.repositories.contains(repository.name)) {
- members.add(user.username);
- }
- }
- Collections.sort(usernames);
+ dialog.setLocationRelativeTo(GitblitPanel.this);
+ List<String> usernames = gitblit.getUsernames();
+ List<String> members = gitblit.getPermittedUsernames(repository);
dialog.setUsers(repository.owner, usernames, members);
- dialog.setFederationSets(settings.getStrings(Keys.federation.sets),
- repository.federationSets);
+ dialog.setRepositories(gitblit.getRepositories());
+ dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets);
dialog.setVisible(true);
final RepositoryModel revisedRepository = dialog.getRepository();
final List<String> permittedUsers = dialog.getPermittedUsers();
@@ -602,41 +679,29 @@
return;
}
- final RpcRequest request = RpcRequest.EDIT_REPOSITORY;
- SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.EDIT_REPOSITORY) {
@Override
- protected Boolean doInBackground() throws IOException {
- boolean success = true;
- success &= RpcUtils.updateRepository(repository.name, revisedRepository, url,
- account, password);
- // always set the repository members
- success &= RpcUtils.setRepositoryMembers(repository, permittedUsers, url, account,
- password);
+ protected Boolean doRequest() throws IOException {
+ boolean success = gitblit.updateRepository(repository.name, revisedRepository,
+ permittedUsers);
+ if (success) {
+ gitblit.refreshRepositories();
+ gitblit.refreshUsers();
+ }
return success;
}
@Override
- protected void done() {
- try {
- boolean success = get();
- if (success) {
- refreshRepositoriesTable();
- refreshUsersTable();
- } else {
- String msg = MessageFormat.format(
- "Failed to execute request \"{0}\" for repository \"{1}\".",
- request.name(), repository.name);
- JOptionPane.showMessageDialog(GitblitPanel.this, msg,
- Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
- }
- } catch (ForbiddenException e) {
- explainForbidden(request);
- } catch (UnauthorizedException e) {
- explainUnauthorized(request);
- } catch (Throwable t) {
- showException(t);
- }
+ protected void onSuccess() {
+ updateRepositoriesTable();
+ updateUsersTable();
+ }
+
+ @Override
+ protected void onFailure() {
+ showFailure("Failed to execute request \"{0}\" for repository \"{1}\".",
+ getRequestType(), repository.name);
}
};
worker.execute();
@@ -653,39 +718,49 @@
int result = JOptionPane.showConfirmDialog(GitblitPanel.this, message.toString(),
"Delete Repositories?", JOptionPane.YES_NO_OPTION);
if (result == JOptionPane.YES_OPTION) {
- final RpcRequest request = RpcRequest.DELETE_REPOSITORY;
- SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.DELETE_REPOSITORY) {
@Override
- protected Boolean doInBackground() throws Exception {
+ protected Boolean doRequest() throws IOException {
boolean success = true;
for (RepositoryModel repository : repositories) {
- success &= RpcUtils.deleteRepository(repository, url, account, password);
+ success &= gitblit.deleteRepository(repository);
+ }
+ if (success) {
+ gitblit.refreshRepositories();
+ gitblit.refreshUsers();
}
return success;
}
@Override
- protected void done() {
- try {
- boolean success = get();
- if (success) {
- refreshRepositoriesTable();
- } else {
- String msg = "Failed to delete specified repositories!";
- JOptionPane.showMessageDialog(GitblitPanel.this, msg,
- Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
- }
- } catch (ForbiddenException e) {
- explainForbidden(request);
- } catch (UnauthorizedException e) {
- explainUnauthorized(request);
- } catch (Throwable t) {
- showException(t);
- }
+ protected void onSuccess() {
+ updateRepositoriesTable();
+ updateUsersTable();
+ }
+
+ @Override
+ protected void onFailure() {
+ showFailure("Failed to delete specified repositories!");
}
};
worker.execute();
}
+ }
+
+ protected void refreshUsers() {
+ GitblitWorker worker = new GitblitWorker(GitblitPanel.this, RpcRequest.LIST_USERS) {
+ @Override
+ protected Boolean doRequest() throws IOException {
+ gitblit.refreshUsers();
+ return true;
+ }
+
+ @Override
+ protected void onSuccess() {
+ updateUsersTable();
+ }
+ };
+ worker.execute();
}
/**
@@ -694,43 +769,36 @@
*
*/
protected void createUser() {
- EditUserDialog dialog = new EditUserDialog(settings);
- dialog.setUsers(allUsers);
- dialog.setRepositories(allRepositories, null);
+ EditUserDialog dialog = new EditUserDialog(gitblit.getSettings());
+ dialog.setLocationRelativeTo(GitblitPanel.this);
+ dialog.setUsers(gitblit.getUsers());
+ dialog.setRepositories(gitblit.getRepositories(), null);
dialog.setVisible(true);
final UserModel newUser = dialog.getUser();
if (newUser == null) {
return;
}
- final RpcRequest request = RpcRequest.CREATE_USER;
- SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.CREATE_USER) {
@Override
- protected Boolean doInBackground() throws IOException {
- return RpcUtils.createUser(newUser, url, account, password);
+ protected Boolean doRequest() throws IOException {
+ boolean success = gitblit.createUser(newUser);
+ if (success) {
+ gitblit.refreshUsers();
+ }
+ return success;
}
@Override
- protected void done() {
- try {
- boolean success = get();
- if (success) {
- refreshUsersTable();
- } else {
- String msg = MessageFormat.format(
- "Failed to execute request \"{0}\" for user \"{1}\".",
- request.name(), newUser.username);
- JOptionPane.showMessageDialog(GitblitPanel.this, msg,
- Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
- }
- } catch (ForbiddenException e) {
- explainForbidden(request);
- } catch (UnauthorizedException e) {
- explainUnauthorized(request);
- } catch (Throwable t) {
- showException(t);
- }
+ protected void onSuccess() {
+ updateUsersTable();
+ }
+
+ @Override
+ protected void onFailure() {
+ showFailure("Failed to execute request \"{0}\" for user \"{1}\".",
+ getRequestType(), newUser.username);
}
};
worker.execute();
@@ -743,42 +811,35 @@
* @param user
*/
protected void editUser(final UserModel user) {
- EditUserDialog dialog = new EditUserDialog(user, settings);
- dialog.setRepositories(allRepositories, new ArrayList<String>(user.repositories));
+ 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();
if (revisedUser == null) {
return;
}
- final RpcRequest request = RpcRequest.EDIT_USER;
- SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
-
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.EDIT_USER) {
@Override
- protected Boolean doInBackground() throws IOException {
- return RpcUtils.updateUser(user.username, revisedUser, url, account, password);
+ protected Boolean doRequest() throws IOException {
+ boolean success = gitblit.updateUser(user.username, revisedUser);
+ if (success) {
+ gitblit.refreshUsers();
+ }
+ return success;
}
@Override
- protected void done() {
- try {
- boolean success = get();
- if (success) {
- refreshUsersTable();
- } else {
- String msg = MessageFormat.format(
- "Failed to execute request \"{0}\" for user \"{1}\".",
- request.name(), user.username);
- JOptionPane.showMessageDialog(GitblitPanel.this, msg,
- Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
- }
- } catch (ForbiddenException e) {
- explainForbidden(request);
- } catch (UnauthorizedException e) {
- explainUnauthorized(request);
- } catch (Throwable t) {
- showException(t);
- }
+ protected void onSuccess() {
+ updateUsersTable();
+ }
+
+ @Override
+ protected void onFailure() {
+ showFailure("Failed to execute request \"{0}\" for user \"{1}\".",
+ getRequestType(), user.username);
}
};
worker.execute();
@@ -795,58 +856,30 @@
int result = JOptionPane.showConfirmDialog(GitblitPanel.this, message.toString(),
"Delete Users?", JOptionPane.YES_NO_OPTION);
if (result == JOptionPane.YES_OPTION) {
- final RpcRequest request = RpcRequest.DELETE_USER;
- SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.DELETE_USER) {
@Override
- protected Boolean doInBackground() throws Exception {
+ protected Boolean doRequest() throws IOException {
boolean success = true;
for (UserModel user : users) {
- success &= RpcUtils.deleteUser(user, url, account, password);
+ success &= gitblit.deleteUser(user);
+ }
+ if (success) {
+ gitblit.refreshUsers();
}
return success;
}
@Override
- protected void done() {
- try {
- boolean success = get();
- if (success) {
- refreshUsersTable();
- } else {
- String msg = "Failed to delete specified users!";
- JOptionPane.showMessageDialog(GitblitPanel.this, msg,
- Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
- }
- } catch (ForbiddenException e) {
- explainForbidden(request);
- } catch (UnauthorizedException e) {
- explainUnauthorized(request);
- } catch (Throwable t) {
- showException(t);
- }
+ protected void onSuccess() {
+ updateUsersTable();
+ }
+
+ @Override
+ protected void onFailure() {
+ showFailure("Failed to delete specified users!");
}
};
worker.execute();
}
}
-
- private void explainForbidden(RpcRequest request) {
- String msg = MessageFormat.format(
- "The request \"{0}\" has been forbidden by the Gitblit server @ {1}.",
- request.name(), url);
- JOptionPane.showMessageDialog(GitblitPanel.this, msg, "Forbidden",
- JOptionPane.ERROR_MESSAGE);
- }
-
- private void explainUnauthorized(RpcRequest request) {
- String msg = MessageFormat.format(
- "The account \"{0}\" is not authorized to execute the request \"{1}\".", account,
- request.name());
- JOptionPane.showMessageDialog(GitblitPanel.this, msg, "Unauthorized",
- JOptionPane.ERROR_MESSAGE);
- }
-
- private void showException(Throwable t) {
- // TODO show the unexpected exception
- }
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1