You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/12/31 04:18:38 UTC
svn commit: r1054043 - in /jakarta/jmeter/trunk/src:
core/org/apache/jmeter/control/ functions/org/apache/jmeter/functions/
protocol/jms/org/apache/jmeter/protocol/jms/sampler/
protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/
protocol/mail/or...
Author: sebb
Date: Fri Dec 31 03:18:37 2010
New Revision: 1054043
URL: http://svn.apache.org/viewvc?rev=1054043&view=rev
Log:
Tab police
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java?rev=1054043&r1=1054042&r2=1054043&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java Fri Dec 31 03:18:37 2010
@@ -208,7 +208,7 @@ public class TransactionController exten
if (!isParent()) {
// Check if we are still sampling our children
if(res != null && !se.isTransactionSampleEvent()) {
- SampleResult sampleResult = se.getResult();
+ SampleResult sampleResult = se.getResult();
res.setThreadName(sampleResult.getThreadName());
res.setBytes(res.getBytes() + sampleResult.getBytes());
if (!isIncludeTimers()) {// Accumulate waiting time for later
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java?rev=1054043&r1=1054042&r2=1054043&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java Fri Dec 31 03:18:37 2010
@@ -35,7 +35,7 @@ public class SamplerName extends Abstrac
private static final String KEY = "__samplerName"; //$NON-NLS-1$
- private static final List<String> desc = new LinkedList<String>();
+ private static final List<String> desc = new LinkedList<String>();
static {
// desc.add("Use fully qualified host name: TRUE/FALSE (Default FALSE)");
@@ -44,16 +44,16 @@ public class SamplerName extends Abstrac
private Object[] values;
- /** {@inheritDoc} */
- @Override
- public String execute(SampleResult previousResult, Sampler currentSampler)
- throws InvalidVariableException {
- // return JMeterContextService.getContext().getCurrentSampler().getName();
- String name = "";
- if (currentSampler != null) { // will be null if function is used on TestPlan
- name = currentSampler.getName();
- }
- if (values.length > 0){
+ /** {@inheritDoc} */
+ @Override
+ public String execute(SampleResult previousResult, Sampler currentSampler)
+ throws InvalidVariableException {
+ // return JMeterContextService.getContext().getCurrentSampler().getName();
+ String name = "";
+ if (currentSampler != null) { // will be null if function is used on TestPlan
+ name = currentSampler.getName();
+ }
+ if (values.length > 0){
JMeterVariables vars = getVariables();
if (vars != null) {// May be null if function is used on TestPlan
String varName = ((CompoundVariable) values[0]).execute().trim();
@@ -61,26 +61,26 @@ public class SamplerName extends Abstrac
vars.put(varName, name);
}
}
- }
+ }
return name;
- }
+ }
- /** {@inheritDoc} */
- @Override
- public synchronized void setParameters(Collection<CompoundVariable> parameters)
- throws InvalidVariableException {
+ /** {@inheritDoc} */
+ @Override
+ public synchronized void setParameters(Collection<CompoundVariable> parameters)
+ throws InvalidVariableException {
checkParameterCount(parameters, 0, 1);
values = parameters.toArray();
- }
+ }
- /** {@inheritDoc} */
- @Override
- public String getReferenceKey() {
- return KEY;
- }
-
- /** {@inheritDoc} */
- public List<String> getArgumentDesc() {
- return desc;
- }
+ /** {@inheritDoc} */
+ @Override
+ public String getReferenceKey() {
+ return KEY;
+ }
+
+ /** {@inheritDoc} */
+ public List<String> getArgumentDesc() {
+ return desc;
+ }
}
Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java?rev=1054043&r1=1054042&r2=1054043&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java Fri Dec 31 03:18:37 2010
@@ -299,7 +299,7 @@ public abstract class BaseJMSSampler ext
* @param isStatic
*/
public void setDestinationStatic(boolean isStatic) {
- setProperty(DESTINATION_STATIC, isStatic, DESTINATION_STATIC_DEFAULT);
+ setProperty(DESTINATION_STATIC, isStatic, DESTINATION_STATIC_DEFAULT);
}
/**
Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java?rev=1054043&r1=1054042&r2=1054043&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java Fri Dec 31 03:18:37 2010
@@ -318,7 +318,7 @@ public class SmtpPanel extends JPanel {
* @param plainBody whether to use a plain body (i.e. not multipart/mixed)
*/
public void setPlainBody(boolean plainBody) {
- cbPlainBody.setSelected(plainBody);
+ cbPlainBody.setSelected(plainBody);
}
/**
Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java?rev=1054043&r1=1054042&r2=1054043&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java Fri Dec 31 03:18:37 2010
@@ -97,7 +97,7 @@ public class SendMailCommand {
private StringBuffer serverResponse = new StringBuffer(); // TODO this is not populated currently
/** send plain body, i.e. not multipart/mixed */
- private boolean plainBody;
+ private boolean plainBody;
/**
* Standard-Constructor
@@ -756,7 +756,7 @@ public class SendMailCommand {
* @param plainBody <code>true</code> if sending a plain body (i.e. not multipart/mixed)
*/
public void setPlainBody(boolean plainBody){
- this.plainBody = plainBody;
+ this.plainBody = plainBody;
}
public StringBuffer getServerResponse() {
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org