Use the proper locale here too

egonw · egonw · commit 31af742549c5 · 2019-01-05T18:08:27.000+01:00
diff --git a/base/standard/src/main/java/org/openscience/cdk/tools/FormatStringBuffer.java b/base/standard/src/main/java/org/openscience/cdk/tools/FormatStringBuffer.java
@@ -36,7 +36,9 @@
 
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
+import java.util.Locale;
 
 /**
  * A class for formatting output similar to the C <tt>printf</tt> command.
@@ -333,9 +335,9 @@ public FormatStringBuffer format(double dbl) {
 
         NumberFormat nf;
         if ((fmt.flags & SCI) > 0) {
-            nf = new DecimalFormat("0.#E00");
+            nf = new DecimalFormat("0.#E00", DecimalFormatSymbols.getInstance(Locale.US));
         } else {
-            nf = NumberFormat.getInstance();
+            nf = NumberFormat.getInstance(Locale.US);
         }
         nf.setGroupingUsed((fmt.flags & GROUPING) != 0);
         if (fmt.precision != -1) {
diff --git a/storage/smiles/src/main/java/org/openscience/cdk/smiles/CxSmilesGenerator.java b/storage/smiles/src/main/java/org/openscience/cdk/smiles/CxSmilesGenerator.java
@@ -26,6 +26,7 @@
 import org.openscience.cdk.smiles.CxSmilesState.PolymerSgroup;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -187,7 +188,7 @@ public int compare(List<Integer> a, List<Integer> b) {
         // 2D/3D Coordinates
         if (SmiFlavor.isSet(opts, SmiFlavor.CxCoordinates) &&
             state.atomCoords != null && !state.atomCoords.isEmpty()) {
-            DecimalFormat fmt = new DecimalFormat("#.##");
+            DecimalFormat fmt = new DecimalFormat("#.##", DecimalFormatSymbols.getInstance(Locale.US));
             if (sb.length() > 2) sb.append(',');
             sb.append('(');
             for (int i = 0; i < ordering.length; i++) {
diff --git a/tool/sdg/src/main/java/org/openscience/cdk/layout/IdentityTemplateLibrary.java b/tool/sdg/src/main/java/org/openscience/cdk/layout/IdentityTemplateLibrary.java
@@ -45,11 +45,13 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import static java.util.AbstractMap.SimpleEntry;
@@ -83,7 +85,7 @@
  */
 final class IdentityTemplateLibrary {
 
-    private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat(".##");
+    private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat(".##", DecimalFormatSymbols.getInstance(Locale.US));
 
     private final Multimap<String, Point2d[]> templateMap = LinkedListMultimap.create();
 
