sebb 2003/11/15 18:31:49
Modified: src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui
ProxyControlGui.java
Log:
Fix copy/paste errors and tidy GUI
Revision Changes Path
1.26 +9 -18
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Index: ProxyControlGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ProxyControlGui.java 16 Nov 2003 02:17:27 -0000 1.25
+++ ProxyControlGui.java 16 Nov 2003 02:31:49 -0000 1.26
@@ -305,18 +305,14 @@
model = (ProxyControl) createTestElement();
startProxy();
}
- else if (command.equals(ProxyControl.CAPTURE_HTTP_HEADERS))
+ else if ( command.equals(ProxyControl.CAPTURE_HTTP_HEADERS)
+ || command.equals(ProxyControl.ADD_ASSERTIONS)
+ || command.equals(ProxyControl.ADD_SEPARATORS)
+ || command.equals(ProxyControl.USE_KEEPALIVE)
+ )
{
enableRestart();
}
- else if (command.equals(ProxyControl.ADD_ASSERTIONS))
- {
- enableRestart();
- }
- else if (command.equals(ProxyControl.ADD_SEPARATORS))
- {
- enableRestart();
- }
else if (command.equals(ADD_EXCLUDE))
{
excludeModel.addNewRow();
@@ -499,10 +495,10 @@
addAssertions.setActionCommand(ProxyControl.ADD_ASSERTIONS);
useKeepAlive = new
JCheckBox(JMeterUtils.getResString("proxy_usekeepalive"));
- useKeepAlive.setName(ProxyControl.ADD_ASSERTIONS);
- useKeepAlive.setSelected(false);
+ useKeepAlive.setName(ProxyControl.USE_KEEPALIVE);
+ useKeepAlive.setSelected(true);
useKeepAlive.addActionListener(this);
- useKeepAlive.setActionCommand(ProxyControl.ADD_ASSERTIONS);
+ useKeepAlive.setActionCommand(ProxyControl.USE_KEEPALIVE);
HorizontalPanel panel = new HorizontalPanel();
panel.add(label);
@@ -511,13 +507,8 @@
panel.add(Box.createHorizontalStrut(10));
panel.add(httpHeaders);
- panel.add(Box.createHorizontalStrut(10));
panel.add(useKeepAlive);
-
- panel.add(Box.createHorizontalStrut(10));
panel.add(addSeparators);
-
- panel.add(Box.createHorizontalStrut(10));
panel.add(addAssertions);
return panel;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
