From dfc4ece4083bbbb98f55291d05e7d2b1513464b7 Mon Sep 17 00:00:00 2001
From: Thomas Pummer <dev@nullpointer.at>
Date: Fri, 22 Feb 2013 11:10:11 -0500
Subject: [PATCH] the display-name in web.xml now shows the actual version of Gitblit
---
src/com/gitblit/client/GitblitPanel.java | 550 +++++++++++++++---------------------------------------
1 files changed, 155 insertions(+), 395 deletions(-)
diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/com/gitblit/client/GitblitPanel.java
index 5482593..f14ce79 100644
--- a/src/com/gitblit/client/GitblitPanel.java
+++ b/src/com/gitblit/client/GitblitPanel.java
@@ -16,50 +16,21 @@
package com.gitblit.client;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Component;
-import java.awt.Desktop;
-import java.awt.Dimension;
import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.io.IOException;
-import java.net.URI;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-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.JPanel;
-import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.RowFilter;
-import javax.swing.SwingConstants;
-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 javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
-import com.gitblit.GitBlitException.ForbiddenException;
import com.gitblit.client.ClosableTabComponent.CloseTabListener;
-import com.gitblit.models.FederationModel;
-import com.gitblit.models.RepositoryModel;
-import com.gitblit.models.UserModel;
-import com.gitblit.utils.RpcUtils;
-import com.gitblit.utils.StringUtils;
+import com.gitblit.models.FeedModel;
/**
- * GitblitPanel performs the login, all business logic, and contains all widgets
- * to represent the state of a repository for the given account credentials.
+ * GitblitPanel is a container for the repository, users, settings, etc panels.
*
* @author James Moger
*
@@ -68,401 +39,190 @@
private static final long serialVersionUID = 1L;
- private final int margin = 5;
+ private final RegistrationsDialog.RegistrationListener listener;
- private final Insets insets = new Insets(margin, margin, margin, margin);
-
- private String url;
-
- private String account;
-
- private char[] password;
-
- private boolean isAdmin;
+ private GitblitClient gitblit;
private JTabbedPane tabs;
- private JTable repositoriesTable;
+ private RepositoriesPanel repositoriesPanel;
- private RepositoriesModel repositoriesModel;
+ private FeedsPanel feedsPanel;
- private JList usersList;
+ private UsersPanel usersPanel;
+
+ private TeamsPanel teamsPanel;
- private JPanel usersPanel;
+ private SettingsPanel settingsPanel;
- private JButton createRepository;
+ private StatusPanel statusPanel;
- private JButton delRepository;
-
- private NameRenderer nameRenderer;
-
- private TypeRenderer typeRenderer;
-
- private DefaultTableCellRenderer ownerRenderer;
-
- private DefaultTableCellRenderer sizeRenderer;
-
- private TableRowSorter<RepositoriesModel> defaultSorter;
-
- 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;
-
- final JButton browseRepository = new JButton("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,
- StringUtils.encodeURL(model.name));
- try {
- Desktop.getDesktop().browse(new URI(u));
- } catch (Exception x) {
- x.printStackTrace();
- }
- }
- });
-
- createRepository = new JButton("Create");
- createRepository.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- System.out.println("TODO Create Repository");
- }
- });
-
- final JButton editRepository = new JButton("Edit");
- editRepository.setEnabled(false);
- editRepository.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- for (RepositoryModel model : getSelectedRepositories()) {
- System.out.println("TODO Edit " + model);
- }
- }
- });
-
- delRepository = new JButton("Delete");
- delRepository.setEnabled(false);
- delRepository.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- for (RepositoryModel model : getSelectedRepositories()) {
- System.out.println("TODO Delete " + model);
- }
- }
- });
-
- final JButton cloneRepository = new JButton("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(Color.gray, new Color(0x00, 0x69, 0xD6));
- typeRenderer = new TypeRenderer();
-
- sizeRenderer = new DefaultTableCellRenderer();
- sizeRenderer.setHorizontalAlignment(SwingConstants.RIGHT);
- sizeRenderer.setForeground(new Color(0, 0x80, 0));
-
- ownerRenderer = new DefaultTableCellRenderer();
- 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);
- 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.Type, typeRenderer);
- setRenderer(RepositoriesModel.Columns.Owner, ownerRenderer);
- setRenderer(RepositoriesModel.Columns.Size, sizeRenderer);
-
- repositoriesTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
- @Override
- public void valueChanged(ListSelectionEvent e) {
- if (e.getValueIsAdjusting()) {
- return;
- }
- boolean singleSelection = repositoriesTable.getSelectedRowCount() == 1;
- 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
- .get(modelRow);
- editRepository.setEnabled(singleSelection
- && (isAdmin || model.owner.equalsIgnoreCase(GitblitPanel.this.account)));
- } else {
- editRepository.setEnabled(false);
- }
- }
- });
-
- final JTextField repositoryFilter = new JTextField();
- repositoryFilter.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- filterRepositories(repositoryFilter.getText());
- }
- });
-
- JPanel filterPanel = new JPanel(new BorderLayout(margin, margin));
- filterPanel.add(new JLabel("Filter"), BorderLayout.WEST);
- filterPanel.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 repositoryControls = new JPanel();
- 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("Repositories"), BorderLayout.NORTH);
- repositoriesPanel.add(tablePanel, BorderLayout.CENTER);
- repositoriesPanel.add(repositoryControls, BorderLayout.SOUTH);
-
- JButton createUser = new JButton("Create");
- createUser.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- System.out.println("TODO Create User");
- }
- });
-
- final JButton editUser = new JButton("Edit");
- editUser.setEnabled(false);
- editUser.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- for (UserModel user : getSelectedUsers()) {
- System.out.println("TODO Edit " + user);
- }
- }
- });
-
- final JButton delUser = new JButton("Delete");
- delUser.setEnabled(false);
- delUser.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- for (UserModel user : getSelectedUsers()) {
- System.out.println("TODO Delete " + user);
- }
- }
- });
-
- usersList = new JList();
- usersList.addListSelectionListener(new ListSelectionListener() {
-
- @Override
- public void valueChanged(ListSelectionEvent e) {
- if (e.getValueIsAdjusting()) {
- return;
- }
- boolean selected = usersList.getSelectedIndex() > -1;
- boolean singleSelection = usersList.getSelectedIndices().length == 1;
- editUser.setEnabled(singleSelection && selected);
- delUser.setEnabled(selected);
- }
- });
-
- JPanel userControls = new JPanel();
- userControls.add(createUser);
- userControls.add(editUser);
- userControls.add(delUser);
-
- usersPanel = new JPanel(new BorderLayout(margin, margin));
- usersPanel.add(newHeaderLabel("Users"), BorderLayout.NORTH);
- usersPanel.add(new JScrollPane(usersList), 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);
+ public GitblitPanel(GitblitRegistration reg, RegistrationsDialog.RegistrationListener listener) {
+ this.gitblit = new GitblitClient(reg);
+ this.listener = listener;
tabs = new JTabbedPane(JTabbedPane.BOTTOM);
- tabs.addTab("Main", mainPanel);
- tabs.addTab("Federation", new JPanel());
+ tabs.addTab(Translation.get("gb.repositories"), createRepositoriesPanel());
+ tabs.addTab(Translation.get("gb.activity"), createFeedsPanel());
+ tabs.addTab(Translation.get("gb.teams"), createTeamsPanel());
+ tabs.addTab(Translation.get("gb.users"), createUsersPanel());
+ tabs.addTab(Translation.get("gb.settings"), createSettingsPanel());
+ tabs.addTab(Translation.get("gb.status"), createStatusPanel());
+ tabs.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent e) {
+ tabs.getSelectedComponent().requestFocus();
+ }
+ });
setLayout(new BorderLayout());
add(tabs, BorderLayout.CENTER);
}
- 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 createRepositoriesPanel() {
+ repositoriesPanel = new RepositoriesPanel(gitblit) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void subscribeFeeds(List<FeedModel> feeds) {
+ GitblitPanel.this.subscribeFeeds(feeds);
+ }
+
+ @Override
+ protected void updateUsersTable() {
+ usersPanel.updateTable(false);
+ }
+
+ @Override
+ protected void updateTeamsTable() {
+ teamsPanel.updateTable(false);
+ }
+
+ };
+ return repositoriesPanel;
+ }
+
+ private JPanel createFeedsPanel() {
+ feedsPanel = new FeedsPanel(gitblit) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void subscribeFeeds(List<FeedModel> feeds) {
+ GitblitPanel.this.subscribeFeeds(feeds);
+ }
+ };
+ return feedsPanel;
+ }
+
+ private JPanel createUsersPanel() {
+ usersPanel = new UsersPanel(gitblit) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void updateTeamsTable() {
+ teamsPanel.updateTable(false);
+ }
+ };
+ return usersPanel;
+ }
+
+ private JPanel createTeamsPanel() {
+ teamsPanel = new TeamsPanel(gitblit) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void updateUsersTable() {
+ usersPanel.updateTable(false);
+ }
+ };
+ return teamsPanel;
+ }
+
+ private JPanel createSettingsPanel() {
+ settingsPanel = new SettingsPanel(gitblit);
+ return settingsPanel;
+ }
+
+ private JPanel createStatusPanel() {
+ statusPanel = new StatusPanel(gitblit);
+ return statusPanel;
}
public void login() throws IOException {
- refreshRepositoriesTable();
+ gitblit.login();
- try {
- refreshUsersTable();
- isAdmin = true;
- refreshFederationPanel();
- } catch (ForbiddenException e) {
- // user does not have administrator privileges
- // hide admin repository buttons
- createRepository.setVisible(false);
- delRepository.setVisible(false);
+ repositoriesPanel.updateTable(true);
+ feedsPanel.updateTable(true);
- // hide users panel
- usersPanel.setVisible(false);
-
- // remove federation tab
- tabs.removeTabAt(1);
- } catch (IOException e) {
- System.err.println(e.getMessage());
- }
- }
-
- private void refreshRepositoriesTable() throws IOException {
- Map<String, RepositoryModel> repositories = RpcUtils
- .getRepositories(url, account, password);
- repositoriesModel.list.clear();
- repositoriesModel.list.addAll(repositories.values());
- 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 refreshUsersTable() throws IOException {
- List<UserModel> users = RpcUtils.getUsers(url, account, password);
- usersList.setListData(users.toArray());
- }
-
- private void refreshFederationPanel() throws IOException {
- List<FederationModel> registrations = RpcUtils.getFederationRegistrations(url, account,
- password);
- }
-
- private void filterRepositories(final String fragment) {
- if (StringUtils.isEmpty(fragment)) {
- repositoriesTable.setRowSorter(defaultSorter);
- return;
- }
- RowFilter<RepositoriesModel, Object> containsFilter = new RowFilter<RepositoriesModel, Object>() {
- public boolean include(Entry<? extends RepositoriesModel, ? extends Object> entry) {
- for (int i = entry.getValueCount() - 1; i >= 0; i--) {
- if (entry.getStringValue(i).toLowerCase().contains(fragment.toLowerCase())) {
- return true;
+ if (gitblit.allowManagement()) {
+ if (gitblit.getProtocolVersion() >= 2) {
+ // refresh teams panel
+ teamsPanel.updateTable(false);
+ } else {
+ // remove teams panel
+ String teams = Translation.get("gb.teams");
+ for (int i = 0; i < tabs.getTabCount(); i++) {
+ if (teams.equals(tabs.getTitleAt(i))) {
+ tabs.removeTabAt(i);
+ break;
}
}
- return false;
}
- };
- RepositoriesModel model = (RepositoriesModel) repositoriesTable.getModel();
- TableRowSorter<RepositoriesModel> sorter = new TableRowSorter<RepositoriesModel>(model);
- sorter.setRowFilter(containsFilter);
- repositoriesTable.setRowSorter(sorter);
- }
+ usersPanel.updateTable(false);
+ } else {
+ // user does not have administrator privileges
+ // hide admin repository buttons
+ repositoriesPanel.disableManagement();
- 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);
- repositories.add(model);
- }
- return repositories;
- }
-
- private List<UserModel> getSelectedUsers() {
- List<UserModel> users = new ArrayList<UserModel>();
- for (int viewRow : usersList.getSelectedIndices()) {
- UserModel model = (UserModel) usersList.getModel().getElementAt(viewRow);
- 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);
+ while (tabs.getTabCount() > 2) {
+ // remove all management/administration tabs
+ tabs.removeTabAt(2);
+ }
}
- // Add margin
- width += 2 * margin;
-
- // Set the width
- col.setPreferredWidth(width);
+ if (gitblit.allowAdministration()) {
+ settingsPanel.updateTable(true);
+ statusPanel.updateTable(false);
+ } else {
+ // remove the settings and status tab
+ 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;
+ }
+ }
+ }
+ }
}
@Override
public Insets getInsets() {
- return insets;
- }
-
- @Override
- public Dimension getPreferredSize() {
- if (isAdmin) {
- return new Dimension(950, 550);
- }
- return new Dimension(775, 450);
+ return Utils.INSETS;
}
@Override
public void closeTab(Component c) {
+ gitblit = null;
}
-}
+
+ 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);
+ repositoriesPanel.updateTable(false);
+ }
+ };
+ dialog.setLocationRelativeTo(GitblitPanel.this);
+ dialog.setVisible(true);
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.1