From dba07c1832265e8ee89536bee54f6f360ac6caf0 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 15 Oct 2020 22:46:25 -0700 Subject: [PATCH] Performance pass 6 (Wrapper type may be primitive) --- src/main/java/com/volmit/iris/util/Form.java | 6 +++--- src/main/java/com/volmit/iris/util/JSONObject.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/volmit/iris/util/Form.java b/src/main/java/com/volmit/iris/util/Form.java index d9c7c7d67..bbadba5c9 100644 --- a/src/main/java/com/volmit/iris/util/Form.java +++ b/src/main/java/com/volmit/iris/util/Form.java @@ -876,7 +876,7 @@ public class Form */ public static String ofSize(long s, int div) { - Double d = (double) s; + double d = (double) s; String sub = "Bytes"; if(d > div - 1) @@ -929,7 +929,7 @@ public class Form */ public static String ofSize(long s, int div, int dec) { - Double d = (double) s; + double d = (double) s; String sub = "Bytes"; if(d > div - 1) @@ -979,7 +979,7 @@ public class Form { s = -s; } - Double d = (double) s; + double d = (double) s; String sub = "Grams"; if(d > div - 1) diff --git a/src/main/java/com/volmit/iris/util/JSONObject.java b/src/main/java/com/volmit/iris/util/JSONObject.java index 3ab4a6115..475789dde 100644 --- a/src/main/java/com/volmit/iris/util/JSONObject.java +++ b/src/main/java/com/volmit/iris/util/JSONObject.java @@ -1652,7 +1652,7 @@ public class JSONObject */ public static Object stringToValue(String string) { - Double d; + double d; if(string.equals("")) { return string; @@ -1682,8 +1682,8 @@ public class JSONObject { if(string.indexOf('.') > -1 || string.indexOf('e') > -1 || string.indexOf('E') > -1) { - d = Double.valueOf(string); - if(!d.isInfinite() && !d.isNaN()) + d = Double.parseDouble(string); + if(!Double.isInfinite(d) && !Double.isNaN(d)) { return d; }