From 66de46f0c920268cf6d981ad663142f293788dce Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Thu, 30 Jan 2014 02:43:33 +0100 Subject: [PATCH] Break out the isFloating logic in the GsonEqualsChecker --- src/com/massivecraft/mcore/MPlugin.java | 1 + .../mcore/store/GsonEqualsChecker.java | 20 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/com/massivecraft/mcore/MPlugin.java b/src/com/massivecraft/mcore/MPlugin.java index 11d4936c..891cd8a0 100644 --- a/src/com/massivecraft/mcore/MPlugin.java +++ b/src/com/massivecraft/mcore/MPlugin.java @@ -61,6 +61,7 @@ public abstract class MPlugin extends JavaPlugin implements Listener // DISABLE // -------------------------------------------- // + @Override public void onDisable() { // Collection shutdowns. diff --git a/src/com/massivecraft/mcore/store/GsonEqualsChecker.java b/src/com/massivecraft/mcore/store/GsonEqualsChecker.java index a7316233..98fa259f 100644 --- a/src/com/massivecraft/mcore/store/GsonEqualsChecker.java +++ b/src/com/massivecraft/mcore/store/GsonEqualsChecker.java @@ -134,16 +134,7 @@ public class GsonEqualsChecker Number oneNumber = one.getAsNumber(); Number twoNumber = two.getAsNumber(); - boolean floating; - if (oneNumber instanceof LazilyParsedNumber) - { - floating = StringUtils.contains(oneNumber.toString(), '.'); - } - else - { - floating = (oneNumber instanceof Double || oneNumber instanceof Float); - } - + boolean floating = isFloating(oneNumber); if (floating) { // Our epsilon is pretty big in order to see float and double as the same. @@ -174,4 +165,13 @@ public class GsonEqualsChecker return twoObject == JsonNull.INSTANCE; } + + public static boolean isFloating(Number number) + { + if (number instanceof LazilyParsedNumber) + { + return StringUtils.contains(number.toString(), '.'); + } + return (number instanceof Double || number instanceof Float); + } }