Refactored all SwingWorkers into GitblitWorkers.

4 files changed, 504 insertions, 313 deletions

diff --git a/src/com/gitblit/client/GitblitModel.java b/src/com/gitblit/client/GitblitModel.java
new file mode 100644
index 00000000..92b0b1ce
--- /dev/null
+++ b/src/com/gitblit/client/GitblitModel.java
@@ -0,0 +1,180 @@
+/*

+ * Copyright 2011 gitblit.com.

+ *

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *     http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+package com.gitblit.client;

+

+import java.io.IOException;

+import java.io.Serializable;

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.List;

+import java.util.Map;

+

+import com.gitblit.GitBlitException.ForbiddenException;

+import com.gitblit.IStoredSettings;

+import com.gitblit.Keys;

+import com.gitblit.models.FederationModel;

+import com.gitblit.models.RepositoryModel;

+import com.gitblit.models.UserModel;

+import com.gitblit.utils.RpcUtils;

+

+public class GitblitModel implements Serializable {

+

+	private static final long serialVersionUID = 1L;

+

+	public final String url;

+

+	public final String account;

+

+	private final char[] password;

+

+	private volatile boolean isAdmin;

+

+	private volatile IStoredSettings settings;

+

+	private final List<RepositoryModel> allRepositories;

+

+	private final List<UserModel> allUsers;

+

+	private final List<FederationModel> federationRegistrations;

+

+	public GitblitModel(String url, String account, char[] password) {

+		this.url = url;

+		this.account = account;

+		this.password = password;

+

+		this.allUsers = new ArrayList<UserModel>();

+		this.allRepositories = new ArrayList<RepositoryModel>();

+		this.federationRegistrations = new ArrayList<FederationModel>();

+	}

+

+	public void login() throws IOException {

+		refreshRepositories();

+

+		try {

+			settings = RpcUtils.getSettings(url, account, password);

+			refreshUsers();

+			refreshFederationRegistrations();

+			isAdmin = true;

+		} catch (ForbiddenException e) {

+		} catch (IOException e) {

+			System.err.println(e.getMessage());

+		}

+	}

+

+	public boolean allowAdmin() {

+		return isAdmin;

+	}

+

+	public boolean isOwner(RepositoryModel model) {

+		return account.equalsIgnoreCase(model.owner);

+	}

+

+	public IStoredSettings getSettings() {

+		return settings;

+	}

+

+	public List<RepositoryModel> refreshRepositories() throws IOException {

+		Map<String, RepositoryModel> repositories = RpcUtils

+				.getRepositories(url, account, password);

+		allRepositories.clear();

+		allRepositories.addAll(repositories.values());

+		Collections.sort(allRepositories);

+		return allRepositories;

+	}

+

+	public List<UserModel> refreshUsers() throws IOException {

+		List<UserModel> users = RpcUtils.getUsers(url, account, password);

+		allUsers.clear();

+		allUsers.addAll(users);

+		return allUsers;

+	}

+

+	public List<FederationModel> refreshFederationRegistrations() throws IOException {

+		List<FederationModel> list = RpcUtils.getFederationRegistrations(url, account, password);

+		federationRegistrations.clear();

+		federationRegistrations.addAll(list);

+		return federationRegistrations;

+	}

+

+	public List<UserModel> getUsers() {

+		return allUsers;

+	}

+

+	public List<String> getUsernames() {

+		List<String> usernames = new ArrayList<String>();

+		for (UserModel user : this.allUsers) {

+			usernames.add(user.username);

+		}

+		Collections.sort(usernames);

+		return usernames;

+	}

+

+	public List<String> getPermittedUsernames(RepositoryModel repository) {

+		List<String> usernames = new ArrayList<String>();

+		for (UserModel user : this.allUsers) {

+			if (user.repositories.contains(repository.name)) {

+				usernames.add(user.username);

+			}

+		}

+		return usernames;

+	}

+

+	public List<String> getFederationSets() {

+		return settings.getStrings(Keys.federation.sets);

+	}

+

+	public List<RepositoryModel> getRepositories() {

+		return allRepositories;

+	}

+

+	public boolean createRepository(RepositoryModel repository, List<String> permittedUsers)

+			throws IOException {

+		boolean success = true;

+		success &= RpcUtils.createRepository(repository, url, account, password);

+		if (permittedUsers.size() > 0) {

+			// if new repository has named members, set them

+			success &= RpcUtils.setRepositoryMembers(repository, permittedUsers, url, account,

+					password);

+		}

+		return success;

+	}

+

+	public boolean updateRepository(String name, RepositoryModel repository,

+			List<String> permittedUsers) throws IOException {

+		boolean success = true;

+		success &= RpcUtils.updateRepository(name, repository, url, account, password);

+		// always set the repository members

+		success &= RpcUtils

+				.setRepositoryMembers(repository, permittedUsers, url, account, password);

+		return success;

+	}

+

+	public boolean deleteRepository(RepositoryModel repository) throws IOException {

+		return RpcUtils.deleteRepository(repository, url, account, password);

+	}

+

+	public boolean createUser(UserModel user) throws IOException {

+		return RpcUtils.createUser(user, url, account, password);

+	}

+

+	public boolean updateUser(String name, UserModel user) throws IOException {

+		return RpcUtils.updateUser(name, user, url, account, password);

+	}

+

+	public boolean deleteUser(UserModel user) throws IOException {

+		return RpcUtils.deleteUser(user, url, account, password);

+	}

+}

diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/com/gitblit/client/GitblitPanel.java
index a6be1569..05ba415b 100644
--- a/src/com/gitblit/client/GitblitPanel.java
+++ b/src/com/gitblit/client/GitblitPanel.java
@@ -28,10 +28,8 @@ 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;

@@ -44,25 +42,16 @@ import javax.swing.JTable;
 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.UserModel;

-import com.gitblit.utils.RpcUtils;

 import com.gitblit.utils.StringUtils;

 

 /**

@@ -80,17 +69,7 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 

 	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 GitblitModel gitblit;

 

 	private JTabbedPane tabs;

 

@@ -116,23 +95,19 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 

 	private TableRowSorter<RepositoriesModel> defaultSorter;

 

-	private List<RepositoryModel> allRepositories;

-

 	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 GitblitModel(url, account, password);

 

 		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 +120,7 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 		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();

 			}

 		});

 

@@ -237,7 +204,7 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 					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);

 				}

@@ -260,6 +227,7 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 		tablePanel.add(new JScrollPane(repositoriesTable), BorderLayout.CENTER);

 

 		JPanel repositoryControls = new JPanel();

+		repositoryControls.add(refreshRepositories);

 		repositoryControls.add(browseRepository);

 		repositoryControls.add(cloneRepository);

 		repositoryControls.add(createRepository);

@@ -275,15 +243,7 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 		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();

 			}

 		});

 

@@ -360,15 +320,20 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 		return label;

 	}

 

+	private void setRenderer(RepositoriesModel.Columns col, TableCellRenderer renderer) {

+		String name = repositoriesTable.getColumnName(col.ordinal());

+		repositoriesTable.getColumn(name).setCellRenderer(renderer);

+	}

+

 	public void login() throws IOException {

-		refreshRepositoriesTable();

-

-		try {

-			refreshUsersTable();

-			refreshSettings();

-			isAdmin = true;

-			refreshFederationPanel();

-		} catch (ForbiddenException e) {

+		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);

@@ -379,39 +344,17 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 

 			// 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);

-		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 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 updateUsersTable() {

+		usersList.setListData(gitblit.getUsers().toArray());

 	}

 

 	private void filterRepositories(final String fragment) {

@@ -455,45 +398,6 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 		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;

@@ -501,7 +405,7 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 

 	@Override

 	public Dimension getPreferredSize() {

-		if (isAdmin) {

+		if (gitblit.allowAdmin()) {

 			return new Dimension(950, 550);

 		}

 		return new Dimension(775, 450);

@@ -509,6 +413,23 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 

 	@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();

 	}

 

 	/**

@@ -517,14 +438,9 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 	 * 

 	 */

 	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.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 +448,30 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 			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 +485,10 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 	 */

 	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);

+		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.setFederationSets(gitblit.getFederationSets(), repository.federationSets);

 		dialog.setVisible(true);

 		final RepositoryModel revisedRepository = dialog.getRepository();

 		final List<String> permittedUsers = dialog.getPermittedUsers();

@@ -602,41 +496,29 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 			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,84 +535,85 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 		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.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();

+	}

+

 	/**

 	 * Displays the create user dialog and fires a SwingWorker to update the

 	 * server, if appropriate.

 	 * 

 	 */

 	protected void createUser() {

-		EditUserDialog dialog = new EditUserDialog(settings);

-		dialog.setUsers(allUsers);

-		dialog.setRepositories(allRepositories, null);

+		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;

 		}

 

-		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 +626,33 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 	 * @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.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 doRequest() throws IOException {

+				boolean success = gitblit.updateUser(user.username, revisedUser);

+				if (success) {

+					gitblit.refreshUsers();

+				}

+				return success;

+			}

 

 			@Override

-			protected Boolean doInBackground() throws IOException {

-				return RpcUtils.updateUser(user.username, revisedUser, url, account, password);

+			protected void onSuccess() {

+				updateUsersTable();

 			}

 

 			@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 onFailure() {

+				showFailure("Failed to execute request \"{0}\" for user \"{1}\".",

+						getRequestType(), user.username);

 			}

 		};

 		worker.execute();

@@ -795,58 +669,30 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 		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
diff --git a/src/com/gitblit/client/GitblitWorker.java b/src/com/gitblit/client/GitblitWorker.java
new file mode 100644
index 00000000..45baf03d
--- /dev/null
+++ b/src/com/gitblit/client/GitblitWorker.java
@@ -0,0 +1,80 @@
+/*

+ * Copyright 2011 gitblit.com.

+ *

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *     http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+package com.gitblit.client;

+

+import java.awt.Component;

+import java.io.IOException;

+import java.text.MessageFormat;

+

+import javax.swing.JOptionPane;

+import javax.swing.SwingWorker;

+

+import com.gitblit.Constants.RpcRequest;

+import com.gitblit.GitBlitException.ForbiddenException;

+import com.gitblit.GitBlitException.UnauthorizedException;

+

+public abstract class GitblitWorker extends SwingWorker<Boolean, Void> {

+

+	private final Component parent;

+

+	private final RpcRequest request;

+

+	public GitblitWorker(Component parent, RpcRequest request) {

+		this.parent = parent;

+		this.request = request;

+	}

+

+	protected RpcRequest getRequestType() {

+		return request;

+	}

+

+	@Override

+	protected Boolean doInBackground() throws IOException {

+		return doRequest();

+	}

+

+	protected void done() {

+		try {

+			Boolean success = get();

+			if (success) {

+				onSuccess();

+			} else {

+				onFailure();

+			}

+		} catch (Throwable t) {

+			if (t instanceof ForbiddenException) {

+				Utils.explainForbidden(parent, request);

+			} else if (t instanceof UnauthorizedException) {

+				Utils.explainUnauthorized(parent, request);

+			} else {

+				Utils.showException(parent, t);

+			}

+		}

+	}

+

+	protected abstract Boolean doRequest() throws IOException;

+

+	protected abstract void onSuccess();

+

+	protected void onFailure() {

+	}

+

+	protected void showFailure(String message, Object... args) {

+		String msg = MessageFormat.format(message, args);

+		JOptionPane.showMessageDialog(parent, msg, Translation.get("gb.error"),

+				JOptionPane.ERROR_MESSAGE);

+	}

+}

diff --git a/src/com/gitblit/client/Utils.java b/src/com/gitblit/client/Utils.java
new file mode 100644
index 00000000..c33c1101
--- /dev/null
+++ b/src/com/gitblit/client/Utils.java
@@ -0,0 +1,85 @@
+/*

+ * Copyright 2011 gitblit.com.

+ *

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *     http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+package com.gitblit.client;

+

+import java.awt.Component;

+import java.text.MessageFormat;

+

+import javax.swing.JOptionPane;

+import javax.swing.JTable;

+import javax.swing.table.DefaultTableColumnModel;

+import javax.swing.table.TableCellRenderer;

+import javax.swing.table.TableColumn;

+

+import com.gitblit.Constants.RpcRequest;

+

+public class Utils {

+

+	public static void explainForbidden(Component c, RpcRequest request) {

+		String msg = MessageFormat.format(

+				"The request \"{0}\" has been forbidden by the Gitblit server.", request.name());

+		JOptionPane.showMessageDialog(c, msg, "Forbidden", JOptionPane.ERROR_MESSAGE);

+	}

+

+	public static void explainUnauthorized(Component c, RpcRequest request) {

+		String msg = MessageFormat.format(

+				"This account is not authorized to execute the request \"{0}\".", request.name());

+		JOptionPane.showMessageDialog(c, msg, "Unauthorized", JOptionPane.ERROR_MESSAGE);

+	}

+

+	public static void showException(Component c, Throwable t) {

+		// TODO show the unexpected exception

+	}

+

+	public static 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 static 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);

+	}

+}