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 2009/10/10 17:19:03 UTC
svn commit: r823869 [1/2] - in /jakarta/jmeter/trunk:
src/components/org/apache/jmeter/assertions/
src/components/org/apache/jmeter/control/gui/
src/components/org/apache/jmeter/extractor/
src/components/org/apache/jmeter/sampler/ src/components/org/ap...
Author: sebb
Date: Sat Oct 10 15:18:56 2009
New Revision: 823869
URL: http://svn.apache.org/viewvc?rev=823869&view=rev
Log:
StringBuffer => StringBuilder
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/StringUtilities.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/RunningSample.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathFileContainer.java
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLOption.java
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLOptionDescriptor.java
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/Token.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/io/TextFile.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/Functor.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/XMLBuffer.java
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/Base64Encoder.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArguments.java
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/TestObjectFactory.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/benchmark/ParseBenchmark.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java Sat Oct 10 15:18:56 2009
@@ -78,11 +78,11 @@
}
if (!success) {
result.setFailure(true);
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
appendResultDetails(buf, prevResult);
buf.append("Response Time: ").append(prevTime);
result.addToBaseResult(buf.toString());
- buf = new StringBuffer();
+ buf = new StringBuilder();
appendResultDetails(buf, sResult);
buf.append("Response Time: ").append(currentTime);
result.addToSecondaryResult(buf.toString());
@@ -110,11 +110,11 @@
}
if (!success) {
result.setFailure(true);
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
appendResultDetails(buf, prevResult);
buf.append(prevContent);
result.addToBaseResult(buf.toString());
- buf = new StringBuffer();
+ buf = new StringBuilder();
appendResultDetails(buf, sResult);
buf.append(currentContent);
result.addToSecondaryResult(buf.toString());
@@ -127,7 +127,7 @@
}
}
- private void appendResultDetails(StringBuffer buf, SampleResult result) {
+ private void appendResultDetails(StringBuilder buf, SampleResult result) {
final String samplerData = result.getSamplerData();
if (samplerData != null){
buf.append(samplerData.trim());
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java Sat Oct 10 15:18:56 2009
@@ -370,7 +370,7 @@
// TODO strings should be resources
private String getFailText(String stringPattern, String toCheck) {
- StringBuffer sb = new StringBuffer(200);
+ StringBuilder sb = new StringBuilder(200);
sb.append("Test failed: ");
if (isTestFieldResponseData()) {
@@ -446,9 +446,8 @@
* @return Two lines of text separated by newlines, and then forward and backward pointers
* denoting first position of difference.
*/
- private static StringBuffer equalsComparisonText(final String received, final String comparison)
+ private static StringBuilder equalsComparisonText(final String received, final String comparison)
{
- final StringBuffer text;
int firstDiff;
int lastRecDiff = -1;
int lastCompDiff = -1;
@@ -459,10 +458,8 @@
String recDeltaSeq = "";
String compDeltaSeq = "";
String endingEqSeq = "";
- final StringBuffer pad;
-
- text = new StringBuffer(Math.max(recLength, compLength) * 2);
+ final StringBuilder text = new StringBuilder(Math.max(recLength, compLength) * 2);
for (firstDiff = 0; firstDiff < minLength; firstDiff++) {
if (received.charAt(firstDiff) != comparison.charAt(firstDiff)){
break;
@@ -494,7 +491,7 @@
recDeltaSeq = trunc(true, received.substring(firstDiff, lastRecDiff + 1));
compDeltaSeq = trunc(true, comparison.substring(firstDiff, lastCompDiff + 1));
}
- pad = new StringBuffer(Math.abs(recDeltaSeq.length() - compDeltaSeq.length()));
+ final StringBuilder pad = new StringBuilder(Math.abs(recDeltaSeq.length() - compDeltaSeq.length()));
for (int i = 0; i < pad.capacity(); i++){
pad.append(' ');
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java Sat Oct 10 15:18:56 2009
@@ -59,8 +59,6 @@
public static final String XSD_FILENAME_KEY = "xmlschema_assertion_filename";
- // private StringBuffer failureMessage = new StringBuffer();
-
/**
* getResult
*
@@ -162,7 +160,7 @@
// Helper method to construct SAX error details
private static String errorDetails(SAXParseException spe) {
- StringBuffer str = new StringBuffer(80);
+ StringBuilder str = new StringBuilder(80);
int i;
i = spe.getLineNumber();
if (i != -1) {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java Sat Oct 10 15:18:56 2009
@@ -81,9 +81,9 @@
result.setFailureMessage("");
if (log.isDebugEnabled()) {
- log.debug(new StringBuffer("Validation is set to ").append(isValidating()).toString());
- log.debug(new StringBuffer("Whitespace is set to ").append(isWhitespace()).toString());
- log.debug(new StringBuffer("Tolerant is set to ").append(isTolerant()).toString());
+ log.debug(new StringBuilder("Validation is set to ").append(isValidating()).toString());
+ log.debug(new StringBuilder("Whitespace is set to ").append(isWhitespace()).toString());
+ log.debug(new StringBuilder("Tolerant is set to ").append(isTolerant()).toString());
}
Document doc = null;
@@ -97,17 +97,17 @@
} catch (SAXException e) {
log.debug("Caught sax exception: " + e);
result.setError(true);
- result.setFailureMessage(new StringBuffer("SAXException: ").append(e.getMessage()).toString());
+ result.setFailureMessage(new StringBuilder("SAXException: ").append(e.getMessage()).toString());
return result;
} catch (IOException e) {
log.warn("Cannot parse result content", e);
result.setError(true);
- result.setFailureMessage(new StringBuffer("IOException: ").append(e.getMessage()).toString());
+ result.setFailureMessage(new StringBuilder("IOException: ").append(e.getMessage()).toString());
return result;
} catch (ParserConfigurationException e) {
log.warn("Cannot parse result content", e);
result.setError(true);
- result.setFailureMessage(new StringBuffer("ParserConfigurationException: ").append(e.getMessage())
+ result.setFailureMessage(new StringBuilder("ParserConfigurationException: ").append(e.getMessage())
.toString());
return result;
} catch (TidyException e) {
@@ -145,7 +145,7 @@
} catch (TransformerException e) {
result.setError(true);
result.setFailureMessage(
- new StringBuffer("TransformerException: ")
+ new StringBuilder("TransformerException: ")
.append(e.getMessage())
.append(" for:")
.append(pathString)
@@ -155,7 +155,7 @@
if (nodeList == null || nodeList.getLength() == 0) {
if (log.isDebugEnabled()) {
- log.debug(new StringBuffer("nodeList null no match ").append(pathString).toString());
+ log.debug(new StringBuilder("nodeList null no match ").append(pathString).toString());
}
result.setFailure(!isNegated());
result.setFailureMessage("No Nodes Matched " + pathString);
@@ -165,7 +165,7 @@
log.debug("nodeList length " + nodeList.getLength());
if (!isNegated()) {
for (int i = 0; i < nodeList.getLength(); i++){
- log.debug(new StringBuffer("nodeList[").append(i).append("] ").append(nodeList.item(i)).toString());
+ log.debug(new StringBuilder("nodeList[").append(i).append("] ").append(nodeList.item(i)).toString());
}
}
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java Sat Oct 10 15:18:56 2009
@@ -89,7 +89,7 @@
private String renderPath(Collection<?> path) {
Iterator<?> iter = path.iterator();
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
boolean first = true;
while (iter.hasNext()) {
if (first) {
@@ -200,7 +200,7 @@
String seperator = " > "; // $NON-NLS-1$
if (node != null) {
for (int i = 0; i < node.getChildCount(); i++) {
- StringBuffer name = new StringBuffer();
+ StringBuilder name = new StringBuilder();
JMeterTreeNode cur = (JMeterTreeNode) node.getChildAt(i);
TestElement te = cur.getTestElement();
if (te instanceof ThreadGroup) {
@@ -214,7 +214,7 @@
name.append(cur.getName());
TreeNodeWrapper tnw = new TreeNodeWrapper(cur, name.toString());
nodesModel.addElement(tnw);
- name = new StringBuffer();
+ name = new StringBuilder();
name.append(cur.getName());
name.append(seperator);
buildNodesModel(cur, name.toString(), level + 1);
@@ -229,7 +229,7 @@
private String spaces(int level) {
int multi = 4;
- StringBuffer spaces = new StringBuffer(level * multi);
+ StringBuilder spaces = new StringBuilder(level * multi);
for (int i = 0; i < level * multi; i++) {
spaces.append(" "); // $NON-NLS-1$
}
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java Sat Oct 10 15:18:56 2009
@@ -32,7 +32,7 @@
public class DebugPostProcessor extends AbstractTestElement implements PostProcessor, TestBean {
public void process(){
- StringBuffer sb = new StringBuffer(100);
+ StringBuilder sb = new StringBuilder(100);
JMeterContext threadContext = getThreadContext();
PropertyIterator i = threadContext.getCurrentSampler().propertyIterator();
while(i.hasNext())
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java Sat Oct 10 15:18:56 2009
@@ -172,7 +172,7 @@
for (int i = 1; i <= matchCount; i++) {
match = getCorrectMatch(matches, i);
if (match != null) {
- final String refName_n = new StringBuffer(refName).append(UNDERSCORE).append(i).toString();
+ final String refName_n = new StringBuilder(refName).append(UNDERSCORE).append(i).toString();
vars.put(refName_n, generateResult(match));
saveGroups(vars, refName_n, match);
}
@@ -180,7 +180,7 @@
}
// Remove any left-over variables
for (int i = matchCount + 1; i <= prevCount; i++) {
- final String refName_n = new StringBuffer(refName).append(UNDERSCORE).append(i).toString();
+ final String refName_n = new StringBuilder(refName).append(UNDERSCORE).append(i).toString();
vars.remove(refName_n);
removeGroups(vars, refName_n);
}
@@ -198,7 +198,7 @@
* basename_g = number of groups (apart from g0)
*/
private void saveGroups(JMeterVariables vars, String basename, MatchResult match) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append(basename);
buf.append("_g"); // $NON-NLS-1$
int pfxlen=buf.length();
@@ -232,7 +232,7 @@
* basename_g = number of groups (apart from g0)
*/
private void removeGroups(JMeterVariables vars, String basename) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append(basename);
buf.append("_g"); // $NON-NLS-1$
int pfxlen=buf.length();
@@ -259,7 +259,7 @@
}
private String generateResult(MatchResult match) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int a = 0; a < template.length; a++) {
if (log.isDebugEnabled()) {
log.debug("RegexExtractor: Template piece #" + a + " = " + template[a]);
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java Sat Oct 10 15:18:56 2009
@@ -87,7 +87,7 @@
private String concat(String s1,String s2){
- return new StringBuffer(s1).append("_").append(s2).toString(); // $NON-NLS-1$
+ return new StringBuilder(s1).append("_").append(s2).toString(); // $NON-NLS-1$
}
/**
@@ -112,7 +112,7 @@
log.error(errorMessage,e);
AssertionResult ass = new AssertionResult(getName());
ass.setError(true);
- ass.setFailureMessage(new StringBuffer("IOException: ").append(e.getLocalizedMessage()).toString());
+ ass.setFailureMessage(new StringBuilder("IOException: ").append(e.getLocalizedMessage()).toString());
previousResult.addAssertionResult(ass);
previousResult.setSuccessful(false);
} catch (ParserConfigurationException e) {// Should not happen
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java Sat Oct 10 15:18:56 2009
@@ -50,8 +50,8 @@
SampleResult res = new SampleResult();
res.setSampleLabel(getName());
res.sampleStart();
- StringBuffer sb = new StringBuffer(100);
- StringBuffer rd = new StringBuffer(20); // for request Data
+ StringBuilder sb = new StringBuilder(100);
+ StringBuilder rd = new StringBuilder(20); // for request Data
if (isDisplayJMeterVariables()){
rd.append("JMeterVariables\n");
sb.append("JMeterVariables:\n");
@@ -82,7 +82,7 @@
}
@SuppressWarnings("unchecked")
- private void formatSet(StringBuffer sb, Set s) {
+ private void formatSet(StringBuilder sb, Set s) {
ArrayList<Map.Entry<Object, Object>> al = new ArrayList<Map.Entry<Object, Object>>(s);
Collections.sort(al, new Comparator<Map.Entry<Object, Object>>(){
public int compare(Map.Entry<Object, Object> o1, Map.Entry<Object, Object> o2) {
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java Sat Oct 10 15:18:56 2009
@@ -48,7 +48,7 @@
}
public void add(SampleResult sample) {
- StringBuffer sb = new StringBuffer(100);
+ StringBuilder sb = new StringBuilder(100);
sb.append(sample.getSampleLabel());
sb.append(getAssertionResult(sample));
sb.append("\n"); // $NON-NLS-1$
@@ -63,7 +63,7 @@
private String getAssertionResult(SampleResult res) {
if (res != null) {
- StringBuffer display = new StringBuffer();
+ StringBuilder display = new StringBuilder();
AssertionResult assertionResults[] = res.getAssertionResults();
for (int i = 0; i < assertionResults.length; i++) {
AssertionResult item = assertionResults[i];
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java Sat Oct 10 15:18:56 2009
@@ -346,7 +346,7 @@
if (sd != null) {
String rh = res.getRequestHeaders();
if (rh != null) {
- StringBuffer sb = new StringBuffer(sd.length() + rh.length()+20);
+ StringBuilder sb = new StringBuilder(sd.length() + rh.length()+20);
sb.append(sd);
sb.append("\n"); //$NON-NLS-1$
sb.append(JMeterUtils.getResString("view_results_request_headers")); //$NON-NLS-1$
@@ -357,7 +357,7 @@
sampleDataField.setText(sd);
}
- StringBuffer statsBuff = new StringBuffer(200);
+ StringBuilder statsBuff = new StringBuilder(200);
statsBuff.append(JMeterUtils.getResString("view_results_thread_name")).append(res.getThreadName()).append(NL); //$NON-NLS-1$
String startTime = dateFormat.format(new Date(res.getStartTime()));
statsBuff.append(JMeterUtils.getResString("view_results_sample_start")).append(startTime).append(NL); //$NON-NLS-1$
@@ -367,7 +367,7 @@
statsBuff.append(JMeterUtils.getResString("view_results_sample_count")).append(res.getSampleCount()).append(NL); //$NON-NLS-1$
statsBuff.append(JMeterUtils.getResString("view_results_error_count")).append(res.getErrorCount()).append(NL); //$NON-NLS-1$
statsDoc.insertString(statsDoc.getLength(), statsBuff.toString(), null);
- statsBuff = new StringBuffer(); //reset for reuse
+ statsBuff = new StringBuilder(); //reset for reuse
String responseCode = res.getResponseCode();
if (log.isDebugEnabled()) {
@@ -397,7 +397,7 @@
statsBuff.append(JMeterUtils.getResString("view_results_response_code")).append(responseCode).append(NL); //$NON-NLS-1$
statsDoc.insertString(statsDoc.getLength(), statsBuff.toString(), style);
- statsBuff = new StringBuffer(100); //reset for reuse
+ statsBuff = new StringBuilder(100); //reset for reuse
// response message label
String responseMsgStr = res.getResponseMessage();
@@ -458,7 +458,7 @@
log.debug("valueChanged1 : sample result - " + res);
}
- StringBuffer statsBuff = new StringBuffer(100);
+ StringBuilder statsBuff = new StringBuilder(100);
statsBuff.append(JMeterUtils.getResString("view_results_assertion_error")).append(res.isError()).append(NL); //$NON-NLS-1$
statsBuff.append(JMeterUtils.getResString("view_results_assertion_failure")).append(res.isFailure()).append(NL); //$NON-NLS-1$
statsBuff.append(JMeterUtils.getResString("view_results_assertion_failure_message")).append(res.getFailureMessage()).append(NL); //$NON-NLS-1$
@@ -491,10 +491,10 @@
// It might be useful also to make this available in the 'Request' tab, for
// when posting JSON.
private static String prettyJSON(String json) {
- StringBuffer pretty = new StringBuffer(json.length() * 2); // Educated guess
+ StringBuilder pretty = new StringBuilder(json.length() * 2); // Educated guess
final String tab = ": "; // $NON-NLS-1$
- StringBuffer index = new StringBuffer();
+ StringBuilder index = new StringBuilder();
String nl = ""; // $NON-NLS-1$
Matcher valueOrPair = VALUE_OR_PAIR_PATTERN.matcher(json);
@@ -1026,7 +1026,7 @@
* @return
*/
private String getHTML(String str, String separator, int maxChar) {
- StringBuffer strBuf = new StringBuffer("<html><body bgcolor=\"yellow\"><b>"); // $NON-NLS-1$
+ StringBuilder strBuf = new StringBuilder("<html><body bgcolor=\"yellow\"><b>"); // $NON-NLS-1$
char[] chars = str.toCharArray();
for (int i = 0; i < chars.length; i++) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java Sat Oct 10 15:18:56 2009
@@ -82,7 +82,7 @@
boolean usesUNC = OS_NAME_LC.startsWith("windows");// $NON-NLS-1$
// Add standard jar locations to initial classpath
- StringBuffer classpath = new StringBuffer();
+ StringBuilder classpath = new StringBuilder();
File[] libDirs = new File[] { new File(jmDir + File.separator + "lib"),// $NON-NLS-1$ $NON-NLS-2$
new File(jmDir + File.separator + "lib" + File.separator + "ext"),// $NON-NLS-1$ $NON-NLS-2$
new File(jmDir + File.separator + "lib" + File.separator + "junit")};// $NON-NLS-1$ $NON-NLS-2$
@@ -165,7 +165,7 @@
file = new File(path + "/");// $NON-NLS-1$
}
loader.addURL(file.toURI().toURL()); // See Java bug 4496398
- StringBuffer sb = new StringBuffer(System.getProperty(JAVA_CLASS_PATH));
+ StringBuilder sb = new StringBuilder(System.getProperty(JAVA_CLASS_PATH));
sb.append(CLASSPATH_SEPARATOR);
sb.append(path);
// ClassFinder needs this
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java Sat Oct 10 15:18:56 2009
@@ -150,7 +150,7 @@
*/
@Override
public String toString() {
- StringBuffer str = new StringBuffer();
+ StringBuilder str = new StringBuilder();
PropertyIterator iter = getArguments().iterator();
while (iter.hasNext()) {
Argument arg = (Argument) iter.next().getObjectValue();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java Sat Oct 10 15:18:56 2009
@@ -130,7 +130,7 @@
return ""; // $NON-NLS-1$
}
boolean testDynamic = false;
- StringBuffer results = new StringBuffer();
+ StringBuilder results = new StringBuilder();
Iterator<Object> iter = compiledComponents.iterator();
while (iter.hasNext()) {
Object item = iter.next();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java Sat Oct 10 15:18:56 2009
@@ -55,7 +55,7 @@
LinkedList<Object> compileString(String value) throws InvalidVariableException {
StringReader reader = new StringReader(value);
LinkedList<Object> result = new LinkedList<Object>();
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
char previous = ' '; // TODO - why use space?
char[] current = new char[1];
try {
@@ -115,7 +115,7 @@
Object makeFunction(StringReader reader) throws InvalidVariableException {
char[] current = new char[1];
char previous = ' '; // TODO - why use space?
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
Object function;
try {
while (reader.read(current) == 1) {
@@ -181,7 +181,7 @@
*/
LinkedList<CompoundVariable> parseParams(StringReader reader) throws InvalidVariableException {
LinkedList<CompoundVariable> result = new LinkedList<CompoundVariable>();
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
char[] current = new char[1];
char previous = ' ';
int functionRecursion = 0;
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java Sat Oct 10 15:18:56 2009
@@ -132,7 +132,7 @@
}
public void actionPerformed(ActionEvent e) {
- StringBuffer functionCall = new StringBuffer("${");
+ StringBuilder functionCall = new StringBuilder("${");
functionCall.append(functionList.getText());
Arguments args = (Arguments) parameterPanel.createTestElement();
if (args.getArguments().size() > 0) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java Sat Oct 10 15:18:56 2009
@@ -166,7 +166,7 @@
String recentFilePath = getRecentFile(i);
if(recentFilePath != null) {
File file = new File(recentFilePath);
- StringBuffer sb = new StringBuffer(60);
+ StringBuilder sb = new StringBuilder(60);
if (i<9) {
sb.append(i+1).append(" "); //$NON-NLS-1$
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java Sat Oct 10 15:18:56 2009
@@ -213,7 +213,7 @@
}
}
- private static StringBuffer longToSb(StringBuffer sb, long l, int len) {
+ private static StringBuilder longToSb(StringBuilder sb, long l, int len) {
sb.setLength(0);
sb.append(l);
return JOrphanUtils.rightAlign(sb, len);
@@ -221,7 +221,7 @@
private static final DecimalFormat dfDouble = new DecimalFormat("#0.0"); // $NON-NLS-1$
- private static StringBuffer doubleToSb(StringBuffer sb, double d, int len, int frac) {
+ private static StringBuilder doubleToSb(StringBuilder sb, double d, int len, int frac) {
sb.setLength(0);
dfDouble.setMinimumFractionDigits(frac);
dfDouble.setMaximumFractionDigits(frac);
@@ -235,8 +235,8 @@
* @return
*/
private String format(String name, RunningSample s, String type) {
- StringBuffer tmp = new StringBuffer(20); // for intermediate use
- StringBuffer sb = new StringBuffer(100); // output line buffer
+ StringBuilder tmp = new StringBuilder(20); // for intermediate use
+ StringBuilder sb = new StringBuilder(100); // output line buffer
sb.append(name);
sb.append(" ");
sb.append(type);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Sat Oct 10 15:18:56 2009
@@ -415,7 +415,7 @@
*/
public String getSampleLabel(boolean includeGroup) {
if (includeGroup) {
- StringBuffer sb = new StringBuffer(threadName.substring(0,threadName.lastIndexOf(" "))); //$NON-NLS-1$
+ StringBuilder sb = new StringBuilder(threadName.substring(0,threadName.lastIndexOf(" "))); //$NON-NLS-1$
return sb.append(":").append(label).toString(); //$NON-NLS-1$
}
return label;
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java Sat Oct 10 15:18:56 2009
@@ -111,7 +111,7 @@
* @return the key to use for aggregating samples
*/
public static String getKey(SampleEvent event) {
- StringBuffer sb = new StringBuffer(80);
+ StringBuilder sb = new StringBuilder(80);
sb.append(event.getResult().getSampleLabel()).append("-").append(event.getThreadGroup());
return sb.toString();
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java Sat Oct 10 15:18:56 2009
@@ -341,7 +341,7 @@
* @return the field names as a string
*/
public static String printableFieldNamesToString(SampleSaveConfiguration saveConfig) {
- StringBuffer text = new StringBuffer();
+ StringBuilder text = new StringBuilder();
String delim = saveConfig.getDelimiter();
if (saveConfig.saveTimestamp()) {
@@ -687,7 +687,7 @@
* - quotes any strings that require it
*/
final class StringQuoter{
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
private final char[] specials;
private boolean addDelim;
public StringQuoter(char delim) {
@@ -874,7 +874,7 @@
if (StringUtils.containsNone(input, specialChars)) {
return input;
}
- StringBuffer buffer = new StringBuffer(input.length() + 10);
+ StringBuilder buffer = new StringBuilder(input.length() + 10);
final char quote = specialChars[1];
buffer.append(quote);
for (int i = 0; i < input.length(); i++) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java Sat Oct 10 15:18:56 2009
@@ -116,7 +116,7 @@
}
public static String cdata(byte[] chars, String encoding) throws UnsupportedEncodingException {
- StringBuffer buf = new StringBuffer("<![CDATA[");
+ StringBuilder buf = new StringBuilder("<![CDATA[");
buf.append(new String(chars, encoding));
buf.append("]]>");
return buf.toString();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java Sat Oct 10 15:18:56 2009
@@ -176,7 +176,7 @@
}
public void setTestPlanClasspathArray(String[] text) {
- StringBuffer cat = new StringBuffer();
+ StringBuilder cat = new StringBuilder();
for (int idx=0; idx < text.length; idx++) {
if (idx > 0) {
cat.append(CLASSPATH_SEPARATOR);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java Sat Oct 10 15:18:56 2009
@@ -178,7 +178,7 @@
return;
}
try {
- bshInterpreter.eval((new StringBuffer("testEnded(")) // $NON-NLS-1$
+ bshInterpreter.eval((new StringBuilder("testEnded(")) // $NON-NLS-1$
.append(host)
.append(")") // $NON-NLS-1$
.toString()); // $NON-NLS-1$
@@ -207,7 +207,7 @@
return;
}
try {
- bshInterpreter.eval((new StringBuffer("testStarted(")) // $NON-NLS-1$
+ bshInterpreter.eval((new StringBuilder("testStarted(")) // $NON-NLS-1$
.append(host)
.append(")") // $NON-NLS-1$
.toString()); // $NON-NLS-1$
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/HttpSSLProtocolSocketFactory.java Sat Oct 10 15:18:56 2009
@@ -90,7 +90,7 @@
}
private String join(String[] strings) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i=0;i<strings.length;i++){
if (i>0) {
sb.append(" ");
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Sat Oct 10 15:18:56 2009
@@ -515,7 +515,7 @@
String lineEnd = System.getProperty("line.separator"); // $NON-NLS-1$
fileReader = new BufferedReader(new InputStreamReader(JMeterUtils.class.getClassLoader()
.getResourceAsStream(name)));
- StringBuffer text = new StringBuffer();
+ StringBuilder text = new StringBuilder();
String line = "NOTNULL"; // $NON-NLS-1$
while (line != null) {
line = fileReader.readLine();
@@ -1011,7 +1011,7 @@
*/
//TODO - move to JOrphanUtils?
public static String unsplit(Object[] splittee, Object splitChar) {
- StringBuffer retVal = new StringBuffer();
+ StringBuilder retVal = new StringBuilder();
int count = -1;
while (++count < splittee.length) {
if (splittee[count] != null) {
@@ -1041,7 +1041,7 @@
*/
//TODO - move to JOrphanUtils?
public static String unsplit(Object[] splittee, Object splitChar, String def) {
- StringBuffer retVal = new StringBuffer();
+ StringBuilder retVal = new StringBuilder();
int count = -1;
while (++count < splittee.length) {
if (splittee[count] != null) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/StringUtilities.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/StringUtilities.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/StringUtilities.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/StringUtilities.java Sat Oct 10 15:18:56 2009
@@ -38,7 +38,7 @@
* @return the updated string
*/
public static String substitute(final String input, final String pattern, final String sub) {
- StringBuffer ret = new StringBuffer(input.length());
+ StringBuilder ret = new StringBuilder(input.length());
int start = 0;
int index = -1;
final int length = pattern.length();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/RunningSample.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/RunningSample.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/RunningSample.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/RunningSample.java Sat Oct 10 15:18:56 2009
@@ -342,7 +342,7 @@
*/
@Override
public String toString() {
- StringBuffer mySB = new StringBuffer();
+ StringBuilder mySB = new StringBuilder();
mySB.append("Samples: " + this.getNumSamples() + " ");
mySB.append("Avg: " + this.getAverage() + " ");
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java Sat Oct 10 15:18:56 2009
@@ -113,7 +113,7 @@
private static void printDetails(java.io.PrintStream ps, String s, Throwable t, String c) {
String tn = Thread.currentThread().getName();
- StringBuffer sb = new StringBuffer(80);
+ StringBuilder sb = new StringBuilder(80);
sb.append("Log: ");
sb.append(tn);
if (c.length()>0){
@@ -145,7 +145,7 @@
Priority p = Priority.getPriorityForName(prio);
if (log.isPriorityEnabled(p)) {// Thread method is potentially expensive
String tn = Thread.currentThread().getName();
- StringBuffer sb = new StringBuffer(40);
+ StringBuilder sb = new StringBuilder(40);
sb.append(tn);
if (c.length()>0){
sb.append(" ");
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java Sat Oct 10 15:18:56 2009
@@ -171,7 +171,7 @@
}
if (valueIndex.equals(ALL)) {
- StringBuffer value = new StringBuffer();
+ StringBuilder value = new StringBuilder();
Iterator<MatchResult> it = collectAllMatches.iterator();
boolean first = true;
while (it.hasNext()) {
@@ -218,7 +218,7 @@
private String generateResult(MatchResult match, String namep, Object[] template, JMeterVariables vars) {
saveGroups(match, namep, vars);
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int a = 0; a < template.length; a++) {
if (template[a] instanceof String) {
result.append(template[a]);
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java Sat Oct 10 15:18:56 2009
@@ -290,7 +290,7 @@
checkParameterCount(parameters, MIN_PARAM_COUNT, MAX_PARAM_COUNT);
values = parameters.toArray();
- StringBuffer sb = new StringBuffer(40);
+ StringBuilder sb = new StringBuilder(40);
sb.append("setParameters(");//$NON-NLS-1$
for (int i = 0; i < values.length; i++) {
if (i > 0) {
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathFileContainer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathFileContainer.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathFileContainer.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathFileContainer.java Sat Oct 10 15:18:56 2009
@@ -116,7 +116,7 @@
{
nextRow = 0;
}
- log.debug(new StringBuffer("Row: ").append(row).toString());
+ log.debug(new StringBuilder("Row: ").append(row).toString());
return row;
}
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java Sat Oct 10 15:18:56 2009
@@ -301,7 +301,7 @@
if (null == descriptor) {
return "<parameter>";
} else {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
boolean hasCharOption = false;
if (Character.isLetter((char) id)) {
@@ -483,7 +483,7 @@
return new Token(TOKEN_SEPARATOR, null);
}
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
do {
sb.append(m_ch);
@@ -601,7 +601,7 @@
}
} else // 2nd argument
{
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
m_ch = getChar();
while (!isSeparator(m_ch, NULL_SEPARATORS)) {
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLOption.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLOption.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLOption.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLOption.java Sat Oct 10 15:18:56 2009
@@ -132,7 +132,7 @@
*/
@Override
public final String toString() {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
sb.append("[");
final char id = (char) m_descriptor.getId();
if (id == TEXT_ARGUMENT) {
@@ -158,7 +158,7 @@
* @return the string value
*/
final String toShortString() {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
final char id = (char) m_descriptor.getId();
if (id != TEXT_ARGUMENT) {
sb.append("-");
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLOptionDescriptor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLOptionDescriptor.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLOptionDescriptor.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLOptionDescriptor.java Sat Oct 10 15:18:56 2009
@@ -186,7 +186,7 @@
*/
@Override
public final String toString() {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
sb.append("[OptionDescriptor ");
sb.append(m_name);
sb.append(", ");
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java Sat Oct 10 15:18:56 2009
@@ -37,16 +37,16 @@
}
/**
- * Format options into StringBuffer and return. This is typically used to
+ * Format options into StringBuilder and return. This is typically used to
* print "Usage" text in response to a "--help" or invalid option.
*
* @param options
* the option descriptors
* @return the formatted description/help for options
*/
- public static final StringBuffer describeOptions(final CLOptionDescriptor[] options) {
+ public static final StringBuilder describeOptions(final CLOptionDescriptor[] options) {
final String lSep = System.getProperty("line.separator");
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
for (int i = 0; i < options.length; i++) {
final char ch = (char) options[i].getId();
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/Token.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/Token.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/Token.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/Token.java Sat Oct 10 15:18:56 2009
@@ -62,7 +62,7 @@
*/
@Override
public final String toString() {
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
sb.append(m_type);
sb.append(":");
sb.append(m_value);
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java Sat Oct 10 15:18:56 2009
@@ -649,7 +649,7 @@
* @return array of strings.
*/
public String[] getDataAsText() {
- StringBuffer temp = new StringBuffer("");
+ StringBuilder temp = new StringBuilder("");
String[] line = new String[size + 1];
String[] elements = getHeaders();
for (int count = 0; count < elements.length; count++) {
@@ -662,7 +662,7 @@
reset();
int index = 1;
while (next()) {
- temp = new StringBuffer("");
+ temp = new StringBuilder("");
for (int count = 0; count < elements.length; count++) {
temp.append(getColumnValue(count));
if (count + 1 < elements.length) {
@@ -677,7 +677,7 @@
@Override
public String toString() {
String[] contents = getDataAsText();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
boolean first = true;
for (int x = 0; x < contents.length; x++) {
if (!first) {
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java Sat Oct 10 15:18:56 2009
@@ -1042,9 +1042,9 @@
}
private static class ConvertToString implements HashTreeTraverser {
- private final StringBuffer string = new StringBuffer(getClass().getName() + "{");
+ private final StringBuilder string = new StringBuilder(getClass().getName() + "{");
- private final StringBuffer spaces = new StringBuffer();
+ private final StringBuilder spaces = new StringBuilder();
private int depth = 0;
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java Sat Oct 10 15:18:56 2009
@@ -27,8 +27,8 @@
/**
* Useful for finding all nodes in the tree that represent objects of a
* particular type. For instance, if your tree contains all strings, and a few
- * StringBuffer objects, you can use the SearchByClass traverser to find all the
- * StringBuffer objects in your tree.
+ * StringBuilder objects, you can use the SearchByClass traverser to find all the
+ * StringBuilder objects in your tree.
* <p>
* Usage is simple. Given a {@link HashTree} object "tree", and a SearchByClass
* object:
@@ -36,11 +36,11 @@
* <pre>
* HashTree tree = new HashTree();
* // ... tree gets filled with objects
- * SearchByClass searcher = new SearchByClass(StringBuffer.class);
+ * SearchByClass searcher = new SearchByClass(StringBuilder.class);
* tree.traverse(searcher);
* Iterator iter = searcher.getSearchResults().iterator();
* while (iter.hasNext()) {
- * StringBuffer foundNode = (StringBuffer) iter.next();
+ * StringBuilder foundNode = (StringBuilder) iter.next();
* HashTree subTreeOfFoundNode = searcher.getSubTree(foundNode);
* // .... do something with node and subTree...
* }
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/io/TextFile.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/io/TextFile.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/io/TextFile.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/io/TextFile.java Sat Oct 10 15:18:56 2009
@@ -130,7 +130,7 @@
*/
public String getText() {
String lineEnd = System.getProperty("line.separator"); //$NON-NLS-1$
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Reader reader = null;
BufferedReader br = null;
try {
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/Functor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/Functor.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/Functor.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/Functor.java Sat Oct 10 15:18:56 2009
@@ -397,7 +397,7 @@
@Override
public String toString(){
- StringBuffer sb = new StringBuffer(100);
+ StringBuilder sb = new StringBuilder(100);
if (clazz != null){
sb.append(clazz.getName());
}
@@ -411,7 +411,7 @@
return sb.toString();
}
- private void typesToString(StringBuffer sb,Class<?>[] _types) {
+ private void typesToString(StringBuilder sb,Class<?>[] _types) {
sb.append("(");
if (_types != null){
for(int i=0; i < _types.length; i++){
@@ -425,7 +425,7 @@
}
private String typesToString(Class<?>[] argTypes) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
typesToString(sb,argTypes);
return sb.toString();
}
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java Sat Oct 10 15:18:56 2009
@@ -357,7 +357,7 @@
if (v == null) {
return "";
}
- StringBuffer replacement = new StringBuffer();
+ StringBuilder replacement = new StringBuilder();
StringTokenizer tokens = new StringTokenizer(v, "\n", true);
while (tokens.hasMoreTokens()) {
String token = tokens.nextToken();
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Sat Oct 10 15:18:56 2009
@@ -173,15 +173,15 @@
private static final int SPACES_LEN = SPACES.length();
/**
- * Right aligns some text in a StringBuffer N.B. modifies the input buffer
+ * Right aligns some text in a StringBuilder N.B. modifies the input buffer
*
* @param in
- * StringBuffer containing some text
+ * StringBuilder containing some text
* @param len
* output length desired
- * @return input StringBuffer, with leading spaces
+ * @return input StringBuilder, with leading spaces
*/
- public static StringBuffer rightAlign(StringBuffer in, int len) {
+ public static StringBuilder rightAlign(StringBuilder in, int len) {
int pfx = len - in.length();
if (pfx <= 0) {
return in;
@@ -194,15 +194,15 @@
}
/**
- * Left aligns some text in a StringBuffer N.B. modifies the input buffer
+ * Left aligns some text in a StringBuilder N.B. modifies the input buffer
*
* @param in
- * StringBuffer containing some text
+ * StringBuilder containing some text
* @param len
* output length desired
- * @return input StringBuffer, with trailing spaces
+ * @return input StringBuilder, with trailing spaces
*/
- public static StringBuffer leftAlign(StringBuffer in, int len) {
+ public static StringBuilder leftAlign(StringBuilder in, int len) {
int sfx = len - in.length();
if (sfx <= 0) {
return in;
@@ -263,7 +263,7 @@
*/
public static String replaceAllChars(String source, char search, String replace) {
char[] chars = source.toCharArray();
- StringBuffer sb = new StringBuffer(source.length()+20);
+ StringBuilder sb = new StringBuilder(source.length()+20);
for(int i = 0; i < chars.length; i++){
char c = chars[i];
if (c == search){
@@ -286,7 +286,7 @@
* @return the updated string
*/
public static String substitute(final String input, final String pattern, final String sub) {
- StringBuffer ret = new StringBuffer(input.length());
+ StringBuilder ret = new StringBuilder(input.length());
int start = 0;
int index = -1;
final int length = pattern.length();
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/XMLBuffer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/XMLBuffer.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/XMLBuffer.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/XMLBuffer.java Sat Oct 10 15:18:56 2009
@@ -28,7 +28,7 @@
*
*/
public class XMLBuffer{
- private StringBuffer sb = new StringBuffer(); // the string so far
+ private StringBuilder sb = new StringBuilder(); // the string so far
private ArrayStack tags = new ArrayStack(); // opened tags
@@ -111,7 +111,7 @@
* @param content
* @return this
*/
- public XMLBuffer tag(String tagname,StringBuffer content){
+ public XMLBuffer tag(String tagname,StringBuilder content){
if (content.length() == 0) {
emptyTag(tagname);
} else {
Modified: jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java (original)
+++ jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java Sat Oct 10 15:18:56 2009
@@ -406,8 +406,8 @@
}
if ( !tr.wasSuccessful() ){
sresult.setSuccessful(false);
- StringBuffer buf = new StringBuffer();
- StringBuffer buftrace = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
+ StringBuilder buftrace = new StringBuilder();
Enumeration<TestFailure> en;
if (getAppendError()) {
en = tr.failures();
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java Sat Oct 10 15:18:56 2009
@@ -214,7 +214,7 @@
*/
@Override
public String toString() {
- StringBuffer sb=new StringBuffer(80);
+ StringBuilder sb=new StringBuilder(80);
sb.append(getDomain());
// flag - if all machines within a given domain can access the variable.
//(from http://www.cookiecentral.com/faq/ 3.5)
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java Sat Oct 10 15:18:56 2009
@@ -215,7 +215,7 @@
}
private String cookieToString(Cookie c){
- StringBuffer sb=new StringBuffer(80);
+ StringBuilder sb=new StringBuilder(80);
sb.append(c.getDomain());
//flag - if all machines within a given domain can access the variable.
//(from http://www.cookiecentral.com/faq/ 3.5)
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java Sat Oct 10 15:18:56 2009
@@ -194,7 +194,7 @@
* (!url.getProtocol().toUpperCase().trim().equals("HTTP") &&
* !url.getProtocol().toUpperCase().trim().equals("HTTPS")) { return null; }
*
- * StringBuffer sbHeader = new StringBuffer(); for (Iterator enum =
+ * StringBuilder sbHeader = new StringBuilder(); for (Iterator enum =
* headers.iterator(); enum.hasNext();) { Header header = (Header)
* enum.next(); if (url.getHost().endsWith(header.getDomain()) &&
* url.getFile().startsWith(header.getPath()) && (System.currentTimeMillis() /
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorThread.java Sat Oct 10 15:18:56 2009
@@ -78,7 +78,7 @@
int contentLength = -1;
boolean isChunked = false;
byte[] buffer = new byte[1024];
- StringBuffer headers = new StringBuffer();
+ StringBuilder headers = new StringBuilder();
int length = 0;
int positionOfBody = 0;
while(positionOfBody <= 0 && ((length = in.read(buffer)) != -1)) {
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java Sat Oct 10 15:18:56 2009
@@ -227,7 +227,7 @@
*/
@Override
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("-------------------------------\n");
sb.append("Dumping ParamMask Object\n");
sb.append("-------------------------------\n");
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java Sat Oct 10 15:18:56 2009
@@ -351,7 +351,7 @@
}
private static String printNode(Node node) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append("<"); // $NON-NLS-1$
buf.append(node.getNodeName());
NamedNodeMap atts = node.getAttributes();
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java Sat Oct 10 15:18:56 2009
@@ -49,7 +49,7 @@
* @return a string with the header in it
*/
public static String formOk(String contentType, long contentLength) {
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
out.append(HTTP_PROTOCOL).append(" 200 Ok").append(CR);
out.append("Server: ").append(HTTP_SERVER).append(CR);
@@ -80,7 +80,7 @@
* @return A string with the HTML description body
*/
private static String formErrorBody(String error, String description) {
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
// Generate Error Body
out.append("<HTML><HEAD><TITLE>");
out.append(error);
@@ -111,7 +111,7 @@
*/
String body = formErrorBody(error, description);
- StringBuffer header = new StringBuffer();
+ StringBuilder header = new StringBuilder();
header.append(HTTP_PROTOCOL).append(" ").append(error).append(CR);
header.append("Server: ").append(HTTP_SERVER).append(CR);
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java Sat Oct 10 15:18:56 2009
@@ -589,7 +589,7 @@
// * @return The remainder
// */
// private String getRemainder(StringTokenizer tk) {
-// StringBuffer strBuff = new StringBuffer();
+// StringBuilder strBuff = new StringBuilder();
// if (tk.hasMoreTokens()) {
// strBuff.append(tk.nextToken());
// }
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Sat Oct 10 15:18:56 2009
@@ -503,7 +503,7 @@
if (fixContentLength && contentLengthIndex>=0){// Fix the content length
headerLines[contentLengthIndex]=HTTPConstants.HEADER_CONTENT_LENGTH+": "+res.getResponseData().length;
}
- StringBuffer sb = new StringBuffer(headers.length());
+ StringBuilder sb = new StringBuilder(headers.length());
for (int i=0;i<headerLines.length;i++){
String line=headerLines[i];
if (line != null){
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java Sat Oct 10 15:18:56 2009
@@ -826,7 +826,7 @@
}
private String generateMatchUrl(HTTPSamplerBase sampler) {
- StringBuffer buf = new StringBuffer(sampler.getDomain());
+ StringBuilder buf = new StringBuilder(sampler.getDomain());
buf.append(':'); // $NON-NLS-1$
buf.append(sampler.getPort());
buf.append(sampler.getPath());
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Sat Oct 10 15:18:56 2009
@@ -748,7 +748,7 @@
String seperator = " > ";
if (node != null) {
for (int i = 0; i < node.getChildCount(); i++) {
- StringBuffer name = new StringBuffer();
+ StringBuilder name = new StringBuilder();
JMeterTreeNode cur = (JMeterTreeNode) node.getChildAt(i);
TestElement te = cur.getTestElement();
/*
@@ -766,7 +766,7 @@
name.append(cur.getName());
TreeNodeWrapper tnw = new TreeNodeWrapper(cur, name.toString());
targetNodesModel.addElement(tnw);
- name = new StringBuffer();
+ name = new StringBuilder();
name.append(cur.getName());
name.append(seperator);
buildNodesModel(cur, name.toString(), level + 1);
@@ -782,7 +782,7 @@
private String spaces(int level) {
int multi = 4;
- StringBuffer spaces = new StringBuffer(level * multi);
+ StringBuilder spaces = new StringBuilder(level * multi);
for (int i = 0; i < level * multi; i++) {
spaces.append(" "); // $NON-NLS-1$
}
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java Sat Oct 10 15:18:56 2009
@@ -216,7 +216,7 @@
throws IOException {
HeaderManager headers = getHeaderManager();
AuthManager auth = getAuthManager();
- StringBuffer hbuf = new StringBuffer();
+ StringBuilder hbuf = new StringBuilder();
// Allow Headers to override Host setting
hbuf.append("Host").append(COLON_SPACE).append(host).append(NEWLINE);//$NON-NLS-1$
setInt(0xA00b); //Host
@@ -256,7 +256,7 @@
hbuf.append(HEADER_CONTENT_TYPE).append(COLON_SPACE).append(APPLICATION_X_WWW_FORM_URLENCODED).append(NEWLINE);
setInt(0xA007); // content-type
setString(APPLICATION_X_WWW_FORM_URLENCODED);
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
boolean first = true;
PropertyIterator args = getArguments().iterator();
while(args.hasNext()) {
@@ -288,7 +288,7 @@
}
private String encode(String value) {
- StringBuffer newValue = new StringBuffer();
+ StringBuilder newValue = new StringBuilder();
char[] chars = value.toCharArray();
for (int i = 0; i < chars.length; i++)
{
@@ -413,7 +413,7 @@
String msg = getString();
res.setResponseMessage(msg);
int nh = getInt();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(HTTP_1_1 ).append(status).append(" ").append(msg).append(NEWLINE);//$NON-NLS-1$//$NON-NLS-2$
for(int i=0; i < nh; i++) {
// Currently, no Tomcat version sends translated headers
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java?rev=823869&r1=823868&r2=823869&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java Sat Oct 10 15:18:56 2009
@@ -101,7 +101,7 @@
*/
@Override
public String getSamplerData() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(method);
URL u = super.getURL();
if (u != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org