mstover1 2003/01/31 11:05:50
Modified: src/core/org/apache/jmeter/config/gui ArgumentsPanel.java
Log:
Fixing argument table editing regression issue
Revision Changes Path
1.3 +17 -7
jakarta-jmeter/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
Index: ArgumentsPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArgumentsPanel.java 22 Jan 2003 00:13:03 -0000 1.2
+++ ArgumentsPanel.java 31 Jan 2003 19:05:50 -0000 1.3
@@ -73,16 +73,17 @@
import javax.swing.event.CellEditorListener;
import javax.swing.event.ChangeEvent;
import javax.swing.table.TableCellEditor;
+
import junit.framework.TestCase;
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.gui.util.PowerTableModel;
-import org.apache.jmeter.gui.util.TextAreaCellRenderer;
-import org.apache.jmeter.gui.util.TextAreaTableCellEditor;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.Data;
+import org.apache.log.Hierarchy;
+import org.apache.log.Logger;
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
@@ -95,6 +96,8 @@
public class ArgumentsPanel extends AbstractConfigGui implements FocusListener,
ActionListener,CellEditorListener
{
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
+ JMeterUtils.GUI);
JTable table;
JButton add;
JButton delete;
@@ -209,6 +212,8 @@
***************************************/
public void focusLost(FocusEvent e)
{
+ log.debug("Focus lost on table");
+ stopTableEditing();
}
/****************************************
@@ -276,11 +281,7 @@
protected void addArgument() {
// If a table cell is being edited, we should accept the current value
// and stop the editing before adding a new row.
- if(table.isEditing())
- {
- TableCellEditor cellEditor =
table.getCellEditor(table.getEditingRow(), table.getEditingColumn());
- cellEditor.stopCellEditing();
- }
+ stopTableEditing();
tableModel.addNewRow();
tableModel.fireTableDataChanged();
@@ -291,6 +292,15 @@
// Highlight (select) the appropriate row.
int rowToSelect = tableModel.getRowCount() - 1;
table.setRowSelectionInterval(rowToSelect, rowToSelect);
+ }
+
+ private void stopTableEditing()
+ {
+ if(table.isEditing())
+ {
+ TableCellEditor cellEditor =
table.getCellEditor(table.getEditingRow(), table.getEditingColumn());
+ cellEditor.stopCellEditing();
+ }
}
/****************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
