Author: sebb
Date: Wed Feb 17 02:08:03 2010
New Revision: 910799
URL: http://svn.apache.org/viewvc?rev=910799&view=rev
Log: (empty)
Modified:
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java?rev=910799&r1=910798&r2=910799&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
Wed Feb 17 02:08:03 2010
@@ -113,18 +113,22 @@
@Override
public void configure(TestElement element) {
MailReaderSampler mrs = (MailReaderSampler) element;
- if (mrs.getServerType().equals(MailReaderSampler.TYPE_POP3)) {
+ final String serverType = mrs.getServerType();
+ if (serverType.equals(MailReaderSampler.TYPE_POP3)) {
serverTypeBox.setSelectedItem(POP3Label);
folderBox.setText(INBOX);
- } else if (mrs.getServerType().equals(MailReaderSampler.TYPE_POP3S)) {
+ } else if (serverType.equals(MailReaderSampler.TYPE_POP3S)) {
serverTypeBox.setSelectedItem(POP3SLabel);
folderBox.setText(INBOX);
- } else if (mrs.getServerType().equals(MailReaderSampler.TYPE_IMAPS)) {
+ } else if (serverType.equals(MailReaderSampler.TYPE_IMAPS)) {
serverTypeBox.setSelectedItem(IMAPSLabel);
folderBox.setText(mrs.getFolder());
- } else {
+ } else if (serverType.equals(MailReaderSampler.TYPE_IMAP)) {
serverTypeBox.setSelectedItem(IMAPLabel);
folderBox.setText(mrs.getFolder());
+ } else {
+ serverTypeBox.setSelectedItem(serverType);
+ folderBox.setText(mrs.getFolder());
}
serverBox.setText(mrs.getServer());
portBox.setText(mrs.getPort());
@@ -167,8 +171,10 @@
mrs.setServerType(MailReaderSampler.TYPE_POP3S);
} else if (item.equals(IMAPSLabel)){
mrs.setServerType(MailReaderSampler.TYPE_IMAPS);
- } else {
+ } else if (item.equals(IMAPLabel)){
mrs.setServerType(MailReaderSampler.TYPE_IMAP);
+ } else {
+ mrs.setServerType(item);
}
mrs.setFolder(folderBox.getText());
@@ -203,6 +209,7 @@
serverTypeModel.addElement(IMAPLabel);
serverTypeModel.addElement(IMAPSLabel);
serverTypeBox = new JComboBox(serverTypeModel);
+ serverTypeBox.setEditable(true);
serverTypeBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
final String item = (String) serverTypeBox.getSelectedItem();
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=910799&r1=910798&r2=910799&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Feb 17 02:08:03 2010
@@ -152,6 +152,7 @@
<li>Bug 47556 - JMS-PoinToPoint-Sampler Timout field should use Strings</li>
<li>Bug 47947 - Mail Reader Sampler should allow port to be overridden</li>
<li>Bug 48155 - Multiple problems / enhancements with JMS protocol classes</li>
+<li>Allow MailReader sampler to use arbitrary protocols</li>
</ul>
<h3>Controllers</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
