From 44304a8147eb10489cf8b748076754b2fbda9e76 Mon Sep 17 00:00:00 2001 From: rbuj Date: Sun, 14 Sep 2014 00:28:07 +0200 Subject: scripting: replace StringBuffer with StringBuilder method In JDK 1.3, StringBuffer makes the String concatenations faster. public String concat(String s1, String s2) { StringBuffer sb = new StringBuffer(); sb.append(s1); sb.append(s2); return sb.toString(); } JDK 1.5 comes with StringBuilder (which is faster than StringBuffer) and the method: public String concat(String s1, String s2) { return s1 + s2; } is translated to: public String concat(String s1, String s2) { return new StringBuilder().append(s1).append(s2).toString(); } Change-Id: I2924fcdf23d7ffbb567d9e924d02edcab4d21be6 NOTE: StringBuffer is synchronized, StringBuilder is not. Reviewed-on: https://gerrit.libreoffice.org/11436 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- .../com/sun/star/script/framework/container/ScriptMetaData.java | 2 +- .../java/com/sun/star/script/framework/provider/PathUtils.java | 3 ++- .../framework/provider/beanshell/ScriptEditorForBeanShell.java | 2 +- .../star/script/framework/provider/beanshell/ScriptSourceModel.java | 2 +- .../sun/star/script/framework/provider/java/ScriptDescriptor.java | 2 +- .../framework/provider/javascript/ScriptEditorForJavaScript.java | 2 +- scripting/java/org/openoffice/idesupport/SVersionRCFile.java | 2 +- .../java/org/openoffice/idesupport/filter/ExceptParcelFilter.java | 6 +----- 8 files changed, 9 insertions(+), 12 deletions(-) (limited to 'scripting') diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index c0d53a7dc982..55eb56003f0a 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -279,7 +279,7 @@ public class ScriptMetaData extends ScriptEntry { if ( sourceUrl != null ) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); InputStream in = sourceUrl.openStream(); byte[] contents = new byte[1024]; diff --git a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java index 5bea115ca4db..af7772f914ca 100644 --- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java +++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java @@ -60,7 +60,8 @@ public class PathUtils { } static public String make_url( String baseUrl, String url ) { - StringBuffer buff = new StringBuffer( baseUrl.length() + url.length() ); buff.append( baseUrl ); + StringBuilder buff = new StringBuilder( baseUrl.length() + url.length() ); + buff.append( baseUrl ); StringTokenizer t = new StringTokenizer( url, "/"); while ( t.hasMoreElements() ) { diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java index 04b15c27ba3c..c0cfd1f6a3f0 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java @@ -71,7 +71,7 @@ public class ScriptEditorForBeanShell ScriptEditorForBeanShell.class.getResource("template.bsh"); InputStream in = url.openStream(); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); byte[] b = new byte[1024]; int len; while ((len = in.read(b)) != -1) { diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java index 00399ca4535f..ef4719ef1a7d 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java @@ -35,7 +35,7 @@ public class ScriptSourceModel { } private String load() throws IOException { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); InputStream in = file.openStream(); byte[] contents = new byte[1024]; diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java index c41b6058056a..66d25aa6ccdd 100644 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java @@ -165,7 +165,7 @@ public class ScriptDescriptor @Override public String toString() { - StringBuffer description = new StringBuffer( m_name ); + StringBuilder description = new StringBuilder( m_name ); Class[] types = getArgumentTypes(); description.append( " (" ); diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java index f78485766d7c..cc4c7b3c787f 100644 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java @@ -59,7 +59,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor ScriptEditorForJavaScript.class.getResource("template.js"); InputStream in = url.openStream(); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); byte[] b = new byte[1024]; int len; while ((len = in.read(b)) != -1) { diff --git a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java index 883b28f00aee..a258983da7dd 100644 --- a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java +++ b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java @@ -160,7 +160,7 @@ public class SVersionRCFile { if (System.getProperty("os.name").startsWith("Windows")) path = path.replace(File.separatorChar, '/'); - StringBuffer buf = new StringBuffer(FILE_URL_PREFIX); + StringBuilder buf = new StringBuilder(FILE_URL_PREFIX); buf.append(path); if (f.isDirectory()) diff --git a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java index 36bee314c47d..792c9d42a26d 100644 --- a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java +++ b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java @@ -42,10 +42,6 @@ public class ExceptParcelFilter implements FileFilter { @Override public String toString() { - StringBuffer buf = new StringBuffer(DESCRIPTION + ": "); - - buf.append("<" + ExceptParcelFilter.parcelName + ">"); - - return buf.toString(); + return DESCRIPTION + ": " + "<" + ExceptParcelFilter.parcelName + ">"; } } -- cgit