[patch] Proposal Patch II

UserParametersGui.java.patch (text/plain), 3.46 KB, created by immanuel.hayden on 2012-02-29 10:06:16 UTC

(hide)

Description: Proposal Patch II

Filename:

MIME Type:

Creator: immanuel.hayden

Created: 2012-02-29 10:06:16 UTC

Size: 3.46 KB

patch

obsolete

>Index: UserParametersGui.java >=================================================================== >--- UserParametersGui.java (revision 1294995) >+++ UserParametersGui.java (working copy) >@@ -35,6 +35,12 @@ > import javax.swing.JTable; > import javax.swing.ListSelectionModel; > import javax.swing.table.TableCellEditor; >+import javax.swing.table.JTableHeader; >+import javax.swing.table.TableCellRenderer; >+import javax.swing.table.TableColumn; >+import java.awt.FontMetrics; >+import java.awt.Component; >+import javax.swing.table.DefaultTableCellRenderer; > > import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer; > import org.apache.jmeter.gui.util.PowerTableModel; >@@ -67,6 +73,8 @@ > private JButton addParameterButton, addUserButton, deleteRowButton, deleteColumnButton; > > private JCheckBox perIterationCheck; >+ >+ private JPanel paramPanel; > > public UserParametersGui() { > super(); >@@ -197,7 +205,7 @@ > // paramTable.setPreferredScrollableViewportSize(new Dimension(100, > // 70)); > >- JPanel paramPanel = new JPanel(new BorderLayout()); >+ paramPanel = new JPanel(new BorderLayout()); > paramPanel.add(tableLabel, BorderLayout.NORTH); > JScrollPane scroll = new JScrollPane(paramTable); > scroll.setPreferredSize(scroll.getMinimumSize()); >@@ -229,6 +237,51 @@ > return buttonPanel; > } > >+ /** >+ * Set Column size >+ */ >+ private void setColumnWidths() { >+ int margin = 10; >+ int minwidth = 150; >+ >+ JTableHeader tableHeader = paramTable.getTableHeader(); >+ FontMetrics headerFontMetrics = tableHeader.getFontMetrics(tableHeader.getFont()); >+ >+ for (int i = 0; i < tableModel.getColumnCount(); i++) { >+ int headerWidth = headerFontMetrics.stringWidth(paramTable.getColumnName(i)); >+ int maxWidth = getMaximalRequiredColumnWidth(i, headerWidth); >+ >+ paramTable.getColumnModel().getColumn(i).setPreferredWidth(Math.max(maxWidth + margin, minwidth)); >+ } >+ } >+ >+ private int getMaximalRequiredColumnWidth(int columnIndex, int headerWidth) { >+ int maxWidth = headerWidth; >+ >+ TableColumn column = paramTable.getColumnModel().getColumn(columnIndex); >+ >+ TableCellRenderer cellRenderer = column.getCellRenderer(); >+ >+ if(cellRenderer == null) { >+ cellRenderer = new DefaultTableCellRenderer(); >+ } >+ >+ for(int row = 0; row < paramTable.getModel().getRowCount(); row++) { >+ Component rendererComponent = cellRenderer.getTableCellRendererComponent(paramTable, >+ paramTable.getModel().getValueAt(row, columnIndex), >+ false, >+ false, >+ row, >+ columnIndex); >+ >+ double valueWidth = rendererComponent.getPreferredSize().getWidth(); >+ >+ maxWidth = (int) Math.max(maxWidth, valueWidth); >+ } >+ >+ return maxWidth; >+ } >+ > private class AddParamAction implements ActionListener { > public void actionPerformed(ActionEvent e) { > if (paramTable.isEditing()) { >@@ -271,15 +324,6 @@ > } > } > >- /** >- * Set Column size >- */ >- private void setColumnWidths() { >- for (int i = 0; i < tableModel.getColumnCount(); i++) { >- paramTable.getColumnModel().getColumn(i).setPreferredWidth(200); >- } >- } >- > private class DeleteRowAction implements ActionListener { > public void actionPerformed(ActionEvent e) { > if (paramTable.isEditing()) { View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]