You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/06/03 14:57:53 UTC
svn commit: r543887 - in
/jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler:
MailReaderSampler.java gui/MailReaderSamplerGui.java
Author: sebb
Date: Sun Jun 3 05:57:53 2007
New Revision: 543887
URL: http://svn.apache.org/viewvc?view=rev&rev=543887
Log:
Message count was not being restored correctly
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java?view=diff&rev=543887&r1=543886&r2=543887
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java Sun Jun 3 05:57:53 2007
@@ -34,6 +34,7 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.IntegerProperty;
+import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -55,12 +56,12 @@
// Needed by GUI
public final static String TYPE_POP3 = "pop3"; // $NON-NLS-1$
public final static String TYPE_IMAP = "imap"; // $NON-NLS-1$
-
+ public static final int ALL_MESSAGES = -1;
public MailReaderSampler() {
setServerType(TYPE_POP3);
setFolder("INBOX");
- setNumMessages(-1);
+ setNumMessages(ALL_MESSAGES);
setDeleteMessages(false);
}
@@ -107,7 +108,7 @@
data.append(" messages found\n");
int n = getNumMessages();
- if (n == -1 || n > messages.length)
+ if (n == ALL_MESSAGES || n > messages.length)
n = messages.length;
// TODO - create a sample result for each message?
@@ -299,11 +300,28 @@
}
/**
- * @return The number of messages to retrive from the mail server. -1
- * denotes get all messages.
+ * @param num_messages -
+ * The number of messages to retrieve from the mail server. Set
+ * this value to -1 to retrieve all messages.
+ */
+ public void setNumMessages(String num_messages) {
+ setProperty(new StringProperty(NUM_MESSAGES, num_messages));
+ }
+
+ /**
+ * @return The number of messages to retrieve from the mail server.
+ * -1 denotes get all messages.
*/
public int getNumMessages() {
return getPropertyAsInt(NUM_MESSAGES);
+ }
+
+ /**
+ * @return The number of messages to retrieve from the mail server.
+ * -1 denotes get all messages.
+ */
+ public String getNumMessagesString() {
+ return getPropertyAsString(NUM_MESSAGES);
}
/**
Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java?view=diff&rev=543887&r1=543886&r2=543887
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java Sun Jun 3 05:57:53 2007
@@ -19,10 +19,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 javax.swing.ButtonGroup;
import javax.swing.DefaultComboBoxModel;
@@ -91,14 +87,7 @@
private static final String INBOX = "INBOX"; // $NON-NLS-1$
-// NOTREAD private String type;
- private boolean delete;
-
- private int num_messages;
-
public MailReaderSamplerGui() {
- // NOTREAD type = MailReaderSampler.TYPE_POP3;
- delete = false;
init();
}
@@ -123,12 +112,12 @@
serverBox.setText(mrs.getServer());
usernameBox.setText(mrs.getUserName());
passwordBox.setText(mrs.getPassword());
- if (mrs.getNumMessages() == -1) {
+ if (mrs.getNumMessages() == MailReaderSampler.ALL_MESSAGES) {
allMessagesButton.setSelected(true);
- someMessagesField.setText(Integer.toString(0));
+ someMessagesField.setText("0"); // $NON-NLS-1$
} else {
someMessagesButton.setSelected(true);
- someMessagesField.setText(Integer.toString(mrs.getNumMessages()));
+ someMessagesField.setText(mrs.getNumMessagesString());
}
deleteBox.setSelected(mrs.getDeleteMessages());
super.configure(element);
@@ -167,10 +156,10 @@
mrs.setUserName(usernameBox.getText());
mrs.setPassword(passwordBox.getText());
if (allMessagesButton.isSelected())
- mrs.setNumMessages(-1);
+ mrs.setNumMessages(MailReaderSampler.ALL_MESSAGES);
else
- mrs.setNumMessages(num_messages);
- mrs.setDeleteMessages(delete);
+ mrs.setNumMessages(someMessagesField.getText());
+ mrs.setDeleteMessages(deleteBox.isSelected());
}
// TODO - fix GUI layout problems
@@ -192,12 +181,10 @@
serverTypeBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (((String) serverTypeBox.getSelectedItem()).equals(POP3Label)) {
- // NOTREAD type = MailReaderSampler.TYPE_POP3;
folderLabel.setEnabled(false);
folderBox.setText(INBOX);
folderBox.setEnabled(false);
} else {
- // NOTREAD type = MailReaderSampler.TYPE_IMAP;
folderLabel.setEnabled(true);
folderBox.setEnabled(true);
}
@@ -253,35 +240,14 @@
nmbg.add(allMessagesButton);
nmbg.add(someMessagesButton);
someMessagesField = new JTextField(5);
- someMessagesField.setText(Integer.toString(0));
- someMessagesField.addFocusListener(new FocusListener() {
- public void focusGained(FocusEvent e) {
- }
-
- public void focusLost(FocusEvent e) {
- try {
- num_messages = Integer.parseInt(someMessagesField.getText());
- } catch (NumberFormatException nfe) {
- num_messages = 0;
- }
- }
- });
+ someMessagesField.setText("0");
allMessagesButton.setSelected(true);
numMessagesPanel.add(allMessagesButton);
numMessagesPanel.add(someMessagesButton);
numMessagesPanel.add(someMessagesField);
add(numMessagesPanel);
- deleteBox = new JCheckBox(DeleteLabel, delete);
- deleteBox.addItemListener(new ItemListener() {
- public void itemStateChanged(ItemEvent event) {
- if (event.getStateChange() == ItemEvent.SELECTED) {
- delete = true;
- } else {
- delete = false;
- }
- }
- });
+ deleteBox = new JCheckBox(DeleteLabel);
add(deleteBox);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org