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 2006/04/05 21:09:33 UTC
svn commit: r391724 - in
/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/reporters:
MailerModel.java MailerResultCollector.java
Author: sebb
Date: Wed Apr 5 12:09:32 2006
New Revision: 391724
URL: http://svn.apache.org/viewcvs?rev=391724&view=rev
Log:
Tidy up; add NLS markers
Modified:
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/reporters/MailerModel.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/reporters/MailerResultCollector.java
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/reporters/MailerModel.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/reporters/MailerModel.java?rev=391724&r1=391723&r2=391724&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/reporters/MailerModel.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/reporters/MailerModel.java Wed Apr 5 12:09:32 2006
@@ -48,7 +48,10 @@
* @version $Revision$ $Date$
*/
public class MailerModel extends AbstractTestElement implements Serializable {
- private static final String MAIL_SMTP_HOST = "mail.smtp.host";
+
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
+ private static final String MAIL_SMTP_HOST = "mail.smtp.host"; //$NON-NLS-1$
private long failureCount = 0;
@@ -60,21 +63,21 @@
private boolean successMsgSent = false;
- private static final String FROM_KEY = "MailerModel.fromAddress";
+ private static final String FROM_KEY = "MailerModel.fromAddress"; //$NON-NLS-1$
- private static final String TO_KEY = "MailerModel.addressie";
+ private static final String TO_KEY = "MailerModel.addressie"; //$NON-NLS-1$
- private static final String HOST_KEY = "MailerModel.smtpHost";
+ private static final String HOST_KEY = "MailerModel.smtpHost"; //$NON-NLS-1$
- private static final String SUCCESS_SUBJECT = "MailerModel.successSubject";
+ private static final String SUCCESS_SUBJECT = "MailerModel.successSubject"; //$NON-NLS-1$
- private static final String FAILURE_SUBJECT = "MailerModel.failureSubject";
+ private static final String FAILURE_SUBJECT = "MailerModel.failureSubject"; //$NON-NLS-1$
- private static final String FAILURE_LIMIT_KEY = "MailerModel.failureLimit";
+ private static final String FAILURE_LIMIT_KEY = "MailerModel.failureLimit"; //$NON-NLS-1$
- private static final String SUCCESS_LIMIT_KEY = "MailerModel.successLimit";
+ private static final String SUCCESS_LIMIT_KEY = "MailerModel.successLimit"; //$NON-NLS-1$
- transient private static Logger log = LoggingManager.getLoggerForClass();
+ private static final String DEFAULT_LIMIT = "2"; //$NON-NLS-1$
/** The listener for changes. */
ChangeListener changeListener;
@@ -85,8 +88,8 @@
public MailerModel() {
super();
- setProperty(SUCCESS_LIMIT_KEY, JMeterUtils.getPropDefault("mailer.successlimit", "2"));
- setProperty(FAILURE_LIMIT_KEY, JMeterUtils.getPropDefault("mailer.failurelimit", "2"));
+ setProperty(SUCCESS_LIMIT_KEY, JMeterUtils.getPropDefault("mailer.successlimit", DEFAULT_LIMIT)); //$NON-NLS-1$
+ setProperty(FAILURE_LIMIT_KEY, JMeterUtils.getPropDefault("mailer.failurelimit", DEFAULT_LIMIT)); //$NON-NLS-1$
}
public void addChangeListener(ChangeListener list) {
@@ -129,14 +132,14 @@
Vector addressVector = new Vector();
if (theAddressie != null) {
- String addressSep = ",";
+ String addressSep = ","; //$NON-NLS-1$
StringTokenizer next = new StringTokenizer(theAddressie, addressSep);
while (next.hasMoreTokens()) {
String theToken = next.nextToken().trim();
- if (theToken.indexOf("@") > 0) {
+ if (theToken.indexOf("@") > 0) { //$NON-NLS-1$
addressVector.addElement(theToken);
}
}
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/reporters/MailerResultCollector.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/reporters/MailerResultCollector.java?rev=391724&r1=391723&r2=391724&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/reporters/MailerResultCollector.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/reporters/MailerResultCollector.java Wed Apr 5 12:09:32 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -23,16 +22,13 @@
import org.apache.jmeter.samplers.SampleEvent;
import org.apache.jmeter.testelement.property.TestElementProperty;
-// import org.apache.jorphan.logging.LoggingManager;
-// import org.apache.log.Logger;
/**
* @author Michael Stover
* @version $Revision$
*/
public class MailerResultCollector extends ResultCollector implements Serializable {
- // transient private static Logger log = LoggingManager.getLoggerForClass();
- public static final String MAILER_MODEL = "MailerResultCollector.mailer_model";
+ public static final String MAILER_MODEL = "MailerResultCollector.mailer_model"; //$NON-NLS-1$
public MailerResultCollector() {
super();
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org