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 2011/11/16 13:44:56 UTC
svn commit: r1202671 - in /jmeter/trunk/src:
core/org/apache/jmeter/reporters/ResultSaver.java
jorphan/org/apache/jorphan/util/JOrphanUtils.java
protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
Author: sebb
Date: Wed Nov 16 12:44:56 2011
New Revision: 1202671
URL: http://svn.apache.org/viewvc?rev=1202671&view=rev
Log:
No need to use Commons Lang StrBuilder now we target 1.5+
Modified:
jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java?rev=1202671&r1=1202670&r2=1202671&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java Wed Nov 16 12:44:56 2011
@@ -24,7 +24,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.Serializable;
-import org.apache.commons.lang.text.StrBuilder;
import org.apache.jmeter.samplers.SampleEvent;
import org.apache.jmeter.samplers.SampleListener;
import org.apache.jmeter.samplers.SampleResult;
@@ -148,7 +147,7 @@ public class ResultSaver extends Abstrac
String variable = getVariableName();
if (variable.length()>0){
if (num > 0) {
- StrBuilder sb = new StrBuilder(variable);
+ StringBuilder sb = new StringBuilder(variable);
sb.append(num);
variable=sb.toString();
}
@@ -174,7 +173,7 @@ public class ResultSaver extends Abstrac
* text/html;charset=ISO-8859-1
*/
private String makeFileName(String contentType, boolean skipAutoNumber, boolean skipSuffix) {
- StrBuilder sb = new StrBuilder(FileServer.resolveBaseRelativeName(getFilename()));
+ StringBuilder sb = new StringBuilder(FileServer.resolveBaseRelativeName(getFilename()));
if (!skipAutoNumber){
sb.append(nextNumber());
}
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=1202671&r1=1202670&r2=1202671&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Wed Nov 16 12:44:56 2011
@@ -28,8 +28,6 @@ import java.util.List;
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.commons.lang.text.StrBuilder;
-
/**
* This class contains frequently-used static utility methods.
*
@@ -417,7 +415,7 @@ public final class JOrphanUtils {
* @return hex representation of binary input
*/
public static String baToHexString(byte ba[]) {
- StrBuilder sb = new StrBuilder(ba.length*2);
+ StringBuilder sb = new StringBuilder(ba.length*2);
for (int i = 0; i < ba.length; i++) {
int j = ba[i] & 0xff;
if (j < 16) {
Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java?rev=1202671&r1=1202670&r2=1202671&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java (original)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java Wed Nov 16 12:44:56 2011
@@ -35,7 +35,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.text.StrBuilder;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.save.CSVSaveService;
import org.apache.jmeter.testelement.AbstractTestElement;
@@ -213,7 +212,7 @@ public abstract class AbstractJDBCTestEl
}
private String resultSetsToString(PreparedStatement pstmt, boolean result, int[] out) throws SQLException, UnsupportedEncodingException {
- StrBuilder sb = new StrBuilder();
+ StringBuilder sb = new StringBuilder();
int updateCount = 0;
if (!result) {
updateCount = pstmt.getUpdateCount();
@@ -370,7 +369,7 @@ public abstract class AbstractJDBCTestEl
private String getStringFromResultSet(ResultSet rs) throws SQLException, UnsupportedEncodingException {
ResultSetMetaData meta = rs.getMetaData();
- StrBuilder sb = new StrBuilder();
+ StringBuilder sb = new StringBuilder();
int numColumns = meta.getColumnCount();
for (int i = 1; i <= numColumns; i++) {
@@ -477,7 +476,7 @@ public abstract class AbstractJDBCTestEl
@Override
public String toString() {
- StrBuilder sb = new StrBuilder(80);
+ StringBuilder sb = new StringBuilder(80);
sb.append("["); // $NON-NLS-1$
sb.append(getQueryType());
sb.append("] "); // $NON-NLS-1$