Make ValueFormat.toFormat safe to call with any noOfDecimals value

noOfDecimals is now capped between [0,16].

gitlab #391

Change-Id: Id24752a908b65c261f02964ec18cdb8e759ea0d0

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 9734d3c569b219b5a0cdd72618186d0c03ebbfb3..1cc1c94a7071ada5b497dbe3158e26d25674f96b 100644 (file)
--- 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;
                }
        }