X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FDescription.java;h=1ce3581d2397c18798b8cab1d0798c4fda96e1fb;hb=2bb592fb946e316dba9f4d1123f8ac72ff4e9bf8;hp=e6fa239f7c6d00348f4ca213ee5bdf059e63a65c;hpb=d2925e24ac4643ec22eb73495f0424e27def2545;p=ldk-java diff --git a/src/main/java/org/ldk/structs/Description.java b/src/main/java/org/ldk/structs/Description.java index e6fa239f..1ce3581d 100644 --- a/src/main/java/org/ldk/structs/Description.java +++ b/src/main/java/org/ldk/structs/Description.java @@ -36,13 +36,13 @@ public class Description extends CommonBase { long ret = bindings.Description_clone(this.ptr); Reference.reachabilityFence(this); if (ret >= 0 && ret <= 4096) { return null; } - Description ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new Description(null, ret); } - ret_hu_conv.ptrs_to.add(this); + org.ldk.structs.Description ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.Description(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } /** - * Checks if two Descriptions contain equal inner contents. + * Generates a non-cryptographic 64-bit hash of the Description. */ public long hash() { long ret = bindings.Description_hash(this.ptr); @@ -58,11 +58,11 @@ public class Description extends CommonBase { * This ignores pointers and is_owned flags and looks at the values in fields. * Two objects with NULL inner values will be considered "equal" here. */ - public boolean eq(Description b) { - boolean ret = bindings.Description_eq(this.ptr, b == null ? 0 : b.ptr & ~1); + public boolean eq(org.ldk.structs.Description b) { + boolean ret = bindings.Description_eq(this.ptr, b == null ? 0 : b.ptr); Reference.reachabilityFence(this); Reference.reachabilityFence(b); - this.ptrs_to.add(b); + if (this != null) { this.ptrs_to.add(b); }; return ret; } @@ -72,7 +72,7 @@ public class Description extends CommonBase { } /** * Creates a new `Description` if `description` is at most 1023 __bytes__ long, - * returns `CreationError::DescriptionTooLong` otherwise + * returns [`CreationError::DescriptionTooLong`] otherwise * * Please note that single characters may use more than one byte due to UTF8 encoding. */ @@ -85,12 +85,24 @@ public class Description extends CommonBase { } /** - * Returns the underlying description `String` + * Returns the underlying description [`UntrustedString`] + */ + public UntrustedString into_inner() { + long ret = bindings.Description_into_inner(this.ptr); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.UntrustedString ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UntrustedString(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; + if (this != null) { this.ptrs_to.add(this); }; + return ret_hu_conv; + } + + /** + * Get the string representation of a Description object */ - public String into_inner() { - String ret = bindings.Description_into_inner(this.ptr); + public String to_str() { + String ret = bindings.Description_to_str(this.ptr); Reference.reachabilityFence(this); - ; return ret; }