From b329b7b2879883408becfd246fbe9f5d9f648237 Mon Sep 17 00:00:00 2001 From: Alexander Verbraeck Date: Sun, 23 Jul 2023 18:52:00 +0200 Subject: [PATCH] SIScalar and FloatSIScalar of() accepts empty unit string Relates to https://github.com/averbraeck/djunits/issues/14 --- src/main/resources/value/vdouble/scalar/SISCALAR.java | 3 +-- src/main/resources/value/vfloat/scalar/FLOATSISCALAR.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/resources/value/vdouble/scalar/SISCALAR.java b/src/main/resources/value/vdouble/scalar/SISCALAR.java index fbad72f..2442672 100644 --- a/src/main/resources/value/vdouble/scalar/SISCALAR.java +++ b/src/main/resources/value/vdouble/scalar/SISCALAR.java @@ -166,7 +166,7 @@ public SIScalar reciprocal() public static SIScalar valueOf(final String text) { Throw.whenNull(text, "Error parsing SIScalar: unitString is null"); - Throw.when(text.length() == 0, IllegalArgumentException.class, "Error parsing SIScalar: empty unitString"); + Throw.when(text.length() == 0, IllegalArgumentException.class, "Error parsing SIScalar: empty string"); try { NumberParser numberParser = new NumberParser().lenient().trailing(); @@ -196,7 +196,6 @@ public static SIScalar valueOf(final String text) public static SIScalar of(final double value, final String unitString) { Throw.whenNull(unitString, "Error parsing SIScalar: unitString is null"); - Throw.when(unitString.length() == 0, IllegalArgumentException.class, "Error parsing SIScalar: empty unitString"); try { SIUnit unit = Unit.lookupOrCreateUnitWithSIDimensions(SIDimensions.of(unitString)); diff --git a/src/main/resources/value/vfloat/scalar/FLOATSISCALAR.java b/src/main/resources/value/vfloat/scalar/FLOATSISCALAR.java index cf13d82..9019ff9 100644 --- a/src/main/resources/value/vfloat/scalar/FLOATSISCALAR.java +++ b/src/main/resources/value/vfloat/scalar/FLOATSISCALAR.java @@ -165,7 +165,7 @@ public FloatSIScalar reciprocal() public static FloatSIScalar valueOf(final String text) { Throw.whenNull(text, "Error parsing SIScalar: unitString is null"); - Throw.when(text.length() == 0, IllegalArgumentException.class, "Error parsing SIScalar: empty unitString"); + Throw.when(text.length() == 0, IllegalArgumentException.class, "Error parsing SIScalar: empty string"); try { NumberParser numberParser = new NumberParser().lenient().trailing(); @@ -195,7 +195,6 @@ public static FloatSIScalar valueOf(final String text) public static FloatSIScalar of(final float value, final String unitString) { Throw.whenNull(unitString, "Error parsing FloatSIScalar: unitString is null"); - Throw.when(unitString.length() == 0, IllegalArgumentException.class, "Error parsing FloatSIScalar: empty unitString"); try { SIUnit unit = Unit.lookupOrCreateUnitWithSIDimensions(SIDimensions.of(unitString));