Use Locale.ROOT instead of .US

egonw · egonw · commit 6d6d58fdf7eb · 2019-01-07T10:18:15.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
@@ -335,9 +335,9 @@ public FormatStringBuffer format(double dbl) {
 
         NumberFormat nf;
         if ((fmt.flags & SCI) > 0) {
-            nf = new DecimalFormat("0.#E00", DecimalFormatSymbols.getInstance(Locale.US));
+            nf = new DecimalFormat("0.#E00", DecimalFormatSymbols.getInstance(Locale.ROOT));
         } else {
-            nf = NumberFormat.getInstance(Locale.US);
+            nf = NumberFormat.getInstance(Locale.ROOT);
         }
         nf.setGroupingUsed((fmt.flags & GROUPING) != 0);
         if (fmt.precision != -1) {
diff --git a/storage/ctab/src/main/java/org/openscience/cdk/io/MDLV3000Writer.java b/storage/ctab/src/main/java/org/openscience/cdk/io/MDLV3000Writer.java
@@ -87,7 +87,7 @@
 public final class MDLV3000Writer extends DefaultChemObjectWriter {
 
     public static final  SimpleDateFormat HEADER_DATE_FORMAT = new SimpleDateFormat("MMddyyHHmm");
-    public static final  NumberFormat     DECIMAL_FORMAT     = new DecimalFormat("#.####", DecimalFormatSymbols.getInstance(Locale.US));
+    public static final  NumberFormat     DECIMAL_FORMAT     = new DecimalFormat("#.####", DecimalFormatSymbols.getInstance(Locale.ROOT));
     private static final Pattern          R_GRP_NUM          = Pattern.compile("R(\\d+)");
     private V30LineWriter writer;
 
diff --git a/storage/io/src/main/java/org/openscience/cdk/io/program/Mopac7Writer.java b/storage/io/src/main/java/org/openscience/cdk/io/program/Mopac7Writer.java
@@ -90,7 +90,7 @@ public Mopac7Writer(OutputStream out) throws IOException {
      * @param  out {@link Writer} to which the output is written
      */
     public Mopac7Writer(Writer out) throws IOException {
-        numberFormat = NumberFormat.getInstance(Locale.US);
+        numberFormat = NumberFormat.getInstance(Locale.ROOT);
         numberFormat.setMaximumFractionDigits(4);
         writer = new BufferedWriter(out);
         initIOSettings();
diff --git a/storage/libiocml/src/main/java/org/openscience/cdk/io/RssWriter.java b/storage/libiocml/src/main/java/org/openscience/cdk/io/RssWriter.java
@@ -185,7 +185,7 @@ public void write(IChemObject object) throws CDKException {
                 }
                 if (datemap.get(chemObject) != null) {
                     Element dateElement = new Element("dc:date", NS_DCELEMENTS);
-                    SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);
+                    SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT);
                     dateElement.appendChild(new Text(formatter.format((Date) datemap.get(chemObject)) + timezone));
                     itemElement.appendChild(dateElement);
                 }
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
@@ -188,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("#.##", DecimalFormatSymbols.getInstance(Locale.US));
+            DecimalFormat fmt = new DecimalFormat("#.##", DecimalFormatSymbols.getInstance(Locale.ROOT));
             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
@@ -85,7 +85,7 @@
  */
 final class IdentityTemplateLibrary {
 
-    private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat(".##", DecimalFormatSymbols.getInstance(Locale.US));
+    private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat(".##", DecimalFormatSymbols.getInstance(Locale.ROOT));
 
     private final Multimap<String, Point2d[]> templateMap = LinkedListMultimap.create();
 

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public void write(IChemObject object) throws CDKException {`
`185`	`185`	`}`
`186`	`186`	`if (datemap.get(chemObject) != null) {`
`187`	`187`	`Element dateElement = new Element("dc:date", NS_DCELEMENTS);`
`188`		`- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);`
	`188`	`+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT);`
`189`	`189`	`dateElement.appendChild(new Text(formatter.format((Date) datemap.get(chemObject)) + timezone));`
`190`	`190`	`itemElement.appendChild(dateElement);`
`191`	`191`	`}`