X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FFundingLocked.java;h=e6e2eea5fccca2bbbccbbb2087ff1a85d6a87bd1;hb=18faab2952bff2302d55528dea556246be63950a;hp=ac0cdf239ad93889ba2f41e827356e0000b7dfde;hpb=592c4f92dd3011a2f2a7988ce66ed166c3a8f58c;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/FundingLocked.java b/src/main/java/org/ldk/structs/FundingLocked.java
index ac0cdf23..e6e2eea5 100644
--- a/src/main/java/org/ldk/structs/FundingLocked.java
+++ b/src/main/java/org/ldk/structs/FundingLocked.java
@@ -2,44 +2,47 @@ 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 FundingLocked extends CommonBase {
 	FundingLocked(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.FundingLocked_free(ptr);
+		if (ptr != 0) { bindings.FundingLocked_free(ptr); }
 	}
 
-	public FundingLocked(FundingLocked orig) {
-		super(bindings.FundingLocked_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public static FundingLocked constructor_clone(FundingLocked orig) {
+		long ret = bindings.FundingLocked_clone(orig == null ? 0 : orig.ptr & ~1);
+		FundingLocked ret_hu_conv = new FundingLocked(null, ret);
+		ret_hu_conv.ptrs_to.add(orig);
+		return ret_hu_conv;
 	}
 
-	public byte[] get_channel_id(FundingLocked this_ptr) {
-		byte[] ret = bindings.FundingLocked_get_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.FundingLocked_get_channel_id(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_id(FundingLocked this_ptr, byte[] val) {
-		bindings.FundingLocked_set_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_channel_id(byte[] val) {
+		bindings.FundingLocked_set_channel_id(this.ptr, val);
 	}
 
-	public byte[] get_next_per_commitment_point(FundingLocked this_ptr) {
-		byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_next_per_commitment_point() {
+		byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this.ptr);
 		return ret;
 	}
 
-	public void set_next_per_commitment_point(FundingLocked this_ptr, byte[] val) {
-		bindings.FundingLocked_set_next_per_commitment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_next_per_commitment_point(byte[] val) {
+		bindings.FundingLocked_set_next_per_commitment_point(this.ptr, val);
 	}
 
-	public FundingLocked(byte[] channel_id_arg, byte[] next_per_commitment_point_arg) {
-		super(bindings.FundingLocked_new(channel_id_arg, next_per_commitment_point_arg));
+	public static FundingLocked constructor_new(byte[] channel_id_arg, byte[] next_per_commitment_point_arg) {
+		long ret = bindings.FundingLocked_new(channel_id_arg, next_per_commitment_point_arg);
+		FundingLocked ret_hu_conv = new FundingLocked(null, ret);
+		return ret_hu_conv;
 	}
 
 	public byte[] write(FundingLocked obj) {
@@ -48,8 +51,10 @@ public class FundingLocked extends CommonBase {
 		return ret;
 	}
 
-	public FundingLocked(byte[] ser) {
-		super(bindings.FundingLocked_read(ser));
+	public static FundingLocked constructor_read(byte[] ser) {
+		long ret = bindings.FundingLocked_read(ser);
+		FundingLocked ret_hu_conv = new FundingLocked(null, ret);
+		return ret_hu_conv;
 	}
 
 }