From 419d2d828245dafa8bb55abd0d179fee45422015 Mon Sep 17 00:00:00 2001
From: Ali Moghnieh <SupaHam.me@gmail.com>
Date: Wed, 13 Jan 2016 22:54:00 +0000
Subject: [PATCH] Prettify currency display further.

---
 .../earth2me/essentials/utils/NumberUtil.java | 24 ++++++++++++++++---
 .../com/earth2me/essentials/EconomyTest.java  |  2 +-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/utils/NumberUtil.java b/Essentials/src/com/earth2me/essentials/utils/NumberUtil.java
index f11abdbd6..a9c7d9f75 100644
--- a/Essentials/src/com/earth2me/essentials/utils/NumberUtil.java
+++ b/Essentials/src/com/earth2me/essentials/utils/NumberUtil.java
@@ -6,6 +6,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
 import java.util.Locale;
 
 import static com.earth2me.essentials.I18n.tl;
@@ -14,18 +15,27 @@ import static com.earth2me.essentials.I18n.tl;
 public class NumberUtil {
     static DecimalFormat twoDPlaces = new DecimalFormat("#,###.##");
     static DecimalFormat currencyFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
+    static final NumberFormat PRETTY_FORMAT = NumberFormat.getInstance(Locale.US);
+
+    static {
+        twoDPlaces.setRoundingMode(RoundingMode.HALF_UP);
+        currencyFormat.setRoundingMode(RoundingMode.FLOOR);
+
+        PRETTY_FORMAT.setRoundingMode(RoundingMode.FLOOR);
+        PRETTY_FORMAT.setGroupingUsed(true);
+        PRETTY_FORMAT.setMinimumFractionDigits(2);
+        PRETTY_FORMAT.setMaximumFractionDigits(2);
+    }
 
     public static String shortCurrency(final BigDecimal value, final IEssentials ess) {
         return ess.getSettings().getCurrencySymbol() + formatAsCurrency(value);
     }
 
     public static String formatDouble(final double value) {
-        twoDPlaces.setRoundingMode(RoundingMode.HALF_UP);
         return twoDPlaces.format(value);
     }
 
     public static String formatAsCurrency(final BigDecimal value) {
-        currencyFormat.setRoundingMode(RoundingMode.FLOOR);
         String str = currencyFormat.format(value);
         if (str.endsWith(".00")) {
             str = str.substring(0, str.length() - 3);
@@ -33,8 +43,16 @@ public class NumberUtil {
         return str;
     }
 
+    public static String formatAsPrettyCurrency(BigDecimal value) {
+        String str = PRETTY_FORMAT.format(value);
+        if (str.endsWith(".00")) {
+            str = str.substring(0, str.length() - 3);
+        }
+        return str;
+    }
+
     public static String displayCurrency(final BigDecimal value, final IEssentials ess) {
-        return tl("currency", ess.getSettings().getCurrencySymbol(), formatAsCurrency(value));
+        return tl("currency", ess.getSettings().getCurrencySymbol(), formatAsPrettyCurrency(value));
     }
 
     public static String displayCurrencyExactly(final BigDecimal value, final IEssentials ess) {
diff --git a/Essentials/test/com/earth2me/essentials/EconomyTest.java b/Essentials/test/com/earth2me/essentials/EconomyTest.java
index 80cd140e5..99f82fd81 100644
--- a/Essentials/test/com/earth2me/essentials/EconomyTest.java
+++ b/Essentials/test/com/earth2me/essentials/EconomyTest.java
@@ -69,7 +69,7 @@ public class EconomyTest extends TestCase {
         }
 
         //test Format
-        assertEquals("Format $1000", "$1000", Economy.format(1000.0));
+        assertEquals("Format $1,000", "$1,000", Economy.format(1000.0));
         assertEquals("Format $10", "$10", Economy.format(10.0));
         assertEquals("Format $10.10", "$10.10", Economy.format(10.10));
         assertEquals("Format $10.10", "$10.10", Economy.format(10.1000001));