X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FHTLCOutputInCommitment.java;h=daa1c42d5d0499044cdda92f5db7d0c6cafebcb2;hb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;hp=d25beabeb4a3553e665586f771c7bf00b61e3b73;hpb=2ed9081562d00a8645604b07629e963231d49e0f;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/HTLCOutputInCommitment.java b/src/main/java/org/ldk/structs/HTLCOutputInCommitment.java
index d25beabe..daa1c42d 100644
--- a/src/main/java/org/ldk/structs/HTLCOutputInCommitment.java
+++ b/src/main/java/org/ldk/structs/HTLCOutputInCommitment.java
@@ -2,66 +2,71 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class HTLCOutputInCommitment extends CommonBase {
 	HTLCOutputInCommitment(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.HTLCOutputInCommitment_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.HTLCOutputInCommitment_free(ptr); }
 	}
 
-	public HTLCOutputInCommitment(HTLCOutputInCommitment orig) {
-		super(bindings.HTLCOutputInCommitment_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public HTLCOutputInCommitment clone() {
+		long ret = bindings.HTLCOutputInCommitment_clone(this.ptr);
+		HTLCOutputInCommitment ret_hu_conv = new HTLCOutputInCommitment(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public boolean get_offered(HTLCOutputInCommitment this_ptr) {
-		boolean ret = bindings.HTLCOutputInCommitment_get_offered(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public boolean get_offered() {
+		boolean ret = bindings.HTLCOutputInCommitment_get_offered(this.ptr);
 		return ret;
 	}
 
-	public void set_offered(HTLCOutputInCommitment this_ptr, boolean val) {
-		bindings.HTLCOutputInCommitment_set_offered(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_offered(boolean val) {
+		bindings.HTLCOutputInCommitment_set_offered(this.ptr, val);
 	}
 
-	public long get_amount_msat(HTLCOutputInCommitment this_ptr) {
-		long ret = bindings.HTLCOutputInCommitment_get_amount_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_amount_msat() {
+		long ret = bindings.HTLCOutputInCommitment_get_amount_msat(this.ptr);
 		return ret;
 	}
 
-	public void set_amount_msat(HTLCOutputInCommitment this_ptr, long val) {
-		bindings.HTLCOutputInCommitment_set_amount_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_amount_msat(long val) {
+		bindings.HTLCOutputInCommitment_set_amount_msat(this.ptr, val);
 	}
 
-	public int get_cltv_expiry(HTLCOutputInCommitment this_ptr) {
-		int ret = bindings.HTLCOutputInCommitment_get_cltv_expiry(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public int get_cltv_expiry() {
+		int ret = bindings.HTLCOutputInCommitment_get_cltv_expiry(this.ptr);
 		return ret;
 	}
 
-	public void set_cltv_expiry(HTLCOutputInCommitment this_ptr, int val) {
-		bindings.HTLCOutputInCommitment_set_cltv_expiry(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_cltv_expiry(int val) {
+		bindings.HTLCOutputInCommitment_set_cltv_expiry(this.ptr, val);
 	}
 
-	public byte[] get_payment_hash(HTLCOutputInCommitment this_ptr) {
-		byte[] ret = bindings.HTLCOutputInCommitment_get_payment_hash(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_payment_hash() {
+		byte[] ret = bindings.HTLCOutputInCommitment_get_payment_hash(this.ptr);
 		return ret;
 	}
 
-	public void set_payment_hash(HTLCOutputInCommitment this_ptr, byte[] val) {
-		bindings.HTLCOutputInCommitment_set_payment_hash(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_payment_hash(byte[] val) {
+		bindings.HTLCOutputInCommitment_set_payment_hash(this.ptr, val);
 	}
 
-	// Skipped HTLCOutputInCommitment_write
-	public HTLCOutputInCommitment(byte[] ser) {
-		super(bindings.HTLCOutputInCommitment_read(ser));
+	public byte[] write() {
+		byte[] ret = bindings.HTLCOutputInCommitment_write(this.ptr);
+		return ret;
+	}
+
+	public static HTLCOutputInCommitment constructor_read(byte[] ser) {
+		long ret = bindings.HTLCOutputInCommitment_read(ser);
+		HTLCOutputInCommitment ret_hu_conv = new HTLCOutputInCommitment(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
 }