From 3daf03d89a32726a4f067d8e749b4f1a2e9a3317 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 15 Oct 2020 22:46:05 -0700 Subject: [PATCH] Revert "Performance pass 5 (String concatenation in loop)" This reverts commit d9d0f426e443020ab9141b080a08e22c74795d0e. --- .../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 ab9660c18..4aac856f9 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(); - StringBuilder biomes = new StringBuilder(); - StringBuilder envs = new StringBuilder(); + String biomes = ""; + String envs = ""; for(Biome i : Biome.values()) { - biomes.append(i.name()).append("\n"); + biomes += i.name() + "\n"; } for(Environment i : Environment.values()) { - envs.append(i.name()).append("\n"); + envs += i.name() + "\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.toString()); - IO.writeAll(new File(examples, "environment-list.txt"), envs.toString()); + IO.writeAll(new File(examples, "biome-list.txt"), biomes); + IO.writeAll(new File(examples, "environment-list.txt"), envs); 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 3517b3431..d61637908 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) { - StringBuilder result = new StringBuilder(); + String result = ""; int length = input.length(); // Search backwards from the end as it is faster @@ -767,7 +767,7 @@ public enum C if(color != null) { - result.insert(0, color.toString()); + result = color.toString() + result; // 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.toString(); + return result; } static diff --git a/src/main/java/com/volmit/iris/util/Form.java b/src/main/java/com/volmit/iris/util/Form.java index bbadba5c9..1ddc49040 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) { - StringBuilder roll = new StringBuilder(); + String roll = ""; boolean f = true; for(Character i : s.trim().toCharArray()) { if(f) { - roll.append(Character.toUpperCase(i)); + roll += Character.toUpperCase(i); f = false; } else { - roll.append(i); + roll += i; } } - return roll.toString(); + return roll; } /** @@ -101,11 +101,11 @@ public class Form */ public static String capitalizeWords(String s) { - StringBuilder rollx = new StringBuilder(); + String rollx = ""; for(String i : s.trim().split(" ")) { - rollx.append(" ").append(capitalize(i.trim())); + rollx += " " + capitalize(i.trim()); } return rollx.substring(1); @@ -1038,27 +1038,27 @@ public class Form */ public static String cname(String clazz) { - StringBuilder codeName = new StringBuilder(); + String codeName = ""; for(Character i : clazz.toCharArray()) { if(Character.isUpperCase(i)) { - codeName.append("-").append(Character.toLowerCase(i)); + codeName = codeName + "-" + Character.toLowerCase(i); } else { - codeName.append(i); + codeName = codeName + i; } } - if(codeName.toString().startsWith("-")) + if(codeName.startsWith("-")) { - codeName = new StringBuilder(codeName.substring(1)); + codeName = codeName.substring(1); } - return codeName.toString(); + return codeName; } /** @@ -1439,17 +1439,17 @@ public class Form roman_numerals.put("IV", 4); roman_numerals.put("I", 1); - StringBuilder res = new StringBuilder(); + String res = ""; for(Map.Entry entry : roman_numerals.entrySet()) { int matches = num / entry.getValue(); - res.append(repeat(entry.getKey(), matches)); + res += repeat(entry.getKey(), matches); num = num % entry.getValue(); } - return res.toString(); + return res; } /** diff --git a/src/main/java/com/volmit/iris/util/IO.java b/src/main/java/com/volmit/iris/util/IO.java index 6ff0f80d5..8c0a49a0c 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)); - StringBuilder c = new StringBuilder(); + String c = ""; String l = ""; while((l = bu.readLine()) != null) { - c.append(l).append("\n"); + c += l + "\n"; } bu.close(); - return c.toString(); + return c; } public static String readAll(InputStream in) throws IOException { BufferedReader bu = new BufferedReader(new InputStreamReader(in)); - StringBuilder c = new StringBuilder(); + String c = ""; String l = ""; while((l = bu.readLine()) != null) { - c.append(l).append("\n"); + c += l + "\n"; } bu.close(); - return c.toString(); + return c; } /** diff --git a/src/main/java/com/volmit/iris/util/Violator.java b/src/main/java/com/volmit/iris/util/Violator.java index 70b5f68a6..07dd16c4e 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; - StringBuilder mx = new StringBuilder(); + String mx = ""; for(Class i : co.getParameterTypes()) { - mx.append(",").append(i.getCanonicalName()); + mx += "," + i.getCanonicalName(); } - mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); + mx = mx.length() >= 1 ? mx.substring(1) : mx; return id(co.getDeclaringClass(), null) + "(" + mx + ")"; } if(o instanceof Method) { - StringBuilder mx = new StringBuilder(); + String mx = ""; for(Class i : ((Method) o).getParameterTypes()) { - mx.append(",").append(i.getCanonicalName()); + mx += "," + i.getCanonicalName(); } - mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); + mx = mx.length() >= 1 ? mx.substring(1) : mx; 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 { - StringBuilder mx = new StringBuilder(); + String mx = ""; for(Class i : params) { - mx.append(",").append(i.getCanonicalName()); + mx += "," + i.getCanonicalName(); } - mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); + mx = mx.length() >= 1 ? mx.substring(1) : mx; 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 = ""; - StringBuilder mx = new StringBuilder(); + String mx = ""; for(Class i : pars) { - mx.append(",").append(i.getCanonicalName()); + mx += "," + i.getCanonicalName(); } - mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); + mx = mx.length() >= 1 ? mx.substring(1) : mx; 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 = ""; - StringBuilder mx = new StringBuilder(); + String mx = ""; for(Class i : pars) { - mx.append(",").append(i.getCanonicalName()); + mx += "," + i.getCanonicalName(); } - mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); + mx = mx.length() >= 1 ? mx.substring(1) : mx; iv = id(c, null) + "." + name + "(" + mx + ")"; if(!h(iv))