From d9d0f426e443020ab9141b080a08e22c74795d0e Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 15 Oct 2020 22:46:05 -0700 Subject: [PATCH] Performance pass 5 (String concatenation in loop) --- .../volmit/iris/manager/IrisDataManager.java | 12 ++++---- src/main/java/com/volmit/iris/util/C.java | 6 ++-- src/main/java/com/volmit/iris/util/Form.java | 30 +++++++++---------- src/main/java/com/volmit/iris/util/IO.java | 12 ++++---- .../java/com/volmit/iris/util/Violator.java | 30 +++++++++---------- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/volmit/iris/manager/IrisDataManager.java b/src/main/java/com/volmit/iris/manager/IrisDataManager.java index 4aac856f9..ab9660c18 100644 --- a/src/main/java/com/volmit/iris/manager/IrisDataManager.java +++ b/src/main/java/com/volmit/iris/manager/IrisDataManager.java @@ -99,17 +99,17 @@ public class IrisDataManager { File examples = new File(dataFolder, "example"); examples.mkdirs(); - String biomes = ""; - String envs = ""; + StringBuilder biomes = new StringBuilder(); + StringBuilder envs = new StringBuilder(); for(Biome i : Biome.values()) { - biomes += i.name() + "\n"; + biomes.append(i.name()).append("\n"); } for(Environment i : Environment.values()) { - envs += i.name() + "\n"; + envs.append(i.name()).append("\n"); } try @@ -118,8 +118,8 @@ public class IrisDataManager new File(examples, "example-pack/biomes").mkdirs(); new File(examples, "example-pack/dimensions").mkdirs(); new File(examples, "example-pack/generators").mkdirs(); - IO.writeAll(new File(examples, "biome-list.txt"), biomes); - IO.writeAll(new File(examples, "environment-list.txt"), envs); + IO.writeAll(new File(examples, "biome-list.txt"), biomes.toString()); + IO.writeAll(new File(examples, "environment-list.txt"), envs.toString()); IrisGenerator gen = new IrisGenerator(); IrisNoiseGenerator n = new IrisNoiseGenerator(); diff --git a/src/main/java/com/volmit/iris/util/C.java b/src/main/java/com/volmit/iris/util/C.java index d61637908..3517b3431 100644 --- a/src/main/java/com/volmit/iris/util/C.java +++ b/src/main/java/com/volmit/iris/util/C.java @@ -753,7 +753,7 @@ public enum C */ public static String getLastColors(String input) { - String result = ""; + StringBuilder result = new StringBuilder(); int length = input.length(); // Search backwards from the end as it is faster @@ -767,7 +767,7 @@ public enum C if(color != null) { - result = color.toString() + result; + result.insert(0, color.toString()); // Once we find a color or reset we can stop searching if(color.isColor() || color.equals(RESET)) @@ -778,7 +778,7 @@ public enum C } } - return result; + return result.toString(); } static diff --git a/src/main/java/com/volmit/iris/util/Form.java b/src/main/java/com/volmit/iris/util/Form.java index ac5f83ec6..d9c7c7d67 100644 --- a/src/main/java/com/volmit/iris/util/Form.java +++ b/src/main/java/com/volmit/iris/util/Form.java @@ -72,24 +72,24 @@ public class Form */ public static String capitalize(String s) { - String roll = ""; + StringBuilder roll = new StringBuilder(); boolean f = true; for(Character i : s.trim().toCharArray()) { if(f) { - roll += Character.toUpperCase(i); + roll.append(Character.toUpperCase(i)); f = false; } else { - roll += i; + roll.append(i); } } - return roll; + return roll.toString(); } /** @@ -101,11 +101,11 @@ public class Form */ public static String capitalizeWords(String s) { - String rollx = ""; + StringBuilder rollx = new StringBuilder(); for(String i : s.trim().split(" ")) { - rollx += " " + capitalize(i.trim()); + rollx.append(" ").append(capitalize(i.trim())); } return rollx.substring(1); @@ -1038,27 +1038,27 @@ public class Form */ public static String cname(String clazz) { - String codeName = ""; + StringBuilder codeName = new StringBuilder(); for(Character i : clazz.toCharArray()) { if(Character.isUpperCase(i)) { - codeName = codeName + "-" + Character.toLowerCase(i); + codeName.append("-").append(Character.toLowerCase(i)); } else { - codeName = codeName + i; + codeName.append(i); } } - if(codeName.startsWith("-")) + if(codeName.toString().startsWith("-")) { - codeName = codeName.substring(1); + codeName = new StringBuilder(codeName.substring(1)); } - return codeName; + return codeName.toString(); } /** @@ -1439,17 +1439,17 @@ public class Form roman_numerals.put("IV", 4); roman_numerals.put("I", 1); - String res = ""; + StringBuilder res = new StringBuilder(); for(Map.Entry entry : roman_numerals.entrySet()) { int matches = num / entry.getValue(); - res += repeat(entry.getKey(), matches); + res.append(repeat(entry.getKey(), matches)); num = num % entry.getValue(); } - return res; + return res.toString(); } /** diff --git a/src/main/java/com/volmit/iris/util/IO.java b/src/main/java/com/volmit/iris/util/IO.java index 8c0a49a0c..6ff0f80d5 100644 --- a/src/main/java/com/volmit/iris/util/IO.java +++ b/src/main/java/com/volmit/iris/util/IO.java @@ -407,33 +407,33 @@ public class IO public static String readAll(File f) throws IOException { BufferedReader bu = new BufferedReader(new FileReader(f)); - String c = ""; + StringBuilder c = new StringBuilder(); String l = ""; while((l = bu.readLine()) != null) { - c += l + "\n"; + c.append(l).append("\n"); } bu.close(); - return c; + return c.toString(); } public static String readAll(InputStream in) throws IOException { BufferedReader bu = new BufferedReader(new InputStreamReader(in)); - String c = ""; + StringBuilder c = new StringBuilder(); String l = ""; while((l = bu.readLine()) != null) { - c += l + "\n"; + c.append(l).append("\n"); } bu.close(); - return c; + return c.toString(); } /** diff --git a/src/main/java/com/volmit/iris/util/Violator.java b/src/main/java/com/volmit/iris/util/Violator.java index 07dd16c4e..70b5f68a6 100644 --- a/src/main/java/com/volmit/iris/util/Violator.java +++ b/src/main/java/com/volmit/iris/util/Violator.java @@ -31,28 +31,28 @@ public class Violator { Constructor co = (Constructor) o; - String mx = ""; + StringBuilder mx = new StringBuilder(); for(Class i : co.getParameterTypes()) { - mx += "," + i.getCanonicalName(); + mx.append(",").append(i.getCanonicalName()); } - mx = mx.length() >= 1 ? mx.substring(1) : mx; + mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); return id(co.getDeclaringClass(), null) + "(" + mx + ")"; } if(o instanceof Method) { - String mx = ""; + StringBuilder mx = new StringBuilder(); for(Class i : ((Method) o).getParameterTypes()) { - mx += "," + i.getCanonicalName(); + mx.append(",").append(i.getCanonicalName()); } - mx = mx.length() >= 1 ? mx.substring(1) : mx; + mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); return id(((Method) o).getDeclaringClass(), null) + "." + ((Method) o).getName() + "(" + mx + ")"; } @@ -83,14 +83,14 @@ public class Violator public static Constructor getConstructor(Class c, Class... params) throws NoSuchMethodException, SecurityException { - String mx = ""; + StringBuilder mx = new StringBuilder(); for(Class i : params) { - mx += "," + i.getCanonicalName(); + mx.append(",").append(i.getCanonicalName()); } - mx = mx.length() >= 1 ? mx.substring(1) : mx; + mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); if(!h(id(c, null) + "(" + mx + ")")) { @@ -159,14 +159,14 @@ public class Violator public static Method getMethod(Class c, String name, Class... pars) throws Throwable { String iv = ""; - String mx = ""; + StringBuilder mx = new StringBuilder(); for(Class i : pars) { - mx += "," + i.getCanonicalName(); + mx.append(",").append(i.getCanonicalName()); } - mx = mx.length() >= 1 ? mx.substring(1) : mx; + mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); iv = id(c, null) + "." + name + "(" + mx + ")"; if(!h(iv)) @@ -206,14 +206,14 @@ public class Violator public static Method getDeclaredMethod(Class c, String name, Class... pars) throws Throwable { String iv = ""; - String mx = ""; + StringBuilder mx = new StringBuilder(); for(Class i : pars) { - mx += "," + i.getCanonicalName(); + mx.append(",").append(i.getCanonicalName()); } - mx = mx.length() >= 1 ? mx.substring(1) : mx; + mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); iv = id(c, null) + "." + name + "(" + mx + ")"; if(!h(iv))