Improved thread safety.

johnmay · johnmay · commit ffd4903ec726 · 2019-07-03T10:46:56.000+01:00
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
@@ -52,9 +52,6 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -89,11 +86,9 @@
  */
 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.ROOT));
-    private static final Pattern          R_GRP_NUM          = Pattern.compile("R(\\d+)");
-    private V30LineWriter                 writer;
-    private StringIOSetting               programNameOpt;
+    private static final Pattern         R_GRP_NUM = Pattern.compile("R(\\d+)");
+    private              V30LineWriter   writer;
+    private              StringIOSetting programNameOpt;
 
     /**
      * Create a new V3000 writer, output to the provided JDK writer.
@@ -182,7 +177,7 @@ private void writeHeader(IAtomContainer mol) throws IOException {
          */
         writer.writeDirect("  ");
         writer.writeDirect(getProgName());
-        writer.writeDirect(HEADER_DATE_FORMAT.format(System.currentTimeMillis()));
+        writer.writeDirect(new SimpleDateFormat("MMddyyHHmm").format(System.currentTimeMillis()));
         final int dim = getNumberOfDimensions(mol);
         if (dim != 0) {
             writer.writeDirect(Integer.toString(dim));
@@ -646,8 +641,8 @@ else if (o2.getParents().contains(o1))
                             final Point2d p1 = bracket.getFirstPoint();
                             final Point2d p2 = bracket.getSecondPoint();
                             writer.write("9");
-                            writer.write(' ').write(DECIMAL_FORMAT.format(p1.x)).write(' ').write(DECIMAL_FORMAT.format(p1.y)).write(" 0");
-                            writer.write(' ').write(DECIMAL_FORMAT.format(p2.x)).write(' ').write(DECIMAL_FORMAT.format(p2.y)).write(" 0");
+                            writer.write(' ').write(p1.x).write(' ').write(p1.y).write(" 0");
+                            writer.write(' ').write(p2.x).write(' ').write(p2.y).write(" 0");
                             writer.write(" 0 0 0");
                             writer.write(")");
                         }
@@ -859,7 +854,7 @@ private void writePrefixIfNeeded() throws IOException {
          * @throws IOException low-level IO error
          */
         V30LineWriter write(double num) throws IOException {
-            return write(DECIMAL_FORMAT.format(num));
+            return write(String.format(Locale.ROOT, "%.5f", num));
         }
 
         /**
@@ -958,5 +953,4 @@ public void customizeJob() {
             fireIOSettingQuestion(setting);
         }
     }
-
 }
