Fix #917: Symmetry doesn't display with non-US locales

sbliven · sbliven · commit e40d0efdd0d1 · 2021-03-01T17:43:02.000+01:00
- Always use the US locale when printing jmol scripts
- Update Jmol to 14.31.10 while we're at it.
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>net.sourceforge.jmol</groupId>
             <artifactId>jmol</artifactId>
-            <version>14.29.17</version>
+            <version>14.31.10</version>
         </dependency>
         <!-- logging dependencies (managed by parent pom, don't set versions or
             scopes here) -->
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java
@@ -29,6 +29,7 @@
 import javax.vecmath.Tuple3d;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -226,11 +227,11 @@ protected static String getJmolPoint(Tuple3d point) {
 	}
 
 	protected static String f1Dot2(float number) {
-		return String.format("%1.2f", number);
+		return String.format(Locale.US, "%1.2f", number);
 	}
 
 	protected static String fDot2(double number) {
-		return String.format("%.2f", number);
+		return String.format(Locale.US, "%.2f", number);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`import javax.vecmath.Tuple3d;`
`30`	`30`
`31`	`31`	`import java.util.List;`
	`32`	`+import java.util.Locale;`
`32`	`33`	`import java.util.Map;`
`33`	`34`	`import java.util.Map.Entry;`
`34`	`35`
`@@ -226,11 +227,11 @@ protected static String getJmolPoint(Tuple3d point) {`
`226`	`227`	`}`
`227`	`228`
`228`	`229`	`protected static String f1Dot2(float number) {`
`229`		`- return String.format("%1.2f", number);`
	`230`	`+ return String.format(Locale.US, "%1.2f", number);`
`230`	`231`	`}`
`231`	`232`
`232`	`233`	`protected static String fDot2(double number) {`
`233`		`- return String.format("%.2f", number);`
	`234`	`+ return String.format(Locale.US, "%.2f", number);`
`234`	`235`	`}`
`235`	`236`
`236`	`237`	`/**`