Centralize Manager row height setting

11 files changed, 1 insertions, 14 deletions

diff --git a/src/com/gitblit/client/FeedsPanel.java b/src/com/gitblit/client/FeedsPanel.java
index 97f37c0d..392636e4 100644
--- a/src/com/gitblit/client/FeedsPanel.java
+++ b/src/com/gitblit/client/FeedsPanel.java
@@ -160,7 +160,6 @@ public abstract class FeedsPanel extends JPanel {
 		table = Utils.newTable(tableModel, Utils.DATE_FORMAT);

 		defaultSorter = new TableRowSorter<FeedEntryTableModel>(tableModel);

 		String name = table.getColumnName(FeedEntryTableModel.Columns.Author.ordinal());

-		table.setRowHeight(nameRenderer.getFont().getSize() + 8);

 		table.getColumn(name).setCellRenderer(nameRenderer);

 		name = table.getColumnName(FeedEntryTableModel.Columns.Repository.ordinal());

 		table.getColumn(name).setCellRenderer(nameRenderer);

diff --git a/src/com/gitblit/client/JPalette.java b/src/com/gitblit/client/JPalette.java
index 07900cb7..4ead099e 100644
--- a/src/com/gitblit/client/JPalette.java
+++ b/src/com/gitblit/client/JPalette.java
@@ -138,7 +138,6 @@ public class JPalette<T> extends JPanel {
 		NameRenderer nameRenderer = new NameRenderer();

 		table.setCellSelectionEnabled(false);

 		table.setRowSelectionAllowed(true);

-		table.setRowHeight(nameRenderer.getFont().getSize() + 8);

 		table.getTableHeader().setReorderingAllowed(false);

 		table.setGridColor(new Color(0xd9d9d9));

 		table.setBackground(Color.white);

diff --git a/src/com/gitblit/client/RegistrationsDialog.java b/src/com/gitblit/client/RegistrationsDialog.java
index d40e3335..9550e97a 100644
--- a/src/com/gitblit/client/RegistrationsDialog.java
+++ b/src/com/gitblit/client/RegistrationsDialog.java
@@ -93,7 +93,6 @@ public class RegistrationsDialog extends JDialog {
 		NameRenderer nameRenderer = new NameRenderer();

 		model = new RegistrationsTableModel(registrations);

 		registrationsTable = Utils.newTable(model, Utils.DATE_FORMAT);

-		registrationsTable.setRowHeight(nameRenderer.getFont().getSize() + 8);

 

 		String id = registrationsTable

 				.getColumnName(RegistrationsTableModel.Columns.Name.ordinal());

diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/com/gitblit/client/RepositoriesPanel.java
index 28b3959c..769d33b8 100644
--- a/src/com/gitblit/client/RepositoriesPanel.java
+++ b/src/com/gitblit/client/RepositoriesPanel.java
@@ -180,7 +180,6 @@ public abstract class RepositoriesPanel extends JPanel {
 		tableModel = new RepositoriesTableModel();

 		defaultSorter = new TableRowSorter<RepositoriesTableModel>(tableModel);

 		table = Utils.newTable(tableModel, Utils.DATE_FORMAT);

-		table.setRowHeight(nameRenderer.getFont().getSize() + 8);

 		table.setRowSorter(defaultSorter);

 		table.getRowSorter().toggleSortOrder(RepositoriesTableModel.Columns.Name.ordinal());

 

diff --git a/src/com/gitblit/client/SearchDialog.java b/src/com/gitblit/client/SearchDialog.java
index 628a2097..829bc52a 100644
--- a/src/com/gitblit/client/SearchDialog.java
+++ b/src/com/gitblit/client/SearchDialog.java
@@ -160,7 +160,6 @@ public class SearchDialog extends JFrame {
 		table = Utils.newTable(tableModel, Utils.DATE_FORMAT);

 

 		String name = table.getColumnName(FeedEntryTableModel.Columns.Author.ordinal());

-		table.setRowHeight(nameRenderer.getFont().getSize() + 8);

 		table.getColumn(name).setCellRenderer(nameRenderer);

 		name = table.getColumnName(FeedEntryTableModel.Columns.Repository.ordinal());

 		table.getColumn(name).setCellRenderer(nameRenderer);

diff --git a/src/com/gitblit/client/SettingsPanel.java b/src/com/gitblit/client/SettingsPanel.java
index 9591947f..b0adc0c7 100644
--- a/src/com/gitblit/client/SettingsPanel.java
+++ b/src/com/gitblit/client/SettingsPanel.java
@@ -102,7 +102,6 @@ public class SettingsPanel extends JPanel {
 		table = Utils.newTable(tableModel, Utils.DATE_FORMAT);

 		table.setDefaultRenderer(SettingModel.class, new SettingCellRenderer());

 		String name = table.getColumnName(UsersTableModel.Columns.Name.ordinal());

-		table.setRowHeight(nameRenderer.getFont().getSize() + 8);

 		table.getColumn(name).setCellRenderer(nameRenderer);

 		table.setRowSorter(defaultSorter);

 		table.getRowSorter().toggleSortOrder(SettingsTableModel.Columns.Name.ordinal());

diff --git a/src/com/gitblit/client/StatusPanel.java b/src/com/gitblit/client/StatusPanel.java
index 7506dfea..6d004f16 100644
--- a/src/com/gitblit/client/StatusPanel.java
+++ b/src/com/gitblit/client/StatusPanel.java
@@ -102,7 +102,6 @@ public class StatusPanel extends JPanel {
 		JTable propertiesTable = Utils.newTable(tableModel, Utils.DATE_FORMAT);

 		String name = propertiesTable.getColumnName(PropertiesTableModel.Columns.Name.ordinal());

 		NameRenderer nameRenderer = new NameRenderer();

-		propertiesTable.setRowHeight(nameRenderer.getFont().getSize() + 8);

 		propertiesTable.getColumn(name).setCellRenderer(nameRenderer);

 

 		JPanel centerPanel = new JPanel(new BorderLayout(Utils.MARGIN, Utils.MARGIN));

diff --git a/src/com/gitblit/client/SubscriptionsDialog.java b/src/com/gitblit/client/SubscriptionsDialog.java
index ed0b971f..5ae836a5 100644
--- a/src/com/gitblit/client/SubscriptionsDialog.java
+++ b/src/com/gitblit/client/SubscriptionsDialog.java
@@ -79,7 +79,6 @@ public abstract class SubscriptionsDialog extends JDialog {
 		NameRenderer nameRenderer = new NameRenderer();

 		model = new FeedsTableModel(feeds);

 		feedsTable = Utils.newTable(model, Utils.DATE_FORMAT);

-		feedsTable.setRowHeight(nameRenderer.getFont().getSize() + 8);

 		feedsTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {

 			@Override

 			public void valueChanged(ListSelectionEvent e) {

diff --git a/src/com/gitblit/client/TeamsPanel.java b/src/com/gitblit/client/TeamsPanel.java
index 6539d1c5..92182222 100644
--- a/src/com/gitblit/client/TeamsPanel.java
+++ b/src/com/gitblit/client/TeamsPanel.java
@@ -109,7 +109,6 @@ public abstract class TeamsPanel extends JPanel {
 		defaultSorter = new TableRowSorter<TeamsTableModel>(tableModel);

 		table = Utils.newTable(tableModel, Utils.DATE_FORMAT);

 		String name = table.getColumnName(TeamsTableModel.Columns.Name.ordinal());

-		table.setRowHeight(nameRenderer.getFont().getSize() + 8);

 		table.getColumn(name).setCellRenderer(nameRenderer);

 

 		int w = 125;

diff --git a/src/com/gitblit/client/UsersPanel.java b/src/com/gitblit/client/UsersPanel.java
index 469d9536..1810f8cb 100644
--- a/src/com/gitblit/client/UsersPanel.java
+++ b/src/com/gitblit/client/UsersPanel.java
@@ -40,11 +40,7 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;

 import javax.swing.table.TableRowSorter;

 

-import com.gitblit.Constants.AccessPermission;

-import com.gitblit.Constants.PermissionType;

 import com.gitblit.Constants.RpcRequest;

-import com.gitblit.models.RegistrantAccessPermission;

-import com.gitblit.models.RepositoryModel;

 import com.gitblit.models.TeamModel;

 import com.gitblit.models.UserModel;

 import com.gitblit.utils.StringUtils;

@@ -114,7 +110,6 @@ public abstract class UsersPanel extends JPanel {
 		defaultSorter = new TableRowSorter<UsersTableModel>(tableModel);

 		table = Utils.newTable(tableModel, Utils.DATE_FORMAT);

 		String name = table.getColumnName(UsersTableModel.Columns.Name.ordinal());

-		table.setRowHeight(nameRenderer.getFont().getSize() + 8);

 		table.getColumn(name).setCellRenderer(nameRenderer);

 		

 		int w = 125;

diff --git a/src/com/gitblit/client/Utils.java b/src/com/gitblit/client/Utils.java
index 538e6be7..b24c6d8e 100644
--- a/src/com/gitblit/client/Utils.java
+++ b/src/com/gitblit/client/Utils.java
@@ -50,6 +50,7 @@ public class Utils {
 

 	public static JTable newTable(TableModel model, String datePattern) {

 		JTable table = new JTable(model);

+		table.setRowHeight(table.getFont().getSize() + 8);

 		table.setCellSelectionEnabled(false);

 		table.setRowSelectionAllowed(true);

 		table.getTableHeader().setReorderingAllowed(false);