Author: sebb
Date: Sun Sep 9 11:39:47 2007
New Revision: 574048
URL: http://svn.apache.org/viewvc?rev=574048&view=rev
Log:
Bug 42948 - Problems with Proxy gui table fields in Java 1.6
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=574048&r1=574047&r2=574048&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Sun Sep 9 11:39:47 2007
@@ -23,7 +23,6 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyEvent;
@@ -68,7 +67,7 @@
import org.apache.log.Logger;
public class ProxyControlGui extends LogicControllerGui implements
JMeterGUIComponent, ActionListener, ItemListener,
- KeyListener, FocusListener, UnsharedComponent {
+ KeyListener, UnsharedComponent {
private static transient Logger log =
LoggingManager.getLoggerForClass();
private JTextField portField;
@@ -200,6 +199,12 @@
* @see
org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
public void modifyTestElement(TestElement el) {
+ if (excludeTable.isEditing()) {// Bug 42948
+ excludeTable.getCellEditor().stopCellEditing();
+ }
+ if (includeTable.isEditing()) {// Bug 42948
+ includeTable.getCellEditor().stopCellEditing();
+ }
configureTestElement(el);
if (el instanceof ProxyControl) {
model = (ProxyControl) el;
@@ -288,16 +293,6 @@
p_model.fireTableDataChanged();
}
- public void focusLost(FocusEvent e) {
- try {
- ((JTable)
e.getSource()).getCellEditor().stopCellEditing();
- } catch (Exception err) {
- }
- }
-
- public void focusGained(FocusEvent e) {
- }
-
/*
* Handles groupingMode. actionPerfomed is not suitable, as that seems
to be
* activated whenever the Proxy is selected in the Test Plan
@@ -698,7 +693,6 @@
includeModel = new PowerTableModel(new String[] { INCLUDE_COL
}, new Class[] { String.class });
includeTable = new JTable(includeModel);
includeTable.setPreferredScrollableViewportSize(new
Dimension(100, 30));
- includeTable.addFocusListener(this);
JPanel panel = new JPanel(new BorderLayout());
panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
JMeterUtils
@@ -714,7 +708,6 @@
excludeModel = new PowerTableModel(new String[] { EXCLUDE_COL
}, new Class[] { String.class });
excludeTable = new JTable(excludeModel);
excludeTable.setPreferredScrollableViewportSize(new
Dimension(100, 30));
- excludeTable.addFocusListener(this);
JPanel panel = new JPanel(new BorderLayout());
panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
JMeterUtils
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?rev=574048&r1=574047&r2=574048&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sun Sep 9 11:39:47 2007
@@ -36,6 +36,7 @@
<li>Fix NPE in SampleResultConverter - XStream PrettyPrintWriter cannot handle
nulls</li>
<li>If Java HTTP sampler sees null ResponseMessage, replace with HTTP
header</li>
<li>Bug 43332 - 2.3RC4 does not clear Guis based on TestBean</li>
+<li>Bug 42948 - Problems with Proxy gui table fields in Java 1.6</li>
</ul>
<h4>Improvements</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
