From 2523cd19e374fa308ac738e2dff061a22ae2d1f6 Mon Sep 17 00:00:00 2001 From: Alexander Bielen Date: Tue, 27 Nov 2018 20:12:54 +0100 Subject: [PATCH] [CLEANUP] Switched to String.format and cleanup --- src/main/java/org/parabot/core/asm/wrappers/Getter.java | 2 +- src/main/java/org/parabot/core/asm/wrappers/Invoker.java | 6 +----- src/main/java/org/parabot/core/asm/wrappers/Setter.java | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/parabot/core/asm/wrappers/Getter.java b/src/main/java/org/parabot/core/asm/wrappers/Getter.java index cb55aeb..e7ef7a7 100644 --- a/src/main/java/org/parabot/core/asm/wrappers/Getter.java +++ b/src/main/java/org/parabot/core/asm/wrappers/Getter.java @@ -38,7 +38,7 @@ public class Getter implements Injectable { this.fieldLocation = ASMUtils.getClass(fieldLocation); this.fieldNode = ASMUtils.getField(ASMUtils.getClass(fieldLocation), fieldNode, fieldDesc); this.methodName = methodName; - this.returnDesc = returnDesc == null && this.fieldNode != null ? this.fieldNode.desc : returnDesc; + this.returnDesc = (returnDesc == null && this.fieldNode != null) ? this.fieldNode.desc : returnDesc; this.staticMethod = staticMethod; this.multiplier = multiplier; Core.verbose(methodName + "[" + fieldLocation + "." + fieldNode + "]"); diff --git a/src/main/java/org/parabot/core/asm/wrappers/Invoker.java b/src/main/java/org/parabot/core/asm/wrappers/Invoker.java index 9349d61..a8bc7d8 100644 --- a/src/main/java/org/parabot/core/asm/wrappers/Invoker.java +++ b/src/main/java/org/parabot/core/asm/wrappers/Invoker.java @@ -81,10 +81,6 @@ public class Invoker implements Injectable { @Override public String toString() { - return new StringBuilder() - .append("Injectable type: Invoker") - .append(", accessor: ").append(methodLocation.name) - .append(", method name: ").append(methodName) - .append(", invokes method: ").append(mName).toString(); + return String.format("Injectable type: Invoker, accessor: %s, method name: %s, invokes method: %s", methodLocation.name, methodName, mName); } } diff --git a/src/main/java/org/parabot/core/asm/wrappers/Setter.java b/src/main/java/org/parabot/core/asm/wrappers/Setter.java index 5436cc6..94ce25d 100644 --- a/src/main/java/org/parabot/core/asm/wrappers/Setter.java +++ b/src/main/java/org/parabot/core/asm/wrappers/Setter.java @@ -25,7 +25,7 @@ public class Setter implements Injectable { this.into = ASMUtils.getClass(into); this.field = ASMUtils.getField(this.fieldLocation, fieldName, fieldDesc); this.name = methodName; - this.desc = (desc == null) && this.field != null ? this.field.desc : desc; + this.desc = (desc == null && this.field != null) ? this.field.desc : desc; this.methodStatic = methodStatic; }