sebb 2004/08/19 11:04:06
Modified: src/components/org/apache/jmeter/visualizers
MailerVisualizer.java
Log:
Use sendTestMail method in model
Revision Changes Path
1.21 +12 -22
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
Index: MailerVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MailerVisualizer.java 5 Mar 2004 01:33:33 -0000 1.20
+++ MailerVisualizer.java 19 Aug 2004 18:04:06 -0000 1.21
@@ -28,6 +28,8 @@
import java.net.UnknownHostException;
import java.util.Vector;
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JLabel;
@@ -273,34 +275,22 @@
try
{
MailerModel
model=((MailerResultCollector)getModel()).getMailerModel();
-
- String to= addressField.getText();
- String from= fromField.getText();
- String via= smtpHostField.getText();
- String fail= failureSubjectField.getText();
- String success= successSubjectField.getText();
-
- String testString = "JMeter-Testmail" + "\n"
- + "To: " + to + "\n"
- + "Via: " + via + "\n"
- + "Fail Subject: " + fail + "\n"
- + "Success Subject: " + success;
-
- log.debug(testString);
- Vector destination= new Vector();
- destination.add(to);
- model.sendMail(from, destination, "Testing mail-addresses",
testString, via);
- log.info("Mail sent successfully!!");
+ model.sendTestMail();
}
catch (UnknownHostException e1)
{
log.error("Invalid Mail Server ", e1);
displayMessage(JMeterUtils.getResString("invalid_mail_server"), true);
}
- catch (Exception ex)
+ catch (AddressException ex)
+ {
+ log.error("Invalid mail address ", ex);
+
displayMessage(JMeterUtils.getResString("invalid_mail_address"), true);
+ }
+ catch (MessagingException ex)
{
log.error("Couldn't send mail...", ex);
-
displayMessage(JMeterUtils.getResString("invalid_mail_server"), true);
+
displayMessage(JMeterUtils.getResString("invalid_mail"), true);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
