root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Tristate default values need to be saved 

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1418687 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2012-12-08 15:33:30 +00:00
parent 7d3a557580
commit 19cf355254
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java
View File

@ -128,7 +128,7 @@ public class TCPConfigGui extends AbstractConfigGui {
element.setProperty(TCPSampler.TIMEOUT, serverPanel.getResponseTimeout());
element.setProperty(TCPSampler.TIMEOUT_CONNECT, serverPanel.getConnectTimeout(),"");
element.setProperty(TCPSampler.REQUEST, requestData.getText());
setPropertyFromTristate(element, closeConnection, TCPSampler.CLOSE_CONNECTION, TCPSampler.CLOSE_CONNECTION_DEFAULT);
setPropertyFromTristate(element, closeConnection, TCPSampler.CLOSE_CONNECTION); // Don't use default for saving tristates
// element.setProperty(TCPSampler.CLOSE_CONNECTION, closeConnection.isSelected(), TCPSampler.CLOSE_CONNECTION_DEFAULT);
element.setProperty(TCPSampler.SO_LINGER, soLinger.getText(), "");
element.setProperty(TCPSampler.EOL_BYTE, eolByte.getText(), "");
@ -279,7 +279,7 @@ public class TCPConfigGui extends AbstractConfigGui {
add(mainPanel, BorderLayout.CENTER);
}
// TODO should be moved somewhere shared
// TODO should be moved somewhere shared, perhaps TristateCheckBox?
private void setTristateFromProperty(TestElement element, TristateCheckBox checkBox, String propName) {
JMeterProperty jmp = element.getProperty(propName);
if (jmp instanceof NullProperty) {
@ -289,7 +289,7 @@ public class TCPConfigGui extends AbstractConfigGui {
}
}
// TODO should be moved somewhere shared
// TODO should be moved somewhere shared, perhaps TristateCheckBox?
/**
* Sets a boolean property from a tristate checkbox.
*
@ -305,21 +305,4 @@ public class TCPConfigGui extends AbstractConfigGui {
}
}
// TODO should be moved somewhere shared
/**
* Sets a boolean property from a tristate checkbox, with default.
*
* @param element the test element
* @param checkBox the tristate checkbox
* @param propName the property name
* @param dflt the default (if default, the property is removed)
*/
private void setPropertyFromTristate(TestElement element, TristateCheckBox checkBox, String propName, boolean dflt) {
if (checkBox.isIndeterminate()) {
element.removeProperty(propName);
} else {
element.setProperty(propName, checkBox.isSelected(), dflt);
}
}
}