Provide human versions of trait interfaces, with a bunch of fixes to make it work

[ldk-java] / src / main / java / org / ldk / structs / ErrorAction.java

diff --git a/src/main/java/org/ldk/structs/ErrorAction.java b/src/main/java/org/ldk/structs/ErrorAction.java
index e5ccec8d4c8606978893365203868c49adfbadfb..efe34dd55c7401786611254727266e07f6265807 100644 (file)
--- a/src/main/java/org/ldk/structs/ErrorAction.java
+++ b/src/main/java/org/ldk/structs/ErrorAction.java
@@ -11,9 +11,8 @@ public class ErrorAction extends CommonBase {
        @Override @SuppressWarnings("deprecation")
        protected void finalize() throws Throwable {
                super.finalize();
-               bindings.ErrorAction_free(ptr);
+               if (ptr != 0) { bindings.ErrorAction_free(ptr); }
        }
-       long conv_to_c() { assert false; return 0; /* Should only be called on subclasses */ }
        static ErrorAction constr_from_ptr(long ptr) {
                bindings.LDKErrorAction raw_val = bindings.LDKErrorAction_ref_from_ptr(ptr);
                if (raw_val.getClass() == bindings.LDKErrorAction.DisconnectPeer.class) {
@@ -29,29 +28,26 @@ public class ErrorAction extends CommonBase {
        }
 
        public final static class DisconnectPeer extends ErrorAction {
-               public ErrorMessage msg;
+               public final ErrorMessage msg;
                private DisconnectPeer(long ptr, bindings.LDKErrorAction.DisconnectPeer obj) {
                        super(null, ptr);
                        long msg = obj.msg;
                        ErrorMessage msg_hu_conv = new ErrorMessage(null, msg);
                        this.msg = msg_hu_conv;
                }
-               @Override long conv_to_c() { return 0; /*XXX*/ }
        }
        public final static class IgnoreError extends ErrorAction {
                private IgnoreError(long ptr, bindings.LDKErrorAction.IgnoreError obj) {
                        super(null, ptr);
                }
-               @Override long conv_to_c() { return 0; /*XXX*/ }
        }
        public final static class SendErrorMessage extends ErrorAction {
-               public ErrorMessage msg;
+               public final ErrorMessage msg;
                private SendErrorMessage(long ptr, bindings.LDKErrorAction.SendErrorMessage obj) {
                        super(null, ptr);
                        long msg = obj.msg;
                        ErrorMessage msg_hu_conv = new ErrorMessage(null, msg);
                        this.msg = msg_hu_conv;
                }
-               @Override long conv_to_c() { return 0; /*XXX*/ }
        }
 }