X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FEventsProvider.ts;h=5cec1ec3959d7f0740d3493c25ad5a7728339172;hb=276893d3b8bd3fcb2bb10e3cab73a69d34831909;hp=02b0072be78d7d0b750f603afba77cd8eb523e70;hpb=822471992c6bf6f9985e531cc5940e4cc35e3e4c;p=ldk-java

diff --git a/ts/structs/EventsProvider.ts b/ts/structs/EventsProvider.ts
index 02b0072b..5cec1ec3 100644
--- a/ts/structs/EventsProvider.ts
+++ b/ts/structs/EventsProvider.ts
@@ -1,46 +1,68 @@
 
+            
 import CommonBase from './CommonBase';
 import * as bindings from '../bindings' // TODO: figure out location
 
-public class EventsProvider extends CommonBase {
-	final bindings.LDKEventsProvider bindings_instance;
-	EventsProvider(Object _dummy, long ptr) { super(ptr); bindings_instance = null; }
-	private EventsProvider(bindings.LDKEventsProvider arg) {
-		super(bindings.LDKEventsProvider_new(arg));
-		this.ptrs_to.add(arg);
-		this.bindings_instance = arg;
-	}
-	@Override @SuppressWarnings("deprecation")
-	protected void finalize() throws Throwable {
-		if (ptr != 0) { bindings.EventsProvider_free(ptr); } super.finalize();
-	}
 
-	public static interface EventsProviderInterface {
-		Event[] get_and_clear_pending_events();
-	}
-	private static class LDKEventsProviderHolder { EventsProvider held; }
-	public static EventsProvider new_impl(EventsProviderInterface arg) {
-		final LDKEventsProviderHolder impl_holder = new LDKEventsProviderHolder();
-		impl_holder.held = new EventsProvider(new bindings.LDKEventsProvider() {
-			@Override public uint32_t[] get_and_clear_pending_events() {
-				Event[] ret = arg.get_and_clear_pending_events();
-				uint32_t[] result = (uint32_t[])Arrays.stream(ret).map(arr_conv_7 -> arr_conv_7.ptr).toArray();
+
+            export class EventsProvider extends CommonBase {
+
+                bindings_instance?: bindings.LDKEventsProvider;
+
+                constructor(ptr?: number, arg?: bindings.LDKEventsProvider) {
+                    if (Number.isFinite(ptr)) {
+				        super(ptr);
+				        this.bindings_instance = null;
+				    } else {
+				        // TODO: private constructor instantiation
+				        super(bindings.LDKEventsProvider_new(arg));
+				        this.ptrs_to.push(arg);
+				        
+				    }
+                }
+
+                protected finalize() {
+                    if (this.ptr != 0) {
+                        bindings.EventsProvider_free(this.ptr);
+                    }
+                    super.finalize();
+                }
+
+                static new_impl(arg: EventsProviderInterface): EventsProvider {
+                    const impl_holder: LDKEventsProviderHolder = new LDKEventsProviderHolder();
+                    let structImplementation = <bindings.LDKEventsProvider>{
+                        // todo: in-line interface filling
+                        get_and_clear_pending_events (): number[] {
+							Event[] ret = arg.get_and_clear_pending_events();
+				result: number[] = Arrays.stream(ret).map(ret_conv_7 -> ret_conv_7.ptr).toArray(number[]::new);
 				/* TODO 2 Event  */;
 				return result;
-			}
-		});
-		return impl_holder.held;
-	}
+						},
+
+						
+                    };
+                    impl_holder.held = new EventsProvider (null, structImplementation);
+                }
+            }
+
+            export interface EventsProviderInterface {
+                get_and_clear_pending_events(): Event[];
+				
+            }
+
+            class LDKEventsProviderHolder {
+                held: EventsProvider;
+            }
 	public Event[] get_and_clear_pending_events() {
-		uint32_t[] ret = bindings.EventsProvider_get_and_clear_pending_events(this.ptr);
-		Event[] arr_conv_7_arr = new Event[ret.length];
+		number[] ret = bindings.EventsProvider_get_and_clear_pending_events(this.ptr);
+		Event[] ret_conv_7_arr = new Event[ret.length];
 		for (int h = 0; h < ret.length; h++) {
-			uint32_t arr_conv_7 = ret[h];
-			Event arr_conv_7_hu_conv = Event.constr_from_ptr(arr_conv_7);
-			arr_conv_7_hu_conv.ptrs_to.add(this);
-			arr_conv_7_arr[h] = arr_conv_7_hu_conv;
+			number ret_conv_7 = ret[h];
+			Event ret_conv_7_hu_conv = Event.constr_from_ptr(ret_conv_7);
+			ret_conv_7_hu_conv.ptrs_to.add(this);
+			ret_conv_7_arr[h] = ret_conv_7_hu_conv;
 		}
-		return arr_conv_7_arr;
+		return ret_conv_7_arr;
 	}
 
 }