X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Futil%2FThroughput.java;h=e5bc96101582c6a739a395b501d1a0a186ebaf6b;hb=050bd6a22e01442bf34962c4f378e3d92bc6eb21;hp=d081189e2c51e520fb9bedab0f274328477dd17e;hpb=eebaa683a3c470ad22a5eaa5c32f816a2ea2cbbb;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.util/src/org/argeo/util/Throughput.java b/org.argeo.util/src/org/argeo/util/Throughput.java index d081189e2..e5bc96101 100644 --- a/org.argeo.util/src/org/argeo/util/Throughput.java +++ b/org.argeo.util/src/org/argeo/util/Throughput.java @@ -19,8 +19,6 @@ import java.text.NumberFormat; import java.text.ParseException; import java.util.Locale; -import org.argeo.ArgeoException; - public class Throughput { private final static NumberFormat usNumberFormat = NumberFormat .getInstance(Locale.US); @@ -47,7 +45,7 @@ public class Throughput { else if (unit.equals(Unit.d)) value = ((double) count * 24d * 60d * 60d * 1000d) / periodMs; else - throw new ArgeoException("Unsupported unit " + unit); + throw new UtilsException("Unsupported unit " + unit); this.unit = unit; } @@ -58,14 +56,14 @@ public class Throughput { public Throughput(String def) { int index = def.indexOf('/'); if (def.length() < 3 || index <= 0 || index != def.length() - 2) - throw new ArgeoException(def + " no a proper throughput definition" + throw new UtilsException(def + " no a proper throughput definition" + " (should be /, e.g. 3.54/s or 1500/h"); String valueStr = def.substring(0, index); String unitStr = def.substring(index + 1); try { this.value = usNumberFormat.parse(valueStr).doubleValue(); } catch (ParseException e) { - throw new ArgeoException("Cannot parse " + valueStr + throw new UtilsException("Cannot parse " + valueStr + " as a number.", e); } this.unit = Unit.valueOf(unitStr); @@ -81,7 +79,7 @@ public class Throughput { else if (unit.equals(Unit.d)) return Math.round((24d * 60d * 60d * 1000d) / value); else - throw new ArgeoException("Unsupported unit " + unit); + throw new UtilsException("Unsupported unit " + unit); } @Override