Remove use of Locale.getDefault() without a category

Fixes qupath#886
petebankhead · Jan 11, 2022 · 5df8941 · 5df8941
1 parent 7b0fd7b
commit 5df8941
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/qupath-core-processing/src/main/java/qupath/opencv/ml/OpenCVClassifiers.java b/qupath-core-processing/src/main/java/qupath/opencv/ml/OpenCVClassifiers.java
@@ -1498,7 +1498,7 @@ void updateModel(ANN_MLP model, ParameterList params, TrainData trainData) {
 			// Set termination criterion
 			model.setTermCriteria(updateTermCriteria(params, model.getTermCriteria()));
 
-			logger.debug("Initializing ANN with layer sizes: " + GeneralTools.arrayToString(Locale.getDefault(), layers, 0));
+			logger.debug("Initializing ANN with layer sizes: " + GeneralTools.arrayToString(Locale.getDefault(Locale.Category.FORMAT), layers, 0));
 		}
 
 	}

diff --git a/qupath-core/src/main/java/qupath/lib/common/GeneralTools.java b/qupath-core/src/main/java/qupath/lib/common/GeneralTools.java
@@ -533,7 +533,9 @@ public synchronized static String formatNumber(final double value, final int max
 	 * @param maxDecimalPlaces
 	 * @return
 	 */
-	public synchronized static String formatNumber(final Locale locale, final double value, final int maxDecimalPlaces) {
+	public synchronized static String formatNumber(Locale locale, final double value, final int maxDecimalPlaces) {
+		if (locale == null)
+			locale = Locale.getDefault(Category.FORMAT);
 		NumberFormat nf = formatters.get(locale);
 		if (nf == null) {
 			nf = NumberFormat.getInstance(locale);

diff --git a/qupath-core/src/main/java/qupath/lib/roi/GeometryTools.java b/qupath-core/src/main/java/qupath/lib/roi/GeometryTools.java
@@ -136,7 +136,7 @@ public static AffineTransformation parseTransformMatrix(String text) throws Pars
 		} else
 			text = text.replace(System.lineSeparator(), " ");
 
-		var nf = NumberFormat.getInstance(Locale.getDefault());
+		var nf = NumberFormat.getInstance();
 		var tokens = new StringTokenizer(text, delims);
 		if (tokens.countTokens() != 6)
 			throw new IllegalArgumentException("Affine transform should be tab-delimited and contain 6 numbers only");

diff --git a/...formats/src/test/java/qupath/lib/images/servers/bioformats/TestBioFormatsImageServer.java b/...formats/src/test/java/qupath/lib/images/servers/bioformats/TestBioFormatsImageServer.java
@@ -379,7 +379,7 @@ void printSummary(final ImageServer<?> server) {
 						"%s: %d x %d (c=%d, z=%d, t=%d), bpp=%d, mag=%.2f, downsamples=[%s], res=[%.4f,%.4f,%.4f]",
 						server.getPath(), server.getWidth(), server.getHeight(),
 						server.nChannels(), server.nZSlices(), server.nTimepoints(),
-						server.getPixelType(), server.getMetadata().getMagnification(), GeneralTools.arrayToString(Locale.getDefault(), server.getPreferredDownsamples(), 4),
+						server.getPixelType(), server.getMetadata().getMagnification(), GeneralTools.arrayToString(Locale.getDefault(Locale.Category.FORMAT), server.getPreferredDownsamples(), 4),
 						cal.getPixelWidthMicrons(), cal.getPixelHeightMicrons(), cal.getZSpacingMicrons())
 				);
 	}

diff --git a/qupath-gui-fx/src/main/java/qupath/lib/gui/panes/ImageDetailsPane.java b/qupath-gui-fx/src/main/java/qupath/lib/gui/panes/ImageDetailsPane.java
@@ -889,7 +889,7 @@ private Object getValue(ImageDetailRow rowType) {
 		case PYRAMID:
 			if (server.nResolutions() == 1)
 				return "No";
-			return GeneralTools.arrayToString(Locale.getDefault(), server.getPreferredDownsamples(), 1);
+			return GeneralTools.arrayToString(Locale.getDefault(Locale.Category.FORMAT), server.getPreferredDownsamples(), 1);
 		case STAIN_1:
 			return imageData.getColorDeconvolutionStains().getStain(1);
 		case STAIN_2: