You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2012/08/21 01:47:50 UTC
svn commit: r1375325 - in /jmeter/trunk/src/protocol:
jms/org/apache/jmeter/protocol/jms/control/gui/
jms/org/apache/jmeter/protocol/jms/sampler/
ldap/org/apache/jmeter/protocol/ldap/config/gui/
mail/org/apache/jmeter/protocol/mail/sampler/ mail/org/ap...
Author: sebb
Date: Mon Aug 20 23:47:50 2012
New Revision: 1375325
URL: http://svn.apache.org/viewvc?rev=1375325&view=rev
Log:
Standardise on static final
No code change
Modified:
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java?rev=1375325&r1=1375324&r2=1375325&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java Mon Aug 20 23:47:50 2012
@@ -104,11 +104,11 @@ public class JMSPublisherGui extends Abs
private JCheckBox useNonPersistentDelivery;
// These are the names of properties used to define the labels
- private final static String DEST_SETUP_STATIC = "jms_dest_setup_static"; // $NON-NLS-1$
+ private static final String DEST_SETUP_STATIC = "jms_dest_setup_static"; // $NON-NLS-1$
- private final static String DEST_SETUP_DYNAMIC = "jms_dest_setup_dynamic"; // $NON-NLS-1$
+ private static final String DEST_SETUP_DYNAMIC = "jms_dest_setup_dynamic"; // $NON-NLS-1$
// Button group resources
- private final static String[] DEST_SETUP_ITEMS = { DEST_SETUP_STATIC, DEST_SETUP_DYNAMIC };
+ private static final String[] DEST_SETUP_ITEMS = { DEST_SETUP_STATIC, DEST_SETUP_DYNAMIC };
private final JLabeledRadioI18N destSetup =
new JLabeledRadioI18N("jms_dest_setup", DEST_SETUP_ITEMS, DEST_SETUP_STATIC); // $NON-NLS-1$
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java?rev=1375325&r1=1375324&r2=1375325&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java Mon Aug 20 23:47:50 2012
@@ -91,13 +91,13 @@ public class JMSSubscriberGui extends Ab
new JLabeledTextField(JMeterUtils.getResString("jms_separator")); //$NON-NLS-1$
//++ Do not change these strings; they are used in JMX files to record the button settings
- public final static String RECEIVE_RSC = "jms_subscriber_receive"; // $NON-NLS-1$
+ public static final String RECEIVE_RSC = "jms_subscriber_receive"; // $NON-NLS-1$
- public final static String ON_MESSAGE_RSC = "jms_subscriber_on_message"; // $NON-NLS-1$
+ public static final String ON_MESSAGE_RSC = "jms_subscriber_on_message"; // $NON-NLS-1$
//--
// Button group resources
- private final static String[] CLIENT_ITEMS = { RECEIVE_RSC, ON_MESSAGE_RSC };
+ private static final String[] CLIENT_ITEMS = { RECEIVE_RSC, ON_MESSAGE_RSC };
private final JLabeledRadioI18N clientChoice =
new JLabeledRadioI18N("jms_client_type", CLIENT_ITEMS, RECEIVE_RSC); // $NON-NLS-1$
@@ -106,11 +106,11 @@ public class JMSSubscriberGui extends Ab
new JCheckBox(JMeterUtils.getResString("jms_stop_between_samples"), true); // $NON-NLS-1$
// These are the names of properties used to define the labels
- private final static String DEST_SETUP_STATIC = "jms_dest_setup_static"; // $NON-NLS-1$
+ private static final String DEST_SETUP_STATIC = "jms_dest_setup_static"; // $NON-NLS-1$
- private final static String DEST_SETUP_DYNAMIC = "jms_dest_setup_dynamic"; // $NON-NLS-1$
+ private static final String DEST_SETUP_DYNAMIC = "jms_dest_setup_dynamic"; // $NON-NLS-1$
// Button group resources
- private final static String[] DEST_SETUP_ITEMS = { DEST_SETUP_STATIC, DEST_SETUP_DYNAMIC };
+ private static final String[] DEST_SETUP_ITEMS = { DEST_SETUP_STATIC, DEST_SETUP_DYNAMIC };
private final JLabeledRadioI18N destSetup =
new JLabeledRadioI18N("jms_dest_setup", DEST_SETUP_ITEMS, DEST_SETUP_STATIC); // $NON-NLS-1$
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=1375325&r1=1375324&r2=1375325&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java Mon Aug 20 23:47:50 2012
@@ -84,9 +84,9 @@ public class JMSSampler extends Abstract
private static final String XML_DATA = "HTTPSamper.xml_data"; // $NON-NLS-1$
- private final static String SEND_QUEUE = "JMSSampler.SendQueue"; // $NON-NLS-1$
+ private static final String SEND_QUEUE = "JMSSampler.SendQueue"; // $NON-NLS-1$
- private final static String QUEUE_CONNECTION_FACTORY_JNDI = "JMSSampler.queueconnectionfactory"; // $NON-NLS-1$
+ private static final String QUEUE_CONNECTION_FACTORY_JNDI = "JMSSampler.queueconnectionfactory"; // $NON-NLS-1$
private static final String IS_NON_PERSISTENT = "JMSSampler.isNonPersistent"; // $NON-NLS-1$
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java?rev=1375325&r1=1375324&r2=1375325&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java Mon Aug 20 23:47:50 2012
@@ -428,7 +428,7 @@ public class SubscriberSampler extends B
}
// This was the old value that was checked for
- private final static String RECEIVE_STR = JMeterUtils.getResString(JMSSubscriberGui.RECEIVE_RSC); // $NON-NLS-1$
+ private static final String RECEIVE_STR = JMeterUtils.getResString(JMSSubscriberGui.RECEIVE_RSC); // $NON-NLS-1$
public boolean isStopBetweenSamples() {
return getPropertyAsBoolean(STOP_BETWEEN, false);
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java?rev=1375325&r1=1375324&r2=1375325&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java Mon Aug 20 23:47:50 2012
@@ -61,8 +61,8 @@ public class LdapExtConfigGui extends Ab
private static final long serialVersionUID = 240L;
- // private final static String ROOTDN = "rootDn";
- // private final static String TEST = "tesT";
+ // private static final String ROOTDN = "rootDn";
+ // private static final String TEST = "tesT";
// private static String testValue="NNNN";
private JTextField rootdn = new JTextField(20);
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java?rev=1375325&r1=1375324&r2=1375325&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java Mon Aug 20 23:47:50 2012
@@ -70,16 +70,16 @@ public class MailReaderSampler extends A
"org.apache.jmeter.config.gui.SimpleConfigGui"}));
//+ JMX attributes - do not change the values
- private final static String SERVER_TYPE = "host_type"; // $NON-NLS-1$
- private final static String SERVER = "host"; // $NON-NLS-1$
- private final static String PORT = "port"; // $NON-NLS-1$
- private final static String USERNAME = "username"; // $NON-NLS-1$
- private final static String PASSWORD = "password"; // $NON-NLS-1$
- private final static String FOLDER = "folder"; // $NON-NLS-1$
- private final static String DELETE = "delete"; // $NON-NLS-1$
- private final static String NUM_MESSAGES = "num_messages"; // $NON-NLS-1$
+ private static final String SERVER_TYPE = "host_type"; // $NON-NLS-1$
+ private static final String SERVER = "host"; // $NON-NLS-1$
+ private static final String PORT = "port"; // $NON-NLS-1$
+ private static final String USERNAME = "username"; // $NON-NLS-1$
+ private static final String PASSWORD = "password"; // $NON-NLS-1$
+ private static final String FOLDER = "folder"; // $NON-NLS-1$
+ private static final String DELETE = "delete"; // $NON-NLS-1$
+ private static final String NUM_MESSAGES = "num_messages"; // $NON-NLS-1$
private static final String NEW_LINE = "\n"; // $NON-NLS-1$
- private final static String STORE_MIME_MESSAGE = "storeMimeMessage";
+ private static final String STORE_MIME_MESSAGE = "storeMimeMessage";
//-
private static final String RFC_822_DEFAULT_ENCODING = "iso-8859-1"; // RFC 822 uses ascii per default
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java?rev=1375325&r1=1375324&r2=1375325&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java Mon Aug 20 23:47:50 2012
@@ -71,30 +71,30 @@ public class SmtpSampler extends Abstrac
private static final Logger log = LoggingManager.getLoggerForClass();
//+JMX file attribute names - do not change any values!
- public final static String SERVER = "SMTPSampler.server"; // $NON-NLS-1$
+ public static final String SERVER = "SMTPSampler.server"; // $NON-NLS-1$
- public final static String SERVER_PORT = "SMTPSampler.serverPort"; // $NON-NLS-1$
- public final static String USE_AUTH = "SMTPSampler.useAuth"; // $NON-NLS-1$
- public final static String USERNAME = "SMTPSampler.username"; // $NON-NLS-1$
- public final static String PASSWORD = "SMTPSampler.password"; // $NON-NLS-1$
- public final static String MAIL_FROM = "SMTPSampler.mailFrom"; // $NON-NLS-1$
+ public static final String SERVER_PORT = "SMTPSampler.serverPort"; // $NON-NLS-1$
+ public static final String USE_AUTH = "SMTPSampler.useAuth"; // $NON-NLS-1$
+ public static final String USERNAME = "SMTPSampler.username"; // $NON-NLS-1$
+ public static final String PASSWORD = "SMTPSampler.password"; // $NON-NLS-1$
+ public static final String MAIL_FROM = "SMTPSampler.mailFrom"; // $NON-NLS-1$
public static final String MAIL_REPLYTO = "SMTPSampler.replyTo"; // $NON-NLS-1$
- public final static String RECEIVER_TO = "SMTPSampler.receiverTo"; // $NON-NLS-1$
- public final static String RECEIVER_CC = "SMTPSampler.receiverCC"; // $NON-NLS-1$
- public final static String RECEIVER_BCC = "SMTPSampler.receiverBCC"; // $NON-NLS-1$
-
- public final static String SUBJECT = "SMTPSampler.subject"; // $NON-NLS-1$
- public final static String SUPPRESS_SUBJECT = "SMTPSampler.suppressSubject"; // $NON-NLS-1$
- public final static String MESSAGE = "SMTPSampler.message"; // $NON-NLS-1$
- public final static String PLAIN_BODY = "SMTPSampler.plainBody"; // $NON-NLS-1$
- public final static String INCLUDE_TIMESTAMP = "SMTPSampler.include_timestamp"; // $NON-NLS-1$
- public final static String ATTACH_FILE = "SMTPSampler.attachFile"; // $NON-NLS-1$
- public final static String MESSAGE_SIZE_STATS = "SMTPSampler.messageSizeStatistics"; // $NON-NLS-1$
+ public static final String RECEIVER_TO = "SMTPSampler.receiverTo"; // $NON-NLS-1$
+ public static final String RECEIVER_CC = "SMTPSampler.receiverCC"; // $NON-NLS-1$
+ public static final String RECEIVER_BCC = "SMTPSampler.receiverBCC"; // $NON-NLS-1$
+
+ public static final String SUBJECT = "SMTPSampler.subject"; // $NON-NLS-1$
+ public static final String SUPPRESS_SUBJECT = "SMTPSampler.suppressSubject"; // $NON-NLS-1$
+ public static final String MESSAGE = "SMTPSampler.message"; // $NON-NLS-1$
+ public static final String PLAIN_BODY = "SMTPSampler.plainBody"; // $NON-NLS-1$
+ public static final String INCLUDE_TIMESTAMP = "SMTPSampler.include_timestamp"; // $NON-NLS-1$
+ public static final String ATTACH_FILE = "SMTPSampler.attachFile"; // $NON-NLS-1$
+ public static final String MESSAGE_SIZE_STATS = "SMTPSampler.messageSizeStatistics"; // $NON-NLS-1$
public static final String HEADER_FIELDS = "SMTPSampler.headerFields"; // $NON-NLS-1$
- public final static String USE_EML = "SMTPSampler.use_eml"; // $NON-NLS-1$
- public final static String EML_MESSAGE_TO_SEND = "SMTPSampler.emlMessageToSend"; // $NON-NLS-1$
+ public static final String USE_EML = "SMTPSampler.use_eml"; // $NON-NLS-1$
+ public static final String EML_MESSAGE_TO_SEND = "SMTPSampler.emlMessageToSend"; // $NON-NLS-1$
public static final String ENABLE_DEBUG = "SMTPSampler.enableDebug"; // $NON-NLS-1$
// Used to separate attachment file names in JMX fields - do not change!
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java?rev=1375325&r1=1375324&r2=1375325&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SecuritySettingsPanel.java Mon Aug 20 23:47:50 2012
@@ -42,12 +42,12 @@ public class SecuritySettingsPanel exten
//++JMX attribute names - do not change the values!
// These were moved from SMTPSampler, which is why the prefix is still SMTSampler
- public final static String USE_SSL = "SMTPSampler.useSSL"; // $NON-NLS-1$
- public final static String USE_STARTTLS = "SMTPSampler.useStartTLS"; // $NON-NLS-1$
- public final static String SSL_TRUST_ALL_CERTS = "SMTPSampler.trustAllCerts"; // $NON-NLS-1$
- public final static String ENFORCE_STARTTLS = "SMTPSampler.enforceStartTLS"; // $NON-NLS-1$
- public final static String USE_LOCAL_TRUSTSTORE = "SMTPSampler.useLocalTrustStore"; // $NON-NLS-1$
- public final static String TRUSTSTORE_TO_USE = "SMTPSampler.trustStoreToUse"; // $NON-NLS-1$
+ public static final String USE_SSL = "SMTPSampler.useSSL"; // $NON-NLS-1$
+ public static final String USE_STARTTLS = "SMTPSampler.useStartTLS"; // $NON-NLS-1$
+ public static final String SSL_TRUST_ALL_CERTS = "SMTPSampler.trustAllCerts"; // $NON-NLS-1$
+ public static final String ENFORCE_STARTTLS = "SMTPSampler.enforceStartTLS"; // $NON-NLS-1$
+ public static final String USE_LOCAL_TRUSTSTORE = "SMTPSampler.useLocalTrustStore"; // $NON-NLS-1$
+ public static final String TRUSTSTORE_TO_USE = "SMTPSampler.trustStoreToUse"; // $NON-NLS-1$
//--JMX attribute names
private ButtonGroup bgSecuritySettings;