From 17820f3a1153250a325fed23dfc2da59ce6ba777 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 31 Oct 2011 22:47:21 -0400
Subject: [PATCH] More feeds work in Manager
---
src/com/gitblit/client/GitblitPanel.java | 363 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 332 insertions(+), 31 deletions(-)
diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/com/gitblit/client/GitblitPanel.java
index a9d7b46..64e85ea 100644
--- a/src/com/gitblit/client/GitblitPanel.java
+++ b/src/com/gitblit/client/GitblitPanel.java
@@ -19,7 +19,9 @@
import java.awt.Color;
import java.awt.Component;
import java.awt.Desktop;
+import java.awt.Dimension;
import java.awt.FlowLayout;
+import java.awt.GridLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -31,8 +33,11 @@
import java.net.URI;
import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
@@ -51,8 +56,10 @@
import com.gitblit.Constants.RpcRequest;
import com.gitblit.client.ClosableTabComponent.CloseTabListener;
+import com.gitblit.models.FeedModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.SettingModel;
+import com.gitblit.models.SyndicatedEntryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
@@ -70,6 +77,8 @@
private final int margin = 5;
private final Insets insets = new Insets(margin, margin, margin, margin);
+
+ private final RegistrationsDialog.RegistrationListener listener;
private GitblitClient gitblit;
@@ -91,14 +100,6 @@
private JButton delRepository;
- private NameRenderer nameRenderer;
-
- private IndicatorsRenderer typeRenderer;
-
- private DefaultTableCellRenderer ownerRenderer;
-
- private DefaultTableCellRenderer sizeRenderer;
-
private TableRowSorter<RepositoriesTableModel> defaultRepositoriesSorter;
private TableRowSorter<UsersTableModel> defaultUsersSorter;
@@ -113,17 +114,24 @@
private HeaderPanel settingsHeader;
- public GitblitPanel(GitblitRegistration reg) {
- this(reg.url, reg.account, reg.password);
- }
+ private StatusPanel statusPanel;
- public GitblitPanel(String url, String account, char[] password) {
- this.gitblit = new GitblitClient(url, account, password);
+ private SyndicatedEntryTableModel syndicationModel;
+
+ private HeaderPanel feedsHeader;
+
+ private JTable syndicationEntriesTable;
+
+ public GitblitPanel(GitblitRegistration reg, RegistrationsDialog.RegistrationListener listener) {
+ this.gitblit = new GitblitClient(reg);
+ this.listener = listener;
tabs = new JTabbedPane(JTabbedPane.BOTTOM);
tabs.addTab(Translation.get("gb.repositories"), createRepositoriesPanel());
+ tabs.addTab(Translation.get("gb.recentActivity"), createFeedsPanel());
tabs.addTab(Translation.get("gb.users"), createUsersPanel());
tabs.addTab(Translation.get("gb.settings"), createSettingsPanel());
+ tabs.addTab(Translation.get("gb.status"), createStatusPanel());
setLayout(new BorderLayout());
add(tabs, BorderLayout.CENTER);
@@ -175,20 +183,29 @@
}
});
- nameRenderer = new NameRenderer();
- typeRenderer = new IndicatorsRenderer();
+ final JButton subscribeRepository = new JButton(Translation.get("gb.subscribe") + "...");
+ subscribeRepository.setEnabled(false);
+ subscribeRepository.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ List<FeedModel> feeds = gitblit.getAvailableFeeds(getSelectedRepositories().get(0));
+ subscribeFeeds(feeds);
+ }
+ });
- sizeRenderer = new DefaultTableCellRenderer();
+ SubscribedRepositoryRenderer nameRenderer = new SubscribedRepositoryRenderer(gitblit);
+ IndicatorsRenderer typeRenderer = new IndicatorsRenderer();
+
+ DefaultTableCellRenderer sizeRenderer = new DefaultTableCellRenderer();
sizeRenderer.setHorizontalAlignment(SwingConstants.RIGHT);
sizeRenderer.setForeground(new Color(0, 0x80, 0));
- ownerRenderer = new DefaultTableCellRenderer();
+ DefaultTableCellRenderer ownerRenderer = new DefaultTableCellRenderer();
ownerRenderer.setForeground(Color.gray);
ownerRenderer.setHorizontalAlignment(SwingConstants.CENTER);
repositoriesModel = new RepositoriesTableModel();
defaultRepositoriesSorter = new TableRowSorter<RepositoriesTableModel>(repositoriesModel);
- repositoriesTable = Utils.newTable(repositoriesModel);
+ repositoriesTable = Utils.newTable(repositoriesModel, Utils.DATE_FORMAT);
repositoriesTable.setRowHeight(nameRenderer.getFont().getSize() + 8);
repositoriesTable.setRowSorter(defaultRepositoriesSorter);
repositoriesTable.getRowSorter().toggleSortOrder(
@@ -209,6 +226,7 @@
boolean selected = repositoriesTable.getSelectedRow() > -1;
browseRepository.setEnabled(singleSelection);
delRepository.setEnabled(selected);
+ subscribeRepository.setEnabled(singleSelection);
if (selected) {
int viewRow = repositoriesTable.getSelectedRow();
int modelRow = repositoriesTable.convertRowIndexToModel(viewRow);
@@ -256,6 +274,7 @@
repositoryControls.add(createRepository);
repositoryControls.add(editRepository);
repositoryControls.add(delRepository);
+ repositoryControls.add(subscribeRepository);
JPanel repositoriesPanel = new JPanel(new BorderLayout(margin, margin)) {
@@ -282,6 +301,109 @@
repositoriesTable.getColumn(name).setMinWidth(maxWidth);
repositoriesTable.getColumn(name).setMaxWidth(maxWidth);
}
+ }
+
+ private JPanel createFeedsPanel() {
+ JButton refreshFeeds = new JButton(Translation.get("gb.refresh"));
+ refreshFeeds.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ refreshFeeds();
+ }
+ });
+
+ final JButton viewCommit = new JButton(Translation.get("gb.view"));
+ viewCommit.setEnabled(false);
+ viewCommit.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ viewCommit();
+ }
+ });
+
+ final JButton viewCommitDiff = new JButton(Translation.get("gb.commitdiff"));
+ viewCommitDiff.setEnabled(false);
+ viewCommitDiff.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ viewCommitDiff();
+ }
+ });
+
+ final JButton viewTree = new JButton(Translation.get("gb.tree"));
+ viewTree.setEnabled(false);
+ viewTree.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ viewTree();
+ }
+ });
+
+ JButton subscribeFeeds = new JButton(Translation.get("gb.subscribe") + "...");
+ subscribeFeeds.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ subscribeFeeds(gitblit.getAvailableFeeds());
+ }
+ });
+
+ JPanel controls = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
+ controls.add(refreshFeeds);
+ controls.add(subscribeFeeds);
+ controls.add(viewCommit);
+ controls.add(viewCommitDiff);
+ controls.add(viewTree);
+
+ NameRenderer nameRenderer = new NameRenderer();
+ syndicationModel = new SyndicatedEntryTableModel();
+ feedsHeader = new HeaderPanel(Translation.get("gb.recentActivity"), "feed_16x16.png");
+ syndicationEntriesTable = Utils.newTable(syndicationModel, Utils.DATE_FORMAT);
+ String name = syndicationEntriesTable
+ .getColumnName(SyndicatedEntryTableModel.Columns.Author.ordinal());
+ syndicationEntriesTable.setRowHeight(nameRenderer.getFont().getSize() + 8);
+ syndicationEntriesTable.getColumn(name).setCellRenderer(nameRenderer);
+ name = syndicationEntriesTable.getColumnName(SyndicatedEntryTableModel.Columns.Repository
+ .ordinal());
+ syndicationEntriesTable.getColumn(name).setCellRenderer(nameRenderer);
+
+ name = syndicationEntriesTable.getColumnName(SyndicatedEntryTableModel.Columns.Branch
+ .ordinal());
+ syndicationEntriesTable.getColumn(name).setCellRenderer(nameRenderer);
+
+ syndicationEntriesTable.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent e) {
+ if (e.getClickCount() == 2) {
+ if (e.isControlDown()) {
+ viewCommitDiff();
+ } else {
+ viewCommit();
+ }
+ }
+ }
+ });
+
+ syndicationEntriesTable.getSelectionModel().addListSelectionListener(
+ new ListSelectionListener() {
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ if (e.getValueIsAdjusting()) {
+ return;
+ }
+ boolean singleSelection = syndicationEntriesTable.getSelectedRowCount() == 1;
+ viewCommit.setEnabled(singleSelection);
+ viewCommitDiff.setEnabled(singleSelection);
+ viewTree.setEnabled(singleSelection);
+ }
+ });
+
+ JPanel panel = new JPanel(new BorderLayout(5, 5)) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Insets getInsets() {
+ return insets;
+ }
+ };
+ panel.add(feedsHeader, BorderLayout.NORTH);
+ panel.add(new JScrollPane(syndicationEntriesTable), BorderLayout.CENTER);
+ panel.add(controls, BorderLayout.SOUTH);
+ return panel;
}
private JPanel createUsersPanel() {
@@ -315,9 +437,10 @@
}
});
+ NameRenderer nameRenderer = new NameRenderer();
usersModel = new UsersTableModel();
defaultUsersSorter = new TableRowSorter<UsersTableModel>(usersModel);
- usersTable = Utils.newTable(usersModel);
+ usersTable = Utils.newTable(usersModel, Utils.DATE_FORMAT);
String name = usersTable.getColumnName(UsersTableModel.Columns.Name.ordinal());
usersTable.setRowHeight(nameRenderer.getFont().getSize() + 8);
usersTable.getColumn(name).setCellRenderer(nameRenderer);
@@ -395,10 +518,22 @@
}
});
+ final JButton editSetting = new JButton(Translation.get("gb.edit"));
+ editSetting.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ int viewRow = settingsTable.getSelectedRow();
+ int modelRow = settingsTable.convertRowIndexToModel(viewRow);
+ String key = settingsModel.keys.get(modelRow);
+ SettingModel setting = settingsModel.settings.get(key);
+ editSetting(setting);
+ }
+ });
+
+ NameRenderer nameRenderer = new NameRenderer();
final SettingPanel settingPanel = new SettingPanel();
settingsModel = new SettingsTableModel();
defaultSettingsSorter = new TableRowSorter<SettingsTableModel>(settingsModel);
- settingsTable = Utils.newTable(settingsModel);
+ settingsTable = Utils.newTable(settingsModel, Utils.DATE_FORMAT);
settingsTable.setDefaultRenderer(SettingModel.class, new SettingCellRenderer());
String name = settingsTable.getColumnName(UsersTableModel.Columns.Name.ordinal());
settingsTable.setRowHeight(nameRenderer.getFont().getSize() + 8);
@@ -412,9 +547,8 @@
if (e.getValueIsAdjusting()) {
return;
}
- boolean selected = settingsTable.getSelectedRow() > -1;
boolean singleSelection = settingsTable.getSelectedRows().length == 1;
- // TODO enable/disable setting buttons
+ editSetting.setEnabled(singleSelection);
if (singleSelection) {
int viewRow = settingsTable.getSelectedRow();
int modelRow = settingsTable.convertRowIndexToModel(viewRow);
@@ -449,7 +583,7 @@
JPanel settingsControls = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
settingsControls.add(refreshSettings);
- // TODO update setting?
+ settingsControls.add(editSetting);
JPanel settingsPanel = new JPanel(new BorderLayout(margin, margin)) {
@@ -467,11 +601,32 @@
return settingsPanel;
}
+ private JPanel createStatusPanel() {
+ JButton refreshStatus = new JButton(Translation.get("gb.refresh"));
+ refreshStatus.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ refreshStatus();
+ }
+ });
+
+ JPanel controls = new JPanel();
+ controls.add(refreshStatus);
+
+ JPanel panel = new JPanel(new BorderLayout());
+ statusPanel = new StatusPanel();
+ panel.add(statusPanel, BorderLayout.CENTER);
+ panel.add(controls, BorderLayout.SOUTH);
+ return panel;
+ }
+
public void login() throws IOException {
gitblit.login();
updateRepositoriesTable();
- Utils.packColumns(repositoriesTable, 2);
+ Utils.packColumns(repositoriesTable, 5);
+
+ updateFeedsTable();
+ Utils.packColumns(syndicationEntriesTable, 5);
if (gitblit.allowManagement()) {
updateUsersTable();
@@ -482,21 +637,25 @@
editRepository.setVisible(false);
delRepository.setVisible(false);
- while (tabs.getTabCount() > 1) {
+ while (tabs.getTabCount() > 2) {
// remove all management/administration tabs
- tabs.removeTabAt(1);
+ tabs.removeTabAt(2);
}
}
if (gitblit.allowAdministration()) {
updateSettingsTable();
+ updateStatusPanel();
+ Utils.packColumns(settingsTable, 5);
} 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;
+ String[] titles = { Translation.get("gb.settings"), Translation.get("gb.status") };
+ for (String title : titles) {
+ for (int i = 0; i < tabs.getTabCount(); i++) {
+ if (tabs.getTitleAt(i).equals(title)) {
+ tabs.removeTabAt(i);
+ break;
+ }
}
}
}
@@ -510,6 +669,14 @@
+ gitblit.getRepositories().size() + ")");
}
+ private void updateFeedsTable() {
+ syndicationModel.entries.clear();
+ syndicationModel.entries.addAll(gitblit.getSyndicatedEntries());
+ syndicationModel.fireTableDataChanged();
+ feedsHeader.setText(Translation.get("gb.recentActivity") + " ("
+ + gitblit.getSyndicatedEntries().size() + ")");
+ }
+
private void updateUsersTable() {
usersModel.list.clear();
usersModel.list.addAll(gitblit.getUsers());
@@ -521,6 +688,10 @@
settingsModel.setSettings(gitblit.getSettings());
settingsModel.fireTableDataChanged();
settingsHeader.setText(Translation.get("gb.settings"));
+ }
+
+ private void updateStatusPanel() {
+ statusPanel.setStatus(gitblit.url, gitblit.getStatus());
}
private void filterRepositories(final String fragment) {
@@ -641,6 +812,7 @@
dialog.setLocationRelativeTo(GitblitPanel.this);
dialog.setUsers(null, gitblit.getUsernames(), null);
dialog.setRepositories(gitblit.getRepositories());
+ dialog.setFederationSets(gitblit.getFederationSets(), null);
dialog.setVisible(true);
final RepositoryModel newRepository = dialog.getRepository();
final List<String> permittedUsers = dialog.getPermittedUsers();
@@ -763,6 +935,70 @@
}
};
worker.execute();
+ }
+ }
+
+ protected void subscribeFeeds(final List<FeedModel> feeds) {
+ SubscriptionsDialog dialog = new SubscriptionsDialog(feeds) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void save() {
+ gitblit.updateSubscribedFeeds(feeds);
+ listener.saveRegistration(gitblit.reg.name, gitblit.reg);
+ setVisible(false);
+ updateRepositoriesTable();
+ }
+ };
+ dialog.setLocationRelativeTo(GitblitPanel.this);
+ dialog.setVisible(true);
+ }
+
+ protected void refreshFeeds() {
+ // TODO change request type here
+ GitblitWorker worker = new GitblitWorker(GitblitPanel.this, RpcRequest.LIST_USERS) {
+ @Override
+ protected Boolean doRequest() throws IOException {
+ gitblit.refreshSubscribedFeeds();
+ return true;
+ }
+
+ @Override
+ protected void onSuccess() {
+ updateFeedsTable();
+ }
+ };
+ worker.execute();
+ }
+
+ protected SyndicatedEntryModel getSelectedSyndicatedEntry() {
+ int viewRow = syndicationEntriesTable.getSelectedRow();
+ int modelRow = syndicationEntriesTable.convertRowIndexToModel(viewRow);
+ SyndicatedEntryModel entry = syndicationModel.get(modelRow);
+ return entry;
+ }
+
+ protected void viewCommit() {
+ SyndicatedEntryModel entry = getSelectedSyndicatedEntry();
+ browse(entry.link);
+ }
+
+ protected void viewCommitDiff() {
+ SyndicatedEntryModel entry = getSelectedSyndicatedEntry();
+ browse(entry.link.replace("/commit/", "/commitdiff/"));
+ }
+
+ protected void viewTree() {
+ SyndicatedEntryModel entry = getSelectedSyndicatedEntry();
+ browse(entry.link.replace("/commit/", "/tree/"));
+ }
+
+ protected void browse(String url) {
+ try {
+ Desktop.getDesktop().browse(new URI(url));
+ } catch (Exception x) {
+ x.printStackTrace();
}
}
@@ -917,4 +1153,69 @@
};
worker.execute();
}
+
+ protected void refreshStatus() {
+ GitblitWorker worker = new GitblitWorker(GitblitPanel.this, RpcRequest.LIST_STATUS) {
+ @Override
+ protected Boolean doRequest() throws IOException {
+ gitblit.refreshStatus();
+ return true;
+ }
+
+ @Override
+ protected void onSuccess() {
+ updateStatusPanel();
+ }
+ };
+ worker.execute();
+ }
+
+ protected void editSetting(final SettingModel settingModel) {
+ final JTextField textField = new JTextField(settingModel.currentValue);
+ JPanel editPanel = new JPanel(new GridLayout(0, 1));
+ editPanel.add(new JLabel("New Value"));
+ editPanel.add(textField);
+
+ JPanel settingPanel = new JPanel(new BorderLayout());
+ settingPanel.add(new SettingPanel(settingModel), BorderLayout.CENTER);
+ settingPanel.add(editPanel, BorderLayout.SOUTH);
+ settingPanel.setPreferredSize(new Dimension(800, 200));
+
+ String[] options;
+ if (settingModel.currentValue.equals(settingModel.defaultValue)) {
+ options = new String[] { Translation.get("gb.cancel"), Translation.get("gb.save") };
+ } else {
+ options = new String[] { Translation.get("gb.cancel"),
+ Translation.get("gb.setDefault"), Translation.get("gb.save") };
+ }
+ String defaultOption = options[0];
+ int selection = JOptionPane.showOptionDialog(GitblitPanel.this, settingPanel,
+ settingModel.name, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE,
+ new ImageIcon(getClass().getResource("/settings_16x16.png")), options,
+ defaultOption);
+ if (selection <= 0) {
+ return;
+ }
+ if (options[selection].equals(Translation.get("gb.setDefault"))) {
+ textField.setText(settingModel.defaultValue);
+ }
+ final Map<String, String> newSettings = new HashMap<String, String>();
+ newSettings.put(settingModel.name, textField.getText().trim());
+ GitblitWorker worker = new GitblitWorker(GitblitPanel.this, RpcRequest.EDIT_SETTINGS) {
+ @Override
+ protected Boolean doRequest() throws IOException {
+ boolean success = gitblit.updateSettings(newSettings);
+ if (success) {
+ gitblit.refreshSettings();
+ }
+ return success;
+ }
+
+ @Override
+ protected void onSuccess() {
+ updateSettingsTable();
+ }
+ };
+ worker.execute();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1