Merge pull request jpos#101 from vsalaman/isocurr

ISOCurrency now uses currencies from jvm
akaronji · Feb 24, 2016 · 83616bb · 83616bb
2 parents e9cf808 + fcda2b6
commit 83616bb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 226 deletions.
diff --git a/jpos/src/main/java/org/jpos/iso/ISOCurrency.java b/jpos/src/main/java/org/jpos/iso/ISOCurrency.java
@@ -21,7 +21,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+import java.util.Set;
 
 /**
  * ISO Currency Conversion package
@@ -43,10 +48,27 @@ private ISOCurrency()
 
     static
     {
-        addBundle(ISOCurrency.class.getName());
+        addJavaCurrencies();
         loadPropertiesFromClasspath("META-INF/org/jpos/config/ISOCurrency.properties");
     }
 
+    private static void addJavaCurrencies()
+    {
+        Set<java.util.Currency> currencies = java.util.Currency.getAvailableCurrencies();
+        for (java.util.Currency sc : currencies)
+        {
+            try
+            {
+                addCurrency(sc.getCurrencyCode().toUpperCase(),
+                            ISOUtil.zeropad(Integer.toString(sc.getNumericCode()), 3),
+                            sc.getDefaultFractionDigits());
+            }
+            catch (ISOException ignored)
+            {
+            }
+        }
+    }
+
     @SuppressWarnings({"EmptyCatchBlock"})
     public static void loadPropertiesFromClasspath(String base)
     {

diff --git a/jpos/src/main/resources/org/jpos/iso/ISOCurrency.properties b/jpos/src/main/resources/org/jpos/iso/ISOCurrency.properties