Rework for use with toolchain beta 2

Author: johnno1962

Package.swift

@@ -11,6 +11,6 @@ import PackageDescription
 let package = Package(
     name: "java_awt",
     dependencies: [
-        .Package(url: "https://github.com/SwiftJava/java_util.git", versions: Version(2,0,0)..<Version(3,0,0)),
+        .Package(url: "https://github.com/SwiftJava/java_util.git", versions: Version(2,1,0)..<Version(3,0,0)),
         ]
 )

Sources/AWTError.swift

@@ -24,39 +24,43 @@ open class AWTError: java_lang.JavaError {
 
     /// static final long java.lang.Error.serialVersionUID
 
-    /// private static final long java.lang.Throwable.serialVersionUID
-
-    /// private java.lang.String java.lang.Throwable.detailMessage
-
-    /// private static final java.lang.StackTraceElement[] java.lang.Throwable.UNASSIGNED_STACK
+    // Skipping field: true true false false false false 
 
-    /// private java.lang.Throwable java.lang.Throwable.cause
+    /// static final boolean java.lang.Throwable.$assertionsDisabled
 
-    /// private java.lang.StackTraceElement[] java.lang.Throwable.stackTrace
+    // Skipping field: true false false false false false 
 
-    /// private static final java.util.List java.lang.Throwable.SUPPRESSED_SENTINEL
+    /// private static final java.lang.String java.lang.Throwable.CAUSE_CAPTION
 
-    /// private java.util.List java.lang.Throwable.suppressedExceptions
+    /// private static final java.lang.Throwable[] java.lang.Throwable.EMPTY_THROWABLE_ARRAY
 
     /// private static final java.lang.String java.lang.Throwable.NULL_CAUSE_MESSAGE
 
     /// private static final java.lang.String java.lang.Throwable.SELF_SUPPRESSION_MESSAGE
 
-    /// private static final java.lang.String java.lang.Throwable.CAUSE_CAPTION
-
     /// private static final java.lang.String java.lang.Throwable.SUPPRESSED_CAPTION
 
-    /// private static final java.lang.Throwable[] java.lang.Throwable.EMPTY_THROWABLE_ARRAY
+    /// private static final java.util.List java.lang.Throwable.SUPPRESSED_SENTINEL
 
-    /// static final boolean java.lang.Throwable.$assertionsDisabled
+    /// private static final java.lang.StackTraceElement[] java.lang.Throwable.UNASSIGNED_STACK
+
+    /// private static final long java.lang.Throwable.serialVersionUID
+
+    /// private java.lang.Throwable java.lang.Throwable.cause
+
+    /// private java.lang.String java.lang.Throwable.detailMessage
+
+    /// private java.lang.StackTraceElement[] java.lang.Throwable.stackTrace
+
+    /// private java.util.List java.lang.Throwable.suppressedExceptions
 
     /// public java.awt.AWTError(java.lang.String)
 
     private static var new_MethodID_1: jmethodID?
 
     public convenience init( msg: String? ) {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
         var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
         __args[0] = JNIType.toJava( value: msg, locals: &__locals )
         let __object = JNIMethod.NewObject( className: "java/awt/AWTError", classCache: &AWTError.AWTErrorJNIClass, methodSig: "(Ljava/lang/String;)V", methodCache: &AWTError.new_MethodID_1, args: &__args, locals: &__locals )
         self.init( javaObject: __object )

Sources/AWTEvent.swift

@@ -24,8 +24,8 @@ open class AWTEventListenerForward: java_util.EventListenerForward, AWTEventList
     private static var eventDispatched_MethodID_2: jmethodID?
 
     open func eventDispatched( event: AWTEvent? ) {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
         var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
         __args[0] = JNIType.toJava( value: event, locals: &__locals )
         JNIMethod.CallVoidMethod( object: javaObject, methodName: "eventDispatched", methodSig: "(Ljava/awt/AWTEvent;)V", methodCache: &AWTEventListenerForward.eventDispatched_MethodID_2, args: &__args, locals: &__locals )
     }
@@ -36,13 +36,10 @@ open class AWTEventListenerForward: java_util.EventListenerForward, AWTEventList
 
 }
 
-
 private typealias AWTEventListener_eventDispatched_0_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> ()
 
 private func AWTEventListener_eventDispatched_0( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ event: jobject? ) -> () {
-    JNI.inNative = true;
     AWTEventListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).eventDispatched( event: event != nil ? AWTEvent( javaObject: event ) : nil )
-    JNI.inNative = false;
 }
 
 fileprivate class AWTEventListenerLocal_: JNILocalProxy<AWTEventListener, Any> {
@@ -89,8 +86,5 @@ open class AWTEventListenerBase: AWTEventListener {
     open func eventDispatched( event: AWTEvent? ) /**/ {
     }
 
-    open func eventDispatched( _ _event: AWTEvent? ) /**/ {
-        eventDispatched( event: _event )
-    }
 
 }

Sources/AWTEventListener.swift

@@ -26,9 +26,9 @@ open class AWTEventListenerProxy: java_util.EventListenerProxy, AWTEventListener
     private static var new_MethodID_1: jmethodID?
 
     public convenience init( eventMask: Int64, listener: AWTEventListener? ) {
-        var __args = [jvalue]( repeating: jvalue(), count: 2 )
         var __locals = [jobject]()
-        __args[0] = JNIType.toJava( value: eventMask, locals: &__locals )
+        var __args = [jvalue]( repeating: jvalue(), count: 2 )
+        __args[0] = jvalue( j: eventMask )
         __args[1] = JNIType.toJava( value: listener, locals: &__locals )
         let __object = JNIMethod.NewObject( className: "java/awt/event/AWTEventListenerProxy", classCache: &AWTEventListenerProxy.AWTEventListenerProxyJNIClass, methodSig: "(JLjava/awt/event/AWTEventListener;)V", methodCache: &AWTEventListenerProxy.new_MethodID_1, args: &__args, locals: &__locals )
         self.init( javaObject: __object )
@@ -39,32 +39,32 @@ open class AWTEventListenerProxy: java_util.EventListenerProxy, AWTEventListener
         self.init( eventMask: _eventMask, listener: _listener )
     }
 
-    /// public long java.awt.event.AWTEventListenerProxy.getEventMask()
-
-    private static var getEventMask_MethodID_2: jmethodID?
-
-    open func getEventMask() -> Int64 {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        let __return = JNIMethod.CallLongMethod( object: javaObject, methodName: "getEventMask", methodSig: "()J", methodCache: &AWTEventListenerProxy.getEventMask_MethodID_2, args: &__args, locals: &__locals )
-        return JNIType.toSwift( type: Int64(), from: __return )
-    }
-
-
     /// public void java.awt.event.AWTEventListenerProxy.eventDispatched(java.awt.AWTEvent)
 
-    private static var eventDispatched_MethodID_3: jmethodID?
+    private static var eventDispatched_MethodID_2: jmethodID?
 
     open func eventDispatched( event: AWTEvent? ) {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
         var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
         __args[0] = JNIType.toJava( value: event, locals: &__locals )
-        JNIMethod.CallVoidMethod( object: javaObject, methodName: "eventDispatched", methodSig: "(Ljava/awt/AWTEvent;)V", methodCache: &AWTEventListenerProxy.eventDispatched_MethodID_3, args: &__args, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "eventDispatched", methodSig: "(Ljava/awt/AWTEvent;)V", methodCache: &AWTEventListenerProxy.eventDispatched_MethodID_2, args: &__args, locals: &__locals )
     }
 
     open func eventDispatched( _ _event: AWTEvent? ) {
         eventDispatched( event: _event )
     }
 
+    /// public long java.awt.event.AWTEventListenerProxy.getEventMask()
+
+    private static var getEventMask_MethodID_3: jmethodID?
+
+    open func getEventMask() -> Int64 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallLongMethod( object: javaObject, methodName: "getEventMask", methodSig: "()J", methodCache: &AWTEventListenerProxy.getEventMask_MethodID_3, args: &__args, locals: &__locals )
+        return __return
+    }
+
+
 }