Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

Wbase: Do not fail if null quantity.lbound or quantity.ubound

Browse Source
This commit is contained in:
gnosygnu
2016-12-03 17:52:41 -05:00
parent 9fd328ac8f
commit 364e72e869
5 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
400_xowa/src/gplx/xowa/xtns/wbases/claims/itms/Wbase_claim_quantity.java
View File

@@ -28,15 +28,31 @@ public class Wbase_claim_quantity extends Wbase_claim_base {
public byte[] Unit() {return unit;} private final byte[] unit;
public Decimal_adp Amount_as_num() {
if (amount_as_num == null) amount_as_num = To_decimal("amount", amount);
if (amount_as_num == null) {
amount_as_num = To_decimal_or_null("amount", amount);
if (amount_as_num == null) {
amount_as_num = Decimal_adp_.Zero;
Gfo_usr_dlg_.Instance.Warn_many("", "", "wbase.claim: value is null; name=~{0}", "amount");
}
}
return amount_as_num;
} private Decimal_adp amount_as_num;
public Decimal_adp Ubound_as_num() {
if (ubound_as_num == null) ubound_as_num = To_decimal("upper", ubound);
if (ubound_as_num == null) {
ubound_as_num = To_decimal_or_null("upper", ubound);
if (ubound_as_num == null) {
ubound_as_num = amount_as_num;
}
}
return ubound_as_num;
} private Decimal_adp ubound_as_num;
public Decimal_adp Lbound_as_num() {
if (lbound_as_num == null) lbound_as_num = To_decimal("lower", lbound);
if (lbound_as_num == null) {
lbound_as_num = To_decimal_or_null("lower", lbound);
if (lbound_as_num == null) {
lbound_as_num = amount_as_num;
}
}
return lbound_as_num;
} private Decimal_adp lbound_as_num;
@@ -46,10 +62,10 @@ public class Wbase_claim_quantity extends Wbase_claim_base {
}
public static final byte[] Unit_1 = Bry_.new_a7("1");
public static Decimal_adp To_decimal(String name, byte[] bry) {
if (bry == null) throw Err_.new_wo_type("wbase.claim: value is null", "name", name);
private static Decimal_adp To_decimal_or_null(String name, byte[] bry) {
if (bry == null) return null;
int len = bry.length;
if (len == 0) throw Err_.new_wo_type("wbase.claim: value is empty", "name", name);
if (len == 0) return null;
if (bry[0] == Byte_ascii.Plus) bry = Bry_.Mid(bry, 1);
return Decimal_adp_.parse(String_.new_a7(bry));
}