X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelManagerReadArgs.java;h=5653e5d4c58c277e099f7bc31acde923ece6a48e;hb=276893d3b8bd3fcb2bb10e3cab73a69d34831909;hp=de7bf4a66be55b6667daebeff0477337734afe00;hpb=2ed9081562d00a8645604b07629e963231d49e0f;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelManagerReadArgs.java b/src/main/java/org/ldk/structs/ChannelManagerReadArgs.java
index de7bf4a6..5653e5d4 100644
--- a/src/main/java/org/ldk/structs/ChannelManagerReadArgs.java
+++ b/src/main/java/org/ldk/structs/ChannelManagerReadArgs.java
@@ -2,90 +2,102 @@ 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 ChannelManagerReadArgs extends CommonBase {
 	ChannelManagerReadArgs(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.ChannelManagerReadArgs_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.ChannelManagerReadArgs_free(ptr); }
 	}
 
-	public KeysInterface get_keys_manager(ChannelManagerReadArgs this_ptr) {
-		KeysInterface ret = new KeysInterface(null, bindings.ChannelManagerReadArgs_get_keys_manager(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-		ret.ptrs_to.add(this);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public KeysInterface get_keys_manager() {
+		long ret = bindings.ChannelManagerReadArgs_get_keys_manager(this.ptr);
+		KeysInterface ret_hu_conv = new KeysInterface(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public void set_keys_manager(ChannelManagerReadArgs this_ptr, KeysInterface val) {
-		bindings.ChannelManagerReadArgs_set_keys_manager(this_ptr == null ? 0 : this_ptr.ptr & ~1, val == null ? 0 : val.ptr);
-		this.ptrs_to.add(this_ptr);
+	public void set_keys_manager(KeysInterface val) {
+		bindings.ChannelManagerReadArgs_set_keys_manager(this.ptr, val == null ? 0 : val.ptr);
 		this.ptrs_to.add(val);
 	}
 
-	public FeeEstimator get_fee_estimator(ChannelManagerReadArgs this_ptr) {
-		FeeEstimator ret = new FeeEstimator(null, bindings.ChannelManagerReadArgs_get_fee_estimator(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-		ret.ptrs_to.add(this);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public FeeEstimator get_fee_estimator() {
+		long ret = bindings.ChannelManagerReadArgs_get_fee_estimator(this.ptr);
+		FeeEstimator ret_hu_conv = new FeeEstimator(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public void set_fee_estimator(ChannelManagerReadArgs this_ptr, FeeEstimator val) {
-		bindings.ChannelManagerReadArgs_set_fee_estimator(this_ptr == null ? 0 : this_ptr.ptr & ~1, val == null ? 0 : val.ptr);
-		this.ptrs_to.add(this_ptr);
+	public void set_fee_estimator(FeeEstimator val) {
+		bindings.ChannelManagerReadArgs_set_fee_estimator(this.ptr, val == null ? 0 : val.ptr);
 		this.ptrs_to.add(val);
 	}
 
-	public Watch get_chain_monitor(ChannelManagerReadArgs this_ptr) {
-		Watch ret = new Watch(null, bindings.ChannelManagerReadArgs_get_chain_monitor(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-		ret.ptrs_to.add(this);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public Watch get_chain_monitor() {
+		long ret = bindings.ChannelManagerReadArgs_get_chain_monitor(this.ptr);
+		Watch ret_hu_conv = new Watch(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public void set_chain_monitor(ChannelManagerReadArgs this_ptr, Watch val) {
-		bindings.ChannelManagerReadArgs_set_chain_monitor(this_ptr == null ? 0 : this_ptr.ptr & ~1, val == null ? 0 : val.ptr);
-		this.ptrs_to.add(this_ptr);
+	public void set_chain_monitor(Watch val) {
+		bindings.ChannelManagerReadArgs_set_chain_monitor(this.ptr, val == null ? 0 : val.ptr);
 		this.ptrs_to.add(val);
 	}
 
-	public BroadcasterInterface get_tx_broadcaster(ChannelManagerReadArgs this_ptr) {
-		BroadcasterInterface ret = new BroadcasterInterface(null, bindings.ChannelManagerReadArgs_get_tx_broadcaster(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-		ret.ptrs_to.add(this);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public BroadcasterInterface get_tx_broadcaster() {
+		long ret = bindings.ChannelManagerReadArgs_get_tx_broadcaster(this.ptr);
+		BroadcasterInterface ret_hu_conv = new BroadcasterInterface(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public void set_tx_broadcaster(ChannelManagerReadArgs this_ptr, BroadcasterInterface val) {
-		bindings.ChannelManagerReadArgs_set_tx_broadcaster(this_ptr == null ? 0 : this_ptr.ptr & ~1, val == null ? 0 : val.ptr);
-		this.ptrs_to.add(this_ptr);
+	public void set_tx_broadcaster(BroadcasterInterface val) {
+		bindings.ChannelManagerReadArgs_set_tx_broadcaster(this.ptr, val == null ? 0 : val.ptr);
 		this.ptrs_to.add(val);
 	}
 
-	public Logger get_logger(ChannelManagerReadArgs this_ptr) {
-		Logger ret = new Logger(null, bindings.ChannelManagerReadArgs_get_logger(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-		ret.ptrs_to.add(this);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public Logger get_logger() {
+		long ret = bindings.ChannelManagerReadArgs_get_logger(this.ptr);
+		Logger ret_hu_conv = new Logger(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public void set_logger(ChannelManagerReadArgs this_ptr, Logger val) {
-		bindings.ChannelManagerReadArgs_set_logger(this_ptr == null ? 0 : this_ptr.ptr & ~1, val == null ? 0 : val.ptr);
-		this.ptrs_to.add(this_ptr);
+	public void set_logger(Logger val) {
+		bindings.ChannelManagerReadArgs_set_logger(this.ptr, val == null ? 0 : val.ptr);
 		this.ptrs_to.add(val);
 	}
 
-	public UserConfig get_default_config(ChannelManagerReadArgs this_ptr) {
-		UserConfig ret = new UserConfig(null, bindings.ChannelManagerReadArgs_get_default_config(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public UserConfig get_default_config() {
+		long ret = bindings.ChannelManagerReadArgs_get_default_config(this.ptr);
+		UserConfig ret_hu_conv = new UserConfig(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public void set_default_config(ChannelManagerReadArgs this_ptr, UserConfig val) {
-		bindings.ChannelManagerReadArgs_set_default_config(this_ptr == null ? 0 : this_ptr.ptr & ~1, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public void set_default_config(UserConfig val) {
+		bindings.ChannelManagerReadArgs_set_default_config(this.ptr, val == null ? 0 : val.ptr & ~1);
 		this.ptrs_to.add(val);
 	}
 
-	// Skipped ChannelManagerReadArgs_new
+	public static ChannelManagerReadArgs constructor_new(KeysInterface keys_manager, FeeEstimator fee_estimator, Watch chain_monitor, BroadcasterInterface tx_broadcaster, Logger logger, UserConfig default_config, ChannelMonitor[] channel_monitors) {
+		long ret = bindings.ChannelManagerReadArgs_new(keys_manager == null ? 0 : keys_manager.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, chain_monitor == null ? 0 : chain_monitor.ptr, tx_broadcaster == null ? 0 : tx_broadcaster.ptr, logger == null ? 0 : logger.ptr, default_config == null ? 0 : default_config.ptr & ~1, Arrays.stream(channel_monitors).mapToLong(channel_monitors_conv_16 -> channel_monitors_conv_16 == null ? 0 : channel_monitors_conv_16.ptr & ~1).toArray());
+		ChannelManagerReadArgs ret_hu_conv = new ChannelManagerReadArgs(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(keys_manager);
+		ret_hu_conv.ptrs_to.add(fee_estimator);
+		ret_hu_conv.ptrs_to.add(chain_monitor);
+		ret_hu_conv.ptrs_to.add(tx_broadcaster);
+		ret_hu_conv.ptrs_to.add(logger);
+		ret_hu_conv.ptrs_to.add(default_config);
+		/* TODO 2 ChannelMonitor  */;
+		return ret_hu_conv;
+	}
+
 }