X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.utils%2Fsrc%2Forg%2Fsimantics%2Futils%2Fformat%2FValueFormat.java;h=1cc1c94a7071ada5b497dbe3158e26d25674f96b;hp=9734d3c569b219b5a0cdd72618186d0c03ebbfb3;hb=3a1169e5b601f99d66cadaf398329fde9cc8e14a;hpb=29bf3f64e43ed153670dfeee6dd4b553d1543016

diff --git a/bundles/org.simantics.utils/src/org/simantics/utils/format/ValueFormat.java b/bundles/org.simantics.utils/src/org/simantics/utils/format/ValueFormat.java
index 9734d3c56..1cc1c94a7 100644
--- a/bundles/org.simantics.utils/src/org/simantics/utils/format/ValueFormat.java
+++ b/bundles/org.simantics.utils/src/org/simantics/utils/format/ValueFormat.java
@@ -35,10 +35,10 @@ public enum ValueFormat {
 	public Format toFormat( int noOfDecimals ) 
 	{
 		switch ( this ) {
-			case Currency: return noOfDecimals>decimalFormats.length||noOfDecimals<0 ? decimalFormats[decimalFormats.length-1] : decimalFormats[noOfDecimals]; 
+			case Currency: return noOfDecimals>decimalFormats.length||noOfDecimals<0 ? decimalFormats[decimalFormats.length-1] : decimalFormats[Math.min(noOfDecimals, 16)]; 
 			case Scientific: return format;
 			case Engineering: return format;
-			case Default: return noOfDecimals>defaultFormats.length||noOfDecimals<0 ? defaultFormats[defaultFormats.length-1] : defaultFormats[noOfDecimals];
+			case Default: return noOfDecimals>defaultFormats.length||noOfDecimals<0 ? defaultFormats[defaultFormats.length-1] : defaultFormats[Math.min(noOfDecimals, 16)];
 			default: return format;
 		}
 	}