From fc42a53629eee92eb4155326841a270907640209 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Oct 2011 17:48:48 -0400
Subject: [PATCH] Documentation and some .gitignore updates
---
src/com/gitblit/client/GitblitPanel.java | 206 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 177 insertions(+), 29 deletions(-)
diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/com/gitblit/client/GitblitPanel.java
index 3e2cb7a..8635b00 100644
--- a/src/com/gitblit/client/GitblitPanel.java
+++ b/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;
@@ -79,6 +83,10 @@
private UsersModel usersModel;
+ private JTable settingsTable;
+
+ private SettingsModel settingsModel;
+
private JButton createRepository;
private JButton delRepository;
@@ -95,6 +103,8 @@
private TableRowSorter<UsersModel> defaultUsersSorter;
+ private TableRowSorter<SettingsModel> defaultSettingsSorter;
+
private JButton editRepository;
public GitblitPanel(GitblitRegistration reg) {
@@ -104,6 +114,16 @@
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.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
@@ -195,6 +215,14 @@
}
});
+ repositoriesTable.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent e) {
+ if (e.getClickCount() == 2 && gitblit.allowAdmin()) {
+ editRepository(getSelectedRepositories().get(0));
+ }
+ }
+ });
+
final JTextField repositoryFilter = new JTextField();
repositoryFilter.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -215,19 +243,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(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) {
@@ -280,6 +329,14 @@
}
});
+ 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) {
@@ -300,38 +357,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 SettingsModel();
+ defaultSettingsSorter = new TableRowSorter<SettingsModel>(settingsModel);
+ settingsTable = Utils.newTable(settingsModel);
+ settingsTable.setDefaultRenderer(SettingModel.class, new SettingCellRenderer());
+ 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
+ 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 {
@@ -342,6 +459,7 @@
if (gitblit.allowAdmin()) {
updateUsersTable();
+ updateSettingsTable();
} else {
// user does not have administrator privileges
// hide admin repository buttons
@@ -366,6 +484,11 @@
usersModel.list.clear();
usersModel.list.addAll(gitblit.getUsers());
usersModel.fireTableDataChanged();
+ }
+
+ private void updateSettingsTable() {
+ settingsModel.setSettings(gitblit.getSettings());
+ settingsModel.fireTableDataChanged();
}
private void filterRepositories(final String fragment) {
@@ -407,6 +530,26 @@
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() {
@@ -462,6 +605,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,6 +652,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);
@@ -566,6 +711,7 @@
success &= gitblit.deleteRepository(repository);
}
if (success) {
+ gitblit.refreshRepositories();
gitblit.refreshUsers();
}
return success;
@@ -609,6 +755,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 +797,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();
--
Gitblit v1.9.1