Author: musachy
Date: Mon Nov 24 08:41:07 2008
New Revision: 720222
URL: http://svn.apache.org/viewvc?rev=720222&view=rev
Log:
WW-2889 Use StringBuilder instead of StringBuffer
Thanks to Mathias Bogaert for patch
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/TextUtil.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestUtils.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
Mon Nov 24 08:41:07 2008
@@ -219,7 +219,7 @@
*/
public String formatTime(TextProvider tp, java.util.Date date) {
java.util.Date now = new java.util.Date();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
List args = new ArrayList();
long secs = Math.abs((now.getTime() - date.getTime()) / 1000);
long mins = secs / 60;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java
Mon Nov 24 08:41:07 2008
@@ -124,7 +124,7 @@
public boolean end(Writer writer, String body) {
String page = findString(value, "value", "You must specify the URL to
include. Example: /foo.jsp");
- StringBuffer urlBuf = new StringBuffer();
+ StringBuilder urlBuf = new StringBuilder();
// Add URL
urlBuf.append(page);
@@ -212,7 +212,7 @@
}
}
- StringBuffer flatPathBuffer = new StringBuffer();
+ StringBuilder flatPathBuffer = new StringBuilder();
for (int i = 0; i < stack.size(); i++) {
flatPathBuffer.append("/").append(stack.elementAt(i));
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
Mon Nov 24 08:41:07 2008
@@ -194,7 +194,7 @@
}
}
- StringBuffer tmpLocation = new
StringBuffer(actionMapper.getUriFromActionMapping(new ActionMapping(actionName,
namespace, method, null)));
+ StringBuilder tmpLocation = new
StringBuilder(actionMapper.getUriFromActionMapping(new
ActionMapping(actionName, namespace, method, null)));
UrlHelper.buildParametersString(requestParameters, tmpLocation, "&");
setLocation(tmpLocation.toString());
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Mon Nov 24 08:41:07 2008
@@ -519,7 +519,7 @@
* @see
org.apache.struts2.dispatcher.mapper.ActionMapper#getUriFromActionMapping(org.apache.struts2.dispatcher.mapper.ActionMapping)
*/
public String getUriFromActionMapping(ActionMapping mapping) {
- StringBuffer uri = new StringBuffer();
+ StringBuilder uri = new StringBuilder();
if (mapping.getNamespace() != null) {
uri.append(mapping.getNamespace());
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/TextUtil.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/TextUtil.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/TextUtil.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/TextUtil.java
Mon Nov 24 08:41:07 2008
@@ -33,7 +33,7 @@
/**
* We use arrays of char in the lookup table because it is faster
- * appending this to a StringBuffer than appending a String
+ * appending this to a StringBuilder than appending a String
*/
protected static final char[][] _stringChars = new char[MAX_LENGTH][];
@@ -97,16 +97,16 @@
}
// We found a character to escape and broke out at position i
- // Now copy all characters before that to StringBuffer sb
+ // Now copy all characters before that to StringBuilder sb
// Since a char[] will be used for copying we might as well get
// a complete copy of it so that we can use array indexing instead of
charAt
- StringBuffer sb = new StringBuffer(len + 40);
+ StringBuilder sb = new StringBuilder(len + 40);
char[] chars = new char[len];
// Copy all chars from the String s to the chars buffer
s.getChars(0, len, chars, 0);
- // Append the first i characters that we have checked to the resulting
StringBuffer
+ // Append the first i characters that we have checked to the resulting
StringBuilder
sb.append(chars, 0, i);
int last = i;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
Mon Nov 24 08:41:07 2008
@@ -77,7 +77,7 @@
}
public static String buildUrl(String action, HttpServletRequest request,
HttpServletResponse response, Map params, String scheme, boolean
includeContext, boolean encodeResult, boolean forceAddSchemeHostAndPort,
boolean escapeAmp) {
- StringBuffer link = new StringBuffer();
+ StringBuilder link = new StringBuilder();
boolean changedScheme = false;
@@ -191,11 +191,11 @@
return result;
}
- public static void buildParametersString(Map params, StringBuffer link) {
+ public static void buildParametersString(Map params, StringBuilder link) {
buildParametersString(params, link, AMP);
}
- public static void buildParametersString(Map params, StringBuffer link,
String paramSeparator) {
+ public static void buildParametersString(Map params, StringBuilder link,
String paramSeparator) {
if ((params != null) && (params.size() > 0)) {
if (link.toString().indexOf("?") == -1) {
link.append("?");
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
Mon Nov 24 08:41:07 2008
@@ -399,7 +399,7 @@
public void setChainedContexts(String contexts) {
// we expect contexts to be a comma separated list of classnames
StringTokenizer st = new StringTokenizer(contexts, ",");
- List contextList = new ArrayList();
+ List<String> contextList = new ArrayList<String>();
while (st.hasMoreTokens()) {
String classname = st.nextToken();
@@ -539,7 +539,7 @@
p.setProperty("strutsclass.resource.loader.cache", "true");
// components
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (TagLibrary tagLibrary : tagLibraries) {
List<Class> directives = tagLibrary.getVelocityDirectiveClasses();
@@ -560,7 +560,7 @@
p.setProperty("userdirective", userdirective);
}
- private void addDirective(StringBuffer sb, Class clazz) {
+ private void addDirective(StringBuilder sb, Class clazz) {
sb.append(clazz.getName()).append(",");
}
@@ -579,7 +579,7 @@
char[] string2 = string.toCharArray();
char[] newString2 = newString.toCharArray();
int oLength = oldString.length();
- StringBuffer buf = new StringBuffer(string2.length);
+ StringBuilder buf = new StringBuilder(string2.length);
buf.append(string2, 0, i).append(newString2);
i += oLength;
int j = i;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
Mon Nov 24 08:41:07 2008
@@ -30,7 +30,6 @@
import com.opensymphony.xwork2.util.logging.LoggerFactory;
public class SimpleNodeList implements NodeList {
-
private Logger log = LoggerFactory.getLogger(SimpleNodeList.class);
private List<Node> nodes;
@@ -51,9 +50,9 @@
}
public String toString() {
- StringBuffer sb = new StringBuffer("SimpleNodeList: [");
+ StringBuilder sb = new StringBuilder("SimpleNodeList: [");
for (int i = 0; i < getLength(); i++)
- sb.append(item(i).getNodeName() + ',');
+ sb.append(item(i).getNodeName()).append(',');
sb.append("]");
return sb.toString();
}
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestUtils.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestUtils.java
(original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestUtils.java
Mon Nov 24 08:41:07 2008
@@ -41,7 +41,7 @@
public static String normalize(Object obj, boolean appendSpace) {
StringTokenizer st =
new StringTokenizer(obj.toString().trim(), " \t\r\n");
- StringBuffer buffer = new StringBuffer(128);
+ StringBuilder buffer = new StringBuilder(128);
while(st.hasMoreTokens()) {
buffer.append(st.nextToken());
@@ -81,7 +81,7 @@
throw new Exception("unable to verify a null URL");
}
- StringBuffer buffer = new StringBuffer(128);
+ StringBuilder buffer = new StringBuilder(128);
InputStream in = url.openStream();
byte[] buf = new byte[4096];
int nbytes;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
Mon Nov 24 08:41:07 2008
@@ -113,11 +113,11 @@
is = ClassLoaderUtil.getResourceAsStream(resource,
PlainTextResultTest.class);
int sizeRead = 0;
byte[] buffer = new byte[1024];
- StringBuffer stringBuffer = new StringBuffer();
+ StringBuilder stringBuilder = new StringBuilder();
while((sizeRead = is.read(buffer)) != -1) {
- stringBuffer.append(new String(buffer, 0, sizeRead));
+ stringBuilder.append(new String(buffer, 0, sizeRead));
}
- return stringBuffer.toString();
+ return stringBuilder.toString();
}
finally {
if (is != null)
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
Mon Nov 24 08:41:07 2008
@@ -268,7 +268,7 @@
fail("AbstractJspWriter.writer not initialized. Unable to
verify");
}
- StringBuffer buffer = new StringBuffer(128);
+ StringBuilder buffer = new StringBuilder(128);
InputStream in = url.openStream();
byte[] buf = new byte[4096];
int nbytes;
@@ -303,7 +303,7 @@
fail("AbstractJspWriter.writer not initialized. Unable to
verify");
}
- StringBuffer buffer = new StringBuffer(128);
+ StringBuilder buffer = new StringBuilder(128);
InputStream in = url.openStream();
byte[] buf = new byte[4096];
int nbytes;
@@ -345,7 +345,7 @@
*/
public static String normalize(Object obj, boolean appendSpace) {
StringTokenizer st = new StringTokenizer(obj.toString().trim(), "
\t\r\n");
- StringBuffer buffer = new StringBuffer(128);
+ StringBuilder buffer = new StringBuilder(128);
while (st.hasMoreTokens()) {
buffer.append(st.nextToken());
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java
Mon Nov 24 08:41:07 2008
@@ -34,15 +34,12 @@
* StrutsBodyContent
*/
public class StrutsBodyContent extends BodyContent {
-
- private StringBuffer buffer = new StringBuffer();
-
+ private StringBuilder buffer = new StringBuilder();
public StrutsBodyContent(JspWriter jspWriter) {
super(jspWriter);
}
-
public Reader getReader() {
return new StringReader(buffer.toString());
}
@@ -56,7 +53,7 @@
}
public void clear() throws IOException {
- buffer = new StringBuffer();
+ buffer = new StringBuilder();
}
public void clearBuffer() throws IOException {
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java?rev=720222&r1=720221&r2=720222&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
Mon Nov 24 08:41:07 2008
@@ -107,7 +107,7 @@
parameters.put("param1", "value1");
parameters.put("param2", "value2");
- StringBuffer url = new
StringBuffer("http://localhost:8080/myContext/myPage.jsp?initParam=initValue";);
+ StringBuilder url = new
StringBuilder("http://localhost:8080/myContext/myPage.jsp?initParam=initValue";);
UrlHelper.buildParametersString(parameters, url);
