Rework for use with toolchain beta 2

Author: johnno1962

Package.swift

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

Sources/AbstractCollection.swift

@@ -6,7 +6,7 @@ import java_lang
 
 /// class java.util.concurrent.locks.AbstractOwnableSynchronizer ///
 
-open class AbstractOwnableSynchronizer: java_swift.JavaObject, /* java.io.Serializable */ UnclassedProtocol {
+open class AbstractOwnableSynchronizer: java_swift.JavaObject, /* interface java.io.Serializable */ UnavailableProtocol {
 
     public convenience init?( casting object: java_swift.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
         self.init( javaObject: nil )
@@ -26,40 +26,40 @@ open class AbstractOwnableSynchronizer: java_swift.JavaObject, /* java.io.Serial
     private static var new_MethodID_1: jmethodID?
 
     public convenience init() {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
         var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
         let __object = JNIMethod.NewObject( className: "java/util/concurrent/locks/AbstractOwnableSynchronizer", classCache: &AbstractOwnableSynchronizer.AbstractOwnableSynchronizerJNIClass, methodSig: "()V", methodCache: &AbstractOwnableSynchronizer.new_MethodID_1, args: &__args, locals: &__locals )
         self.init( javaObject: __object )
         JNI.DeleteLocalRef( __object )
     }
 
-    /// protected final void java.util.concurrent.locks.AbstractOwnableSynchronizer.setExclusiveOwnerThread(java.lang.Thread)
+    /// protected final java.lang.Thread java.util.concurrent.locks.AbstractOwnableSynchronizer.getExclusiveOwnerThread()
 
-    private static var setExclusiveOwnerThread_MethodID_2: jmethodID?
+    private static var getExclusiveOwnerThread_MethodID_2: jmethodID?
 
-    open func setExclusiveOwnerThread( thread: java_lang.Thread? ) {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+    open func getExclusiveOwnerThread() -> java_lang.Thread! {
         var __locals = [jobject]()
-        __args[0] = JNIType.toJava( value: thread, locals: &__locals )
-        JNIMethod.CallVoidMethod( object: javaObject, methodName: "setExclusiveOwnerThread", methodSig: "(Ljava/lang/Thread;)V", methodCache: &AbstractOwnableSynchronizer.setExclusiveOwnerThread_MethodID_2, args: &__args, locals: &__locals )
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getExclusiveOwnerThread", methodSig: "()Ljava/lang/Thread;", methodCache: &AbstractOwnableSynchronizer.getExclusiveOwnerThread_MethodID_2, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? java_lang.Thread( javaObject: __return ) : nil
     }
 
-    open func setExclusiveOwnerThread( _ _thread: java_lang.Thread? ) {
-        setExclusiveOwnerThread( thread: _thread )
-    }
 
-    /// protected final java.lang.Thread java.util.concurrent.locks.AbstractOwnableSynchronizer.getExclusiveOwnerThread()
+    /// protected final void java.util.concurrent.locks.AbstractOwnableSynchronizer.setExclusiveOwnerThread(java.lang.Thread)
 
-    private static var getExclusiveOwnerThread_MethodID_3: jmethodID?
+    private static var setExclusiveOwnerThread_MethodID_3: jmethodID?
 
-    open func getExclusiveOwnerThread() -> java_lang.Thread! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+    open func setExclusiveOwnerThread( thread: java_lang.Thread? ) {
         var __locals = [jobject]()
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getExclusiveOwnerThread", methodSig: "()Ljava/lang/Thread;", methodCache: &AbstractOwnableSynchronizer.getExclusiveOwnerThread_MethodID_3, args: &__args, locals: &__locals )
-        defer { JNI.DeleteLocalRef( __return ) }
-        return __return != nil ? java_lang.Thread( javaObject: __return ) : nil
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: thread, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "setExclusiveOwnerThread", methodSig: "(Ljava/lang/Thread;)V", methodCache: &AbstractOwnableSynchronizer.setExclusiveOwnerThread_MethodID_3, args: &__args, locals: &__locals )
     }
 
+    open func setExclusiveOwnerThread( _ _thread: java_lang.Thread? ) {
+        setExclusiveOwnerThread( thread: _thread )
+    }
 
 }