From 15a51d33c2d8edc56fa01e5d77156e71f2b223fa Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 15 Oct 2011 14:39:07 -0400
Subject: [PATCH] Refactored all SwingWorkers into GitblitWorkers.
---
src/com/gitblit/client/GitblitPanel.java | 470 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 350 insertions(+), 120 deletions(-)
diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/com/gitblit/client/GitblitPanel.java
index 5482593..05ba415 100644
--- a/src/com/gitblit/client/GitblitPanel.java
+++ b/src/com/gitblit/client/GitblitPanel.java
@@ -20,6 +20,7 @@
import java.awt.Component;
import java.awt.Desktop;
import java.awt.Dimension;
+import java.awt.GridLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -29,11 +30,11 @@
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.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
@@ -44,17 +45,13 @@
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.GitBlitException.ForbiddenException;
+import com.gitblit.Constants.RpcRequest;
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;
/**
@@ -72,13 +69,7 @@
private final Insets insets = new Insets(margin, margin, margin, margin);
- private String url;
-
- private String account;
-
- private char[] password;
-
- private boolean isAdmin;
+ private GitblitModel gitblit;
private JTabbedPane tabs;
@@ -96,7 +87,7 @@
private NameRenderer nameRenderer;
- private TypeRenderer typeRenderer;
+ private IndicatorsRenderer typeRenderer;
private DefaultTableCellRenderer ownerRenderer;
@@ -109,16 +100,14 @@
}
public GitblitPanel(String url, String account, char[] password) {
- this.url = url;
- this.account = account;
- this.password = password;
+ this.gitblit = new GitblitModel(url, account, password);
- final JButton browseRepository = new JButton("Browse");
+ 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));
@@ -128,34 +117,37 @@
}
});
- createRepository = new JButton("Create");
- createRepository.addActionListener(new ActionListener() {
+ JButton refreshRepositories = new JButton(Translation.get("gb.refresh"));
+ refreshRepositories.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- System.out.println("TODO Create Repository");
+ refreshRepositories();
}
});
- final JButton editRepository = new JButton("Edit");
+ createRepository = new JButton(Translation.get("gb.create"));
+ createRepository.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ createRepository();
+ }
+ });
+
+ final JButton editRepository = new JButton(Translation.get("gb.edit"));
editRepository.setEnabled(false);
editRepository.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- for (RepositoryModel model : getSelectedRepositories()) {
- System.out.println("TODO Edit " + model);
- }
+ editRepository(getSelectedRepositories().get(0));
}
});
- delRepository = new JButton("Delete");
+ delRepository = new JButton(Translation.get("gb.delete"));
delRepository.setEnabled(false);
delRepository.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- for (RepositoryModel model : getSelectedRepositories()) {
- System.out.println("TODO Delete " + model);
- }
+ deleteRepositories(getSelectedRepositories());
}
});
- final JButton cloneRepository = new JButton("Clone");
+ final JButton cloneRepository = new JButton(Translation.get("gb.clone"));
cloneRepository.setEnabled(false);
cloneRepository.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -165,8 +157,8 @@
}
});
- nameRenderer = new NameRenderer(Color.gray, new Color(0x00, 0x69, 0xD6));
- typeRenderer = new TypeRenderer();
+ nameRenderer = new NameRenderer();
+ typeRenderer = new IndicatorsRenderer();
sizeRenderer = new DefaultTableCellRenderer();
sizeRenderer.setHorizontalAlignment(SwingConstants.RIGHT);
@@ -191,7 +183,7 @@
repositoriesTable.setDefaultRenderer(Date.class,
new DateCellRenderer(null, Color.orange.darker()));
setRenderer(RepositoriesModel.Columns.Name, nameRenderer);
- setRenderer(RepositoriesModel.Columns.Type, typeRenderer);
+ setRenderer(RepositoriesModel.Columns.Indicators, typeRenderer);
setRenderer(RepositoriesModel.Columns.Owner, ownerRenderer);
setRenderer(RepositoriesModel.Columns.Size, sizeRenderer);
@@ -212,7 +204,7 @@
RepositoryModel model = ((RepositoriesModel) repositoriesTable.getModel()).list
.get(modelRow);
editRepository.setEnabled(singleSelection
- && (isAdmin || model.owner.equalsIgnoreCase(GitblitPanel.this.account)));
+ && (gitblit.allowAdmin() || gitblit.isOwner(model)));
} else {
editRepository.setEnabled(false);
}
@@ -227,7 +219,7 @@
});
JPanel filterPanel = new JPanel(new BorderLayout(margin, margin));
- filterPanel.add(new JLabel("Filter"), BorderLayout.WEST);
+ filterPanel.add(new JLabel(Translation.get("gb.filter")), BorderLayout.WEST);
filterPanel.add(repositoryFilter, BorderLayout.CENTER);
JPanel tablePanel = new JPanel(new BorderLayout(margin, margin));
@@ -235,6 +227,7 @@
tablePanel.add(new JScrollPane(repositoriesTable), BorderLayout.CENTER);
JPanel repositoryControls = new JPanel();
+ repositoryControls.add(refreshRepositories);
repositoryControls.add(browseRepository);
repositoryControls.add(cloneRepository);
repositoryControls.add(createRepository);
@@ -242,34 +235,38 @@
repositoryControls.add(delRepository);
JPanel repositoriesPanel = new JPanel(new BorderLayout(margin, margin));
- repositoriesPanel.add(newHeaderLabel("Repositories"), BorderLayout.NORTH);
+ repositoriesPanel.add(newHeaderLabel(Translation.get("gb.repositories")),
+ BorderLayout.NORTH);
repositoriesPanel.add(tablePanel, BorderLayout.CENTER);
repositoriesPanel.add(repositoryControls, BorderLayout.SOUTH);
- JButton createUser = new JButton("Create");
- createUser.addActionListener(new ActionListener() {
+ JButton refreshUsers = new JButton(Translation.get("gb.refresh"));
+ refreshUsers.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- System.out.println("TODO Create User");
+ refreshUsers();
}
});
- final JButton editUser = new JButton("Edit");
+ JButton createUser = new JButton(Translation.get("gb.create"));
+ createUser.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ createUser();
+ }
+ });
+
+ final JButton editUser = new JButton(Translation.get("gb.edit"));
editUser.setEnabled(false);
editUser.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- for (UserModel user : getSelectedUsers()) {
- System.out.println("TODO Edit " + user);
- }
+ editUser(getSelectedUsers().get(0));
}
});
- final JButton delUser = new JButton("Delete");
+ final JButton delUser = new JButton(Translation.get("gb.delete"));
delUser.setEnabled(false);
delUser.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- for (UserModel user : getSelectedUsers()) {
- System.out.println("TODO Delete " + user);
- }
+ deleteUsers(getSelectedUsers());
}
});
@@ -288,13 +285,14 @@
}
});
- JPanel userControls = new JPanel();
+ JPanel userControls = new JPanel(new GridLayout(0, 2));
+ userControls.add(refreshUsers);
userControls.add(createUser);
userControls.add(editUser);
userControls.add(delUser);
usersPanel = new JPanel(new BorderLayout(margin, margin));
- usersPanel.add(newHeaderLabel("Users"), BorderLayout.NORTH);
+ usersPanel.add(newHeaderLabel(Translation.get("gb.users")), BorderLayout.NORTH);
usersPanel.add(new JScrollPane(usersList), BorderLayout.CENTER);
usersPanel.add(userControls, BorderLayout.SOUTH);
@@ -306,8 +304,8 @@
mainPanel.add(usersPanel, BorderLayout.EAST);
tabs = new JTabbedPane(JTabbedPane.BOTTOM);
- tabs.addTab("Main", mainPanel);
- tabs.addTab("Federation", new JPanel());
+ tabs.addTab(Translation.get("gb.repositories"), mainPanel);
+ tabs.addTab(Translation.get("gb.federation"), new JPanel());
setLayout(new BorderLayout());
add(tabs, BorderLayout.CENTER);
@@ -322,14 +320,20 @@
return label;
}
- public void login() throws IOException {
- refreshRepositoriesTable();
+ private void setRenderer(RepositoriesModel.Columns col, TableCellRenderer renderer) {
+ String name = repositoriesTable.getColumnName(col.ordinal());
+ repositoriesTable.getColumn(name).setCellRenderer(renderer);
+ }
- try {
- refreshUsersTable();
- isAdmin = true;
- refreshFederationPanel();
- } catch (ForbiddenException e) {
+ public void login() throws IOException {
+ gitblit.login();
+
+ updateRepositoriesTable();
+ Utils.packColumns(repositoriesTable, 2);
+
+ if (gitblit.allowAdmin()) {
+ updateUsersTable();
+ } else {
// user does not have administrator privileges
// hide admin repository buttons
createRepository.setVisible(false);
@@ -340,33 +344,17 @@
// 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);
+ private void updateRepositoriesTable() {
repositoriesModel.list.clear();
- repositoriesModel.list.addAll(repositories.values());
+ 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 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 updateUsersTable() {
+ usersList.setListData(gitblit.getUsers().toArray());
}
private void filterRepositories(final String fragment) {
@@ -410,45 +398,6 @@
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
public Insets getInsets() {
return insets;
@@ -456,7 +405,7 @@
@Override
public Dimension getPreferredSize() {
- if (isAdmin) {
+ if (gitblit.allowAdmin()) {
return new Dimension(950, 550);
}
return new Dimension(775, 450);
@@ -464,5 +413,286 @@
@Override
public void closeTab(Component c) {
+ gitblit = null;
}
-}
+
+ 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();
+ }
+
+ /**
+ * Displays the create repository dialog and fires a SwingWorker to update
+ * the server, if appropriate.
+ *
+ */
+ protected void createRepository() {
+ EditRepositoryDialog dialog = new EditRepositoryDialog();
+ dialog.setUsers(null, gitblit.getUsernames(), null);
+ dialog.setRepositories(gitblit.getRepositories());
+ dialog.setVisible(true);
+ final RepositoryModel newRepository = dialog.getRepository();
+ final List<String> permittedUsers = dialog.getPermittedUsers();
+ if (newRepository == null) {
+ return;
+ }
+
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.CREATE_REPOSITORY) {
+
+ @Override
+ 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 onSuccess() {
+ updateRepositoriesTable();
+ updateUsersTable();
+ }
+
+ @Override
+ protected void onFailure() {
+ showFailure("Failed to execute request \"{0}\" for repository \"{1}\".",
+ getRequestType(), newRepository.name);
+ }
+ };
+ worker.execute();
+ }
+
+ /**
+ * Displays the edit repository dialog and fires a SwingWorker to update the
+ * server, if appropriate.
+ *
+ * @param repository
+ */
+ protected void editRepository(final RepositoryModel repository) {
+ EditRepositoryDialog dialog = new EditRepositoryDialog(repository);
+ List<String> usernames = gitblit.getUsernames();
+ List<String> members = gitblit.getPermittedUsernames(repository);
+ dialog.setUsers(repository.owner, usernames, members);
+ dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets);
+ dialog.setVisible(true);
+ final RepositoryModel revisedRepository = dialog.getRepository();
+ final List<String> permittedUsers = dialog.getPermittedUsers();
+ if (revisedRepository == null) {
+ return;
+ }
+
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.EDIT_REPOSITORY) {
+
+ @Override
+ protected Boolean doRequest() throws IOException {
+ boolean success = gitblit.updateRepository(repository.name, revisedRepository,
+ permittedUsers);
+ if (success) {
+ gitblit.refreshRepositories();
+ gitblit.refreshUsers();
+ }
+ return success;
+ }
+
+ @Override
+ protected void onSuccess() {
+ updateRepositoriesTable();
+ updateUsersTable();
+ }
+
+ @Override
+ protected void onFailure() {
+ showFailure("Failed to execute request \"{0}\" for repository \"{1}\".",
+ getRequestType(), repository.name);
+ }
+ };
+ worker.execute();
+ }
+
+ protected void deleteRepositories(final List<RepositoryModel> repositories) {
+ if (repositories == null || repositories.size() == 0) {
+ return;
+ }
+ StringBuilder message = new StringBuilder("Delete the following repositories?\n\n");
+ for (RepositoryModel repository : repositories) {
+ message.append(repository.name).append("\n");
+ }
+ int result = JOptionPane.showConfirmDialog(GitblitPanel.this, message.toString(),
+ "Delete Repositories?", JOptionPane.YES_NO_OPTION);
+ if (result == JOptionPane.YES_OPTION) {
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.DELETE_REPOSITORY) {
+ @Override
+ protected Boolean doRequest() throws IOException {
+ boolean success = true;
+ for (RepositoryModel repository : repositories) {
+ success &= gitblit.deleteRepository(repository);
+ }
+ if (success) {
+ gitblit.refreshUsers();
+ }
+ return success;
+ }
+
+ @Override
+ 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();
+ }
+
+ /**
+ * Displays the create user dialog and fires a SwingWorker to update the
+ * server, if appropriate.
+ *
+ */
+ protected void createUser() {
+ EditUserDialog dialog = new EditUserDialog(gitblit.getSettings());
+ dialog.setUsers(gitblit.getUsers());
+ dialog.setRepositories(gitblit.getRepositories(), null);
+ dialog.setVisible(true);
+ final UserModel newUser = dialog.getUser();
+ if (newUser == null) {
+ return;
+ }
+
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.CREATE_USER) {
+
+ @Override
+ protected Boolean doRequest() throws IOException {
+ boolean success = gitblit.createUser(newUser);
+ if (success) {
+ gitblit.refreshUsers();
+ }
+ return success;
+ }
+
+ @Override
+ protected void onSuccess() {
+ updateUsersTable();
+ }
+
+ @Override
+ protected void onFailure() {
+ showFailure("Failed to execute request \"{0}\" for user \"{1}\".",
+ getRequestType(), newUser.username);
+ }
+ };
+ worker.execute();
+ }
+
+ /**
+ * Displays the edit user dialog and fires a SwingWorker to update the
+ * server, if appropriate.
+ *
+ * @param user
+ */
+ protected void editUser(final UserModel user) {
+ EditUserDialog dialog = new EditUserDialog(user, gitblit.getSettings());
+ dialog.setRepositories(gitblit.getRepositories(), new ArrayList<String>(user.repositories));
+ dialog.setVisible(true);
+ final UserModel revisedUser = dialog.getUser();
+ if (revisedUser == null) {
+ return;
+ }
+
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.EDIT_USER) {
+ @Override
+ protected Boolean doRequest() throws IOException {
+ boolean success = gitblit.updateUser(user.username, revisedUser);
+ if (success) {
+ gitblit.refreshUsers();
+ }
+ return success;
+ }
+
+ @Override
+ protected void onSuccess() {
+ updateUsersTable();
+ }
+
+ @Override
+ protected void onFailure() {
+ showFailure("Failed to execute request \"{0}\" for user \"{1}\".",
+ getRequestType(), user.username);
+ }
+ };
+ worker.execute();
+ }
+
+ protected void deleteUsers(final List<UserModel> users) {
+ if (users == null || users.size() == 0) {
+ return;
+ }
+ StringBuilder message = new StringBuilder("Delete the following users?\n\n");
+ for (UserModel user : users) {
+ message.append(user.username).append("\n");
+ }
+ int result = JOptionPane.showConfirmDialog(GitblitPanel.this, message.toString(),
+ "Delete Users?", JOptionPane.YES_NO_OPTION);
+ if (result == JOptionPane.YES_OPTION) {
+ GitblitWorker worker = new GitblitWorker(this, RpcRequest.DELETE_USER) {
+ @Override
+ protected Boolean doRequest() throws IOException {
+ boolean success = true;
+ for (UserModel user : users) {
+ success &= gitblit.deleteUser(user);
+ }
+ if (success) {
+ gitblit.refreshUsers();
+ }
+ return success;
+ }
+
+ @Override
+ protected void onSuccess() {
+ updateUsersTable();
+ }
+
+ @Override
+ protected void onFailure() {
+ showFailure("Failed to delete specified users!");
+ }
+ };
+ worker.execute();
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.1