diff --git a/.classpath b/.classpath
index fb50116..40e38df 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar" sourcepath="/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/src.zip"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
index d7bf9a9..5f59324 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *.class
 build/
-android*
 xcuserdata
 parameters/com
 parameters/org
@@ -8,3 +7,4 @@ parameters/java
 parameters/javax
 parameters/classes
 parameters/launcher
+/bin/
diff --git a/.gitmodules b/.gitmodules
index 2826992..3c18f58 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,3 +31,24 @@
 [submodule "com_apple"]
 	path = com_apple
 	url = https://github.com/SwiftJava/com_apple.git
+[submodule "swift-android-kotlin"]
+	path = swift-android-kotlin
+	url = https://github.com/SwiftJava/swift-android-kotlin
+[submodule "android_toolchain"]
+	path = android_toolchain
+	url = https://github.com/SwiftJava/android_toolchain
+[submodule "swift-android-injection"]
+	path = swift-android-injection
+	url = https://github.com/SwiftJava/swift-android-injection.git
+[submodule "Injection4Android"]
+	path = Injection4Android
+	url = https://github.com/SwiftJava/Injection4Android.git
+[submodule "swift-android-Clibadder"]
+	path = swift-android-Clibadder
+	url = https://github.com/SwiftJava/swift-android-Clibadder
+[submodule "swift-android-opengl"]
+	path = swift-android-opengl
+	url = https://github.com/SwiftJava/swift-android-opengl
+[submodule "swift-android-zlib"]
+	path = swift-android-zlib
+	url = https://github.com/SwiftJava/swift-android-zlib
diff --git a/CJavaVM b/CJavaVM
index 81db307..654df50 160000
--- a/CJavaVM
+++ b/CJavaVM
@@ -1 +1 @@
-Subproject commit 81db307ef23f62643807fb32a2ec712466750d63
+Subproject commit 654df50b44ba88e7382f6f5cc8eb2aa5179f544d
diff --git a/Injection4Android b/Injection4Android
new file mode 160000
index 0000000..1f8e8d3
--- /dev/null
+++ b/Injection4Android
@@ -0,0 +1 @@
+Subproject commit 1f8e8d3fe85dbf1ccc1e3ada8dd58197ed242d48
diff --git a/JDBC/AppDelegate.swift b/JDBC/AppDelegate.swift
index e1e2dd5..17d44f3 100644
--- a/JDBC/AppDelegate.swift
+++ b/JDBC/AppDelegate.swift
@@ -61,11 +61,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
             return
         }
 
-        // Use Thread class to run in background to get the correct class loaderwith& classpath
-        Thread( {
+        // Use Thread class to run in background to get the correct class loader & classpath
+        JavaThread( {
 
             do {
-                if try Class.forName( self.driverClass.stringValue ) == nil {
+                if try JavaClass.forName( self.driverClass.stringValue ) == nil {
                     return self.alert( "Could not load driver class" );
                 }
 
@@ -77,7 +77,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
                     else { return self.alert( "Unable to connect using information supplied, consult console" ) }
 
                 let statement = try connection.createStatement()!
-                if !(try statement.execute( self.SQL.stringValue )) {
+                if !(try statement.execute( sql: self.SQL.stringValue )) {
                     return self.alert( "Could not execute SQL: \(self.SQL.stringValue)" );
                 }
 
@@ -88,13 +88,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
                     if let result = try statement.getResultSet(), let md = try result.getMetaData() {
                         let ncols = try md.getColumnCount()
                         for i in 1...ncols {
-                            model.columnNames.append( try md.getColumnName(i) ?? "Column \(i)" )
+                            model.columnNames.append( try md.getColumnName(column: i) ?? "Column \(i)" )
                         }
 
                         while try result.next() {
                             var row = [String]()
                             for i in 1...ncols {
-                                row.append( try result.getString( i ) ?? "null" )
+                                row.append( try result.getString( columnIndex: i ) ?? "null" )
                             }
                             model.data.append( row )
                         }
@@ -114,7 +114,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
 
                     for i in 0..<model.columnNames.count {
                         let columnName = model.columnNames[i]
-                        let column = NSTableColumn(identifier: columnName)
+                        let column = NSTableColumn(identifier: NSUserInterfaceItemIdentifier(rawValue: columnName))
                         column.title = columnName
                         model.indexByColumn[column] = i
                         self.tableView.addTableColumn(column)
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..0c9dc3e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+Copyright (c) 2016, John Holdsworth
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+This License does not apply to the code generated from the macOS distribution of the Java VM
+which are provided under the provisions of "Fair Use" and your use is ultimately subject
+to the original License Agreement.
diff --git a/README.md b/README.md
index 6c715e2..47e8895 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,20 @@
 
 ## SwiftJava - bridging Swift to a JavaVM
 
-I know what you've been thinking.. what I really need is a way to bridge Swift
-to Java but there are a number of use cases:
+I know you've been thinking.. "What I really need is a way to bridge Swift to Java"
+but there are a number of use cases:
 
 1. Making Java technologies such as JDBC available to macOS applications.
 
-2. Giving Swift applications on Linux a portable user interface.
+2. Giving Swift applications on Linux a portable user interface using Swing.
 
-3. Making business logic in Swift available to Android apps.
+3. Making business logic in written in Swift available to Android apps.
  
 ![](http://johnholdsworth.com/Linux.png) ![](http://johnholdsworth.com/Android.png)
 
 SwiftJava is a Swift code generator along with a small framework of supporting code written in 
-the Xcode beta6 vintage of Swift 3.0. The starting point was Boris Bügling's talk on
-[Cross Platform Swift](https://realm.io/news/altconf-boris-bugling-cross-platform-swift/).
+the Xcode beta6 vintage of Swift 3.0. The starting point was Boris Bügling's
+[Cross Platform Swift](https://realm.io/news/altconf-boris-bugling-cross-platform-swift/) talk.
 The code generator takes a java class, interface or package and generates Swift classes
 that interface to corresponding Java methods using the Java Native Interface "JNI".
 These generated methods on the corresponding Swift class look something like this:
@@ -34,7 +34,7 @@ These generated methods on the corresponding Swift class look something like thi
 On macOS, this has been used to generate frameworks bridging the java.lang, java.util,
 java.sql, java.awt and javax.swing packages along with the Apple specific additions
 in the com.apple package. This makes the Java apis available with auto-completion in
-the Xcode source editor. The final application can be a ".app" or command line utility
+the Xcode source editor. The final application can be a ".app" or a command line utility
 which should be portable to Linux using the Swift Package manager. For Android, the code
 generator can generate JNI code for a pair of interfaces from Java to Swift and from
 Swift to Java saving the developer the chore of a lot of error prone manual stubbing.
@@ -45,19 +45,26 @@ To use, clone this project using the following command:
     git clone https://github.com/SwiftJava/SwiftJava.git --recurse-submodules
 ```
 
-This project contains the pre-generated java frameworks and an example macOS app using 
+This project contains the pre-generated java frameworks, an example macOS app using 
 JDBC and a command line project with assorted AWT and Swing source. Development inside
 Xcode uses the legacy "JavaVM" framework which requires Apple's JVM downloadable from:
 
 [https://support.apple.com/kb/dl1572?locale=en_US](https://support.apple.com/kb/dl1572?locale=en_US)
 
+Development inside Xcode with the Oracle JVM is a little more complicated. It seems
+that JNI_CreateJavaVM generates a SIGSEGV internally as part of normal operation
+which is trapped using a signal handler so it can proceed on the command line.
+Unfortunately, this is caught by Xcode debugger lldb and it suspends and will not
+continue until you enter `pr h -s false SIGSEGV` into the debug console each time
+you run the program. The alternative is to not use the debugger at all in your scheme.
+
 Perversely, with AWT and Swing on macOS the JVM needs to be created on the main thread
 while setup code needs to be off the main thread to leave it available for AWT's own
 runloop. Use the JNI.background and JNI.run methods to achieve this in a portable manner.
 
 When using the Swift package manager to build code from the command line, install the
 latest Oracle JDK and locate the directory containing the file libjvm.so or .dylib in
-the jre. Use this directory to build using the following commands:
+the jre. Use the examples. directory to build using the following commands:
 
 ```Shell
     git clone https://github.com/SwiftJava/examples.git
@@ -71,36 +78,28 @@ the jre. Use this directory to build using the following commands:
     swift build -Xlinker -L$JVM_LIBRARY_PATH -Xlinker -rpath -Xlinker $JVM_LIBRARY_PATH -Xlinker -ljvm
 ```
 
-Builds on Linux need to be made with the latest preview 6. The swing source in
+The swing source in
 "examples/Sources" shows how to receive events and subclass a Java class to have certain
 methods such as java.awt.Canvas.paint() be implemented in Swift. More on this later.
 
-### Android
+### Android Development
 
 For Android, consult the modified versions of the swift-android-samples and the associated
-gradle build system plugin swift-android-gradle from the [original Android port](https://github.com/SwiftAndroid).
-This requires a Ubuntu 15 system or VM, a Lollipop (api 21) or better device and a Swift-3.0
-toolchain built with Android support. Instructions for this process are available in the
+gradle build system plugin from the [Android Toochain](https://github.com/SwiftJava/android_toolchain).
+This run on macOS or Ubuntu 16.04, and requires a Lollipop (api 21) or better device.
+More detaills and context are available in the
 [Swift README for Android](https://github.com/apple/swift/blob/master/docs/Android.md)
 and [this comprehensive tutorial](https://medium.com/@ephemer/how-we-put-an-app-in-the-android-play-store-using-swift-67bd99573e3c)
 but hopefully the scripts in the modified gradle plugin take most of the pain out of it.
 
-Once you have a toolchain you should be able to type the following commands:
-
-```Shell
-    cd swift-android-gradle
-    ./gradlew install
-```
-
-This install of gradle plugin will tell you which environment variables need to be set up.
-Now, connect the Android phone and type:
+Once you have a toolchain and run its setup.sh script you should be able to type the following commands:
 
 ```Shell
-    cd ../swift-android-samples/swifthello
+    cd swift-android-samples/swifthello
     ./gradlew installDebug
 ```
 
-For a new application define two Java interfaces, one for messaging from Java to Swift
+For a new application, define two Java interfaces, one for messaging from Java to Swift
 with it's name ending in "Listener" and one for messaging back into Java from Swift.
 You then use ./genswift.sh from this project to generate the Swift binding code:
 
@@ -108,7 +107,7 @@ You then use ./genswift.sh from this project to generate the Swift binding code:
     ./genswift.sh your.package your.jar
 ```
 
-This generates Swift classes and a third Java source src/org/genie/your_package/<YourApp>Proxy.java
+This generates Swift classes and a third Java source src/org/swiftjava/your_package/YourAppProxy.java
 that also needs to be included in your project. Consult the script genhello.sh and project
 "swift-android-samples/swifthello" for details. The source "swift-android-samples/swifthello/src/main/swift/Sources/main.swift"
 shows how to set this up with a native method called from the main activity.
@@ -144,12 +143,12 @@ shows how to set this up with a native method called from the main activity.
 ### Forward, Runnable, Listener, Adapter, subclass responsibility and Base classes.
 
 For every Java interface the code generator generates a Swift Protocol along
-with a <Protocol>Forward class in instance of which conforms to the protocol and
+with a ProtocolForward class an instance of which conforms to the protocol and
 can be used to message Java instances conforming to the interface/protocol.
 
 For the Runnable interface used in threading the converse needs to be possible
 where Java code can call through to Swift code. This is performed using a Java
-proxy class which has a pointer to the associated Swift object and a "native"e
+proxy class which has a pointer to the associated Swift object and a "native"
 implementation of the "run()" method that calls through to Swift. On the Swift
 side this is surfaced as the "RunnableBase" class which can be subclassed to
 provide a Swift implementation of the "run()" method callable from Java.
@@ -157,7 +156,7 @@ provide a Swift implementation of the "run()" method callable from Java.
 This approach is also taken for processing events and all interfaces with names
 ending in "Listener", "Manager" or "Handler" also have "Base" classes generated
 for subclassing along with Java Proxy classes. On macOS and Linux these classes
-are compiled into a jar file ~/genie.jar using the genjar.sh script for this to work.
+are compiled into a jar file ~/swiftjava.jar using the genjar.sh script for this to work.
 
 ```Swift
     class MyActionListener: ActionListenerBase {
@@ -169,6 +168,11 @@ are compiled into a jar file ~/genie.jar using the genjar.sh script for this to
     quitButton.addActionListener(MyActionListener());
 ```
 
+Any interface/protocol from a Java interface can be added to a class to enable it to
+be passed to Java provide it's name ends in `Listener`. The implementation is a little
+complex but does not have an appreciable overhead. structs can also be made accesable
+to Java in this way but the object will no be live i.e. a coy of the struct will be taken.
+
 Some event processing is also done by subclassing concrete classes that have names
 ending in "Adapter". Slightly modified Swift "Base" classes and Java Proxies are also
 generated for this. Other classes have methods that are intended to be responsibility
@@ -176,21 +180,26 @@ of the subclasses such as java.awt.Canvas.paint(). A list of these methods needs
 maintained in the code generator unfortunately. If one of these methods encountered
 a Base class and Proxy is generated for the concrete class that can be subclassed.
 
-As these "Base" subclasses cant close over variable in your program you may want to
+As these "Base" subclasses can't close over variables in your program you may want to
 have an initialiser to capture these instead. There is a bit of a standard dance
-that needs to be performed. First instantiate the "Base" superclass and pass this 
-to the designated initialiser of your superclass. Due to the use of generics you'll
-also be prompted to provide a null implementation of the required initialiser.
+that needs to be performed. Instantiate the "Base" superclass and assign it's
+javaObject to your classes' javaObject. Due to the use of generics you'll
+also be prompted to provide a null implementation of the "required" initialiser.
 
 ```Swift
+class MyCanvas: CanvasBase {
+
     init(imageProducer:ImageProducer) {
-        super.init( javaObject: CanvasBase().javaObject )
+        super.init(javaObject: nil)
+        inherit(CanvasBase())
         image = createImage(imageProducer)
     }
 
     required init(javaObject: jobject?) {
         fatalError("init(javaObject:) has not been implemented")
     }
+
+    ...
 ```
 
 Consult the Swing examples code for further details.
@@ -214,9 +223,6 @@ PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
 FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-This License does not apply to any generated code in the java* submodules which
-are provided under the provisions of "Fair Use" but your use is ultimately subject
-to the Oracle Binary Code License Agreement available here:
-
-[http://www.oracle.com/technetwork/java/javase/terms/license/index.html](http://www.oracle.com/technetwork/java/javase/terms/license/index.html)
-
+This License does not apply to the code generated from the Apple distribution of the Java VM
+which are provided under the provisions of "Fair Use" and your use is ultimately subject
+to the original License Agreement.
diff --git a/SwiftJava.xcodeproj/project.pbxproj b/SwiftJava.xcodeproj/project.pbxproj
index ce9f3b6..d9e47e6 100644
--- a/SwiftJava.xcodeproj/project.pbxproj
+++ b/SwiftJava.xcodeproj/project.pbxproj
@@ -7,15 +7,18 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		BB19B4421D673986002F5586 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = BB19B4411D673986002F5586 /* README.md */; };
 		BB31E20F1D4FF13400779860 /* genpkg.sh in Resources */ = {isa = PBXBuildFile; fileRef = BB31E20E1D4FF13400779860 /* genpkg.sh */; };
+		BB408A1420BF101A00B57CFB /* swift-android-zlib in Resources */ = {isa = PBXBuildFile; fileRef = BB408A1220BF101900B57CFB /* swift-android-zlib */; };
+		BB408A1620BF102A00B57CFB /* swift-android-opengl in Resources */ = {isa = PBXBuildFile; fileRef = BB408A1520BF102900B57CFB /* swift-android-opengl */; };
 		BB4AF49E1D4C1F80001DCA63 /* java_sql.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBBF2E8E1D49A0C3004142AE /* java_sql.framework */; };
-		BB4AF4A61D4C2CE2001DCA63 /* java_lang.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBC13EBC1D4997FB0035A039 /* java_lang.framework */; };
 		BB5ACFDF1D35B09900E2386A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5ACFDE1D35B09900E2386A /* AppDelegate.swift */; };
 		BB5ACFE11D35B09900E2386A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BB5ACFE01D35B09900E2386A /* Assets.xcassets */; };
 		BB5ACFE41D35B09900E2386A /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB5ACFE21D35B09900E2386A /* MainMenu.xib */; };
+		BB63C9E51F7970F00048D83B /* Fortify.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB63C9E41F7970EE0048D83B /* Fortify.swift */; };
+		BB643B321F4873F7003E849E /* swift-android-gradle in Resources */ = {isa = PBXBuildFile; fileRef = BB643B311F4873F7003E849E /* swift-android-gradle */; };
+		BB6651321F2E39F7004EFD5F /* swift-android-kotlin in Resources */ = {isa = PBXBuildFile; fileRef = BB6651301F2E39F6004EFD5F /* swift-android-kotlin */; };
+		BB6651361F2E3F51004EFD5F /* android_toolchain in Resources */ = {isa = PBXBuildFile; fileRef = BB6651351F2E3F50004EFD5F /* android_toolchain */; };
 		BB9CF8931D619D1C004781B9 /* genhello.sh in Resources */ = {isa = PBXBuildFile; fileRef = BB9CF8921D619D1C004781B9 /* genhello.sh */; };
-		BB9CF8961D61BAE8004781B9 /* swift-android-gradle in Resources */ = {isa = PBXBuildFile; fileRef = BB9CF8951D61BAE8004781B9 /* swift-android-gradle */; };
 		BB9CF8981D61BAF4004781B9 /* swift-android-samples in Resources */ = {isa = PBXBuildFile; fileRef = BB9CF8971D61BAF4004781B9 /* swift-android-samples */; };
 		BBAD3EDA1D59DDBC0091D139 /* TableColorSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBAD3ED91D59DDBC0091D139 /* TableColorSelection.swift */; };
 		BBAD3EE41D5A84700091D139 /* genall.sh in Resources */ = {isa = PBXBuildFile; fileRef = BBAD3EE31D5A84700091D139 /* genall.sh */; };
@@ -32,9 +35,22 @@
 		BBBF3A671D4B1B95004142AE /* PopupTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBF3A661D4B1B95004142AE /* PopupTest.swift */; };
 		BBBF3A691D4BCE36004142AE /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBF3A681D4BCE36004142AE /* main.swift */; };
 		BBBF3A731D4BF8CF004142AE /* AWTGraphicsDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBF3A721D4BF8CF004142AE /* AWTGraphicsDemo.swift */; };
-		BBC13DB91D48FDCE0035A039 /* org_genie.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC13DB81D48FDCE0035A039 /* org_genie.swift */; };
+		BBC13DB91D48FDCE0035A039 /* org_swiftjava.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC13DB81D48FDCE0035A039 /* org_swiftjava.swift */; };
 		BBC13DC21D4900AA0035A039 /* SwiftTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC13DC11D4900AA0035A039 /* SwiftTest.swift */; };
+		BBCCEF9A1F3C83440084F9E3 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = BBCCEF991F3C83440084F9E3 /* LICENSE */; };
+		BBE0F86F20B733FE00332AC6 /* swift-android-Clibadder in Resources */ = {isa = PBXBuildFile; fileRef = BBE0F86E20B733FC00332AC6 /* swift-android-Clibadder */; };
 		BBF280D91D64BC6100A7AF5D /* src in Resources */ = {isa = PBXBuildFile; fileRef = BBF280D81D64BC6100A7AF5D /* src */; };
+		CE3185101F368D6B002046A6 /* SwiftHelloTypes_TextListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE31850E1F368D44002046A6 /* SwiftHelloTypes_TextListener.swift */; };
+		CE4A250B1F34B3E0003AF384 /* JavaVM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBCD66ED1D36A03F00DF5E47 /* JavaVM.framework */; };
+		CE4A25101F3555CA003AF384 /* com_johnholdsworth in Resources */ = {isa = PBXBuildFile; fileRef = CE4A250F1F3555CA003AF384 /* com_johnholdsworth */; };
+		CE4A25191F355910003AF384 /* SwiftHelloTest_SwiftTestListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A25151F355902003AF384 /* SwiftHelloTest_SwiftTestListener.swift */; };
+		CE4A251A1F355914003AF384 /* SwiftHelloTest_TestResponderAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A25141F355902003AF384 /* SwiftHelloTest_TestResponderAdapter.swift */; };
+		CE4A251B1F355918003AF384 /* SwiftHelloTestImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A25131F355902003AF384 /* SwiftHelloTestImpl.swift */; };
+		CE4A25211F355CAC003AF384 /* SwiftHelloTest_TestListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4A251F1F355CA6003AF384 /* SwiftHelloTest_TestListener.swift */; };
+		CE4A25241F3563AB003AF384 /* JavaVM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBCD66ED1D36A03F00DF5E47 /* JavaVM.framework */; };
+		CE6BB1D81F33E59900CA6A8F /* java_swift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBC13E821D4996AE0035A039 /* java_swift.framework */; };
+		CE6BB1D91F33E5AD00CA6A8F /* CJavaVM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBC13E601D49954A0035A039 /* CJavaVM.framework */; };
+		CE81023A1F3693510069563B /* MainActivity.kt in Resources */ = {isa = PBXBuildFile; fileRef = CE8102391F3693510069563B /* MainActivity.kt */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -205,20 +221,26 @@
 /* Begin PBXFileReference section */
 		BB0543FE1D41F38C00F9B367 /* libjvm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjvm.dylib; path = "../../../../usr/local/jvm/openjdk-1.8.0-internal/jre/lib/server/libjvm.dylib"; sourceTree = "<group>"; };
 		BB0544041D42D55200F9B367 /* genjar.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = genjar.sh; sourceTree = "<group>"; };
+		BB0AB6B31F7559C700B60EC0 /* Injection4Android */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Injection4Android; sourceTree = "<group>"; };
+		BB0AB6B71F755A5A00B60EC0 /* swift-android-injection */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-injection"; sourceTree = "<group>"; };
 		BB19B4411D673986002F5586 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		BB31E20E1D4FF13400779860 /* genpkg.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = genpkg.sh; sourceTree = "<group>"; };
+		BB408A1220BF101900B57CFB /* swift-android-zlib */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-zlib"; sourceTree = "<group>"; };
+		BB408A1520BF102900B57CFB /* swift-android-opengl */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-opengl"; sourceTree = "<group>"; };
 		BB5ACFDB1D35B09900E2386A /* JDBC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JDBC.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		BB5ACFDE1D35B09900E2386A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		BB5ACFE01D35B09900E2386A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		BB5ACFE31D35B09900E2386A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		BB5ACFE51D35B09900E2386A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		BB8A70511D5AF7AC00840B9E /* build_macos.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build_macos.sh; sourceTree = "<group>"; };
-		BB8A70531D5B164300840B9E /* build_linux.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build_linux.sh; sourceTree = "<group>"; };
+		BB63C9E41F7970EE0048D83B /* Fortify.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fortify.swift; sourceTree = "<group>"; };
+		BB643B311F4873F7003E849E /* swift-android-gradle */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-gradle"; sourceTree = "<group>"; };
+		BB6651301F2E39F6004EFD5F /* swift-android-kotlin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-kotlin"; sourceTree = "<group>"; };
+		BB6651351F2E3F50004EFD5F /* android_toolchain */ = {isa = PBXFileReference; lastKnownFileType = folder; path = android_toolchain; sourceTree = "<group>"; };
+		BB88CEC721CC388400B79BD9 /* swifthello.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = swifthello.swift; path = "swift-android-samples/swifthello/src/main/swift/Sources/swifthello.swift"; sourceTree = "<group>"; };
 		BB8AC4391D3F035700BD5B0F /* libswiftCore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftCore.tbd; path = System/Library/PrivateFrameworks/Swift/libswiftCore.tbd; sourceTree = SDKROOT; };
 		BB8AC4621D3F11E600BD5B0F /* examples */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = examples; sourceTree = BUILT_PRODUCTS_DIR; };
 		BB8AC46E1D3F217D00BD5B0F /* libjvm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjvm.dylib; path = ../../../../Library/Java/JavaVirtualMachines/jdk1.8.0_91.jdk/Contents/Home/jre/lib/server/libjvm.dylib; sourceTree = "<group>"; };
 		BB9CF8921D619D1C004781B9 /* genhello.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = genhello.sh; sourceTree = "<group>"; };
-		BB9CF8951D61BAE8004781B9 /* swift-android-gradle */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-gradle"; sourceTree = "<group>"; };
 		BB9CF8971D61BAF4004781B9 /* swift-android-samples */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-samples"; sourceTree = "<group>"; };
 		BBAD3ED91D59DDBC0091D139 /* TableColorSelection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TableColorSelection.swift; path = Sources/TableColorSelection.swift; sourceTree = "<group>"; };
 		BBAD3EE31D5A84700091D139 /* genall.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = genall.sh; sourceTree = "<group>"; };
@@ -226,7 +248,6 @@
 		BBBF2F031D49A163004142AE /* java_awt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = java_awt.xcodeproj; path = java_awt/java_awt.xcodeproj; sourceTree = "<group>"; };
 		BBBF322A1D49A246004142AE /* javax_swing.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = javax_swing.xcodeproj; path = javax_swing/javax_swing.xcodeproj; sourceTree = "<group>"; };
 		BBBF389C1D49B5E6004142AE /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
-		BBBF38B31D49C14C004142AE /* genie.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = genie.jar; sourceTree = "<group>"; };
 		BBBF38DB1D49DB05004142AE /* com_apple.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = com_apple.xcodeproj; path = com_apple/com_apple.xcodeproj; sourceTree = "<group>"; };
 		BBBF3A471D4A8A17004142AE /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
 		BBBF3A521D4A8A68004142AE /* PhilosophersJList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PhilosophersJList.swift; path = Sources/PhilosophersJList.swift; sourceTree = "<group>"; };
@@ -241,23 +262,36 @@
 		BBBF3A661D4B1B95004142AE /* PopupTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PopupTest.swift; path = Sources/PopupTest.swift; sourceTree = "<group>"; };
 		BBBF3A681D4BCE36004142AE /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = main.swift; path = Sources/main.swift; sourceTree = "<group>"; };
 		BBBF3A721D4BF8CF004142AE /* AWTGraphicsDemo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AWTGraphicsDemo.swift; path = Sources/AWTGraphicsDemo.swift; sourceTree = "<group>"; };
-		BBC13DB61D48FDCE0035A039 /* org_genie_tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = org_genie_tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		BBC13DB81D48FDCE0035A039 /* org_genie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = org_genie.swift; sourceTree = "<group>"; };
+		BBC13DB61D48FDCE0035A039 /* org_swiftjava_tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = org_swiftjava_tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		BBC13DB81D48FDCE0035A039 /* org_swiftjava.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = org_swiftjava.swift; sourceTree = "<group>"; };
 		BBC13DBA1D48FDCE0035A039 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		BBC13DC11D4900AA0035A039 /* SwiftTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SwiftTest.swift; path = Sources/SwiftTest.swift; sourceTree = "<group>"; };
 		BBC13DC51D490B160035A039 /* test_body.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = test_body.swift; sourceTree = "<group>"; };
 		BBC13DC71D49149A0035A039 /* gentests.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = gentests.rb; sourceTree = "<group>"; };
-		BBC13DC91D4918A30035A039 /* SwiftTest.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = SwiftTest.java; path = src/org/genie/SwiftTest.java; sourceTree = SOURCE_ROOT; };
 		BBC13E5B1D49954A0035A039 /* CJavaVM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CJavaVM.xcodeproj; path = CJavaVM/CJavaVM.xcodeproj; sourceTree = "<group>"; };
 		BBC13E7D1D4996AE0035A039 /* java_swift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = java_swift.xcodeproj; path = java_swift/java_swift.xcodeproj; sourceTree = "<group>"; };
 		BBC13EB71D4997FA0035A039 /* java_lang.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = java_lang.xcodeproj; path = java_lang/java_lang.xcodeproj; sourceTree = "<group>"; };
 		BBC140651D4999580035A039 /* java_util.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = java_util.xcodeproj; path = java_util/java_util.xcodeproj; sourceTree = "<group>"; };
+		BBCCEF991F3C83440084F9E3 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		BBCD66ED1D36A03F00DF5E47 /* JavaVM.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaVM.framework; path = System/Library/Frameworks/JavaVM.framework; sourceTree = SDKROOT; };
-		BBCD66F91D36FACD00DF5E47 /* getsigs.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = getsigs.pl; sourceTree = "<group>"; };
 		BBCD6EBC1D383E3700DF5E47 /* genswift.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = genswift.java; path = src/genswift.java; sourceTree = "<group>"; };
 		BBCD75371D38DC4200DF5E47 /* overrides.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = overrides.pl; sourceTree = "<group>"; };
 		BBCD9F871D3CD05900DF5E47 /* genswift.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = genswift.sh; sourceTree = "<group>"; };
+		BBE0F86E20B733FC00332AC6 /* swift-android-Clibadder */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-Clibadder"; sourceTree = "<group>"; };
 		BBF280D81D64BC6100A7AF5D /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; path = src; sourceTree = "<group>"; };
+		CE31850E1F368D44002046A6 /* SwiftHelloTypes_TextListener.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftHelloTypes_TextListener.swift; path = com_johnholdsworth/Sources/SwiftHelloTypes_TextListener.swift; sourceTree = SOURCE_ROOT; };
+		CE4A250F1F3555CA003AF384 /* com_johnholdsworth */ = {isa = PBXFileReference; lastKnownFileType = folder; path = com_johnholdsworth; sourceTree = "<group>"; };
+		CE4A25131F355902003AF384 /* SwiftHelloTestImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftHelloTestImpl.swift; path = com_johnholdsworth/Sources/SwiftHelloTestImpl.swift; sourceTree = SOURCE_ROOT; };
+		CE4A25141F355902003AF384 /* SwiftHelloTest_TestResponderAdapter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftHelloTest_TestResponderAdapter.swift; path = com_johnholdsworth/Sources/SwiftHelloTest_TestResponderAdapter.swift; sourceTree = SOURCE_ROOT; };
+		CE4A25151F355902003AF384 /* SwiftHelloTest_SwiftTestListener.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftHelloTest_SwiftTestListener.swift; path = com_johnholdsworth/Sources/SwiftHelloTest_SwiftTestListener.swift; sourceTree = SOURCE_ROOT; };
+		CE4A251C1F355B0A003AF384 /* SwiftTest.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = SwiftTest.java; path = src/org/swiftjava/SwiftTest.java; sourceTree = SOURCE_ROOT; };
+		CE4A251F1F355CA6003AF384 /* SwiftHelloTest_TestListener.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftHelloTest_TestListener.swift; path = com_johnholdsworth/Sources/SwiftHelloTest_TestListener.swift; sourceTree = SOURCE_ROOT; };
+		CE649E2D1F39E88200C5B7FE /* SwiftHelloTypes.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = SwiftHelloTypes.java; path = src/com/johnholdsworth/swiftbindings/SwiftHelloTypes.java; sourceTree = "<group>"; };
+		CE649E2F1F39E88200C5B7FE /* SwiftHelloBinding.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = SwiftHelloBinding.java; path = src/com/johnholdsworth/swiftbindings/SwiftHelloBinding.java; sourceTree = "<group>"; };
+		CE649E301F39E88200C5B7FE /* SwiftHelloTest.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = SwiftHelloTest.java; path = src/com/johnholdsworth/swiftbindings/SwiftHelloTest.java; sourceTree = "<group>"; };
+		CE75236D1F33E9A3003795CA /* libjvm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjvm.dylib; path = ../../../Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/jre/lib/server/libjvm.dylib; sourceTree = "<group>"; };
+		CE8102391F3693510069563B /* MainActivity.kt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = MainActivity.kt; path = "swift-android-kotlin/app/src/main/java/com/example/user/myapplication/MainActivity.kt"; sourceTree = "<group>"; };
+		CE81023D1F369D8D0069563B /* SwiftHello.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = SwiftHello.java; path = "swift-android-samples/swifthello/src/main/java/net/zhuoweizhang/swifthello/SwiftHello.java"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -265,6 +299,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CE4A25241F3563AB003AF384 /* JavaVM.framework in Frameworks */,
 				BB4AF49E1D4C1F80001DCA63 /* java_sql.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -281,7 +316,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BB4AF4A61D4C2CE2001DCA63 /* java_lang.framework in Frameworks */,
+				CE4A250B1F34B3E0003AF384 /* JavaVM.framework in Frameworks */,
+				CE6BB1D91F33E5AD00CA6A8F /* CJavaVM.framework in Frameworks */,
+				CE6BB1D81F33E59900CA6A8F /* java_swift.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -291,7 +328,14 @@
 		BB5ACFD21D35B09900E2386A = {
 			isa = PBXGroup;
 			children = (
+				BBCCEF991F3C83440084F9E3 /* LICENSE */,
 				BBBF389C1D49B5E6004142AE /* README.md */,
+				CE31850D1F368C77002046A6 /* Scripts */,
+				CE3185051F368C37002046A6 /* Bindings */,
+				CE8102371F3693260069563B /* Android */,
+				BB5ACFDD1D35B09900E2386A /* JDBC */,
+				BB8AC4631D3F11E600BD5B0F /* examples */,
+				BBC13DB71D48FDCE0035A039 /* org_swiftjava */,
 				BBC13E5B1D49954A0035A039 /* CJavaVM.xcodeproj */,
 				BBC13E7D1D4996AE0035A039 /* java_swift.xcodeproj */,
 				BBC13EB71D4997FA0035A039 /* java_lang.xcodeproj */,
@@ -300,22 +344,17 @@
 				BBBF2F031D49A163004142AE /* java_awt.xcodeproj */,
 				BBBF322A1D49A246004142AE /* javax_swing.xcodeproj */,
 				BBBF38DB1D49DB05004142AE /* com_apple.xcodeproj */,
-				BBCD9F871D3CD05900DF5E47 /* genswift.sh */,
-				BBCD6EBC1D383E3700DF5E47 /* genswift.java */,
-				BBCD75371D38DC4200DF5E47 /* overrides.pl */,
-				BBC13DC71D49149A0035A039 /* gentests.rb */,
-				BB9CF8921D619D1C004781B9 /* genhello.sh */,
-				BB31E20E1D4FF13400779860 /* genpkg.sh */,
-				BBCD66F91D36FACD00DF5E47 /* getsigs.pl */,
-				BBAD3EE31D5A84700091D139 /* genall.sh */,
-				BB0544041D42D55200F9B367 /* genjar.sh */,
-				BBBF38B31D49C14C004142AE /* genie.jar */,
-				BB5ACFDD1D35B09900E2386A /* JDBC */,
-				BB8AC4631D3F11E600BD5B0F /* examples */,
-				BBC13DB71D48FDCE0035A039 /* org_genie */,
 				BBF280D81D64BC6100A7AF5D /* src */,
-				BB9CF8951D61BAE8004781B9 /* swift-android-gradle */,
+				CE4A250F1F3555CA003AF384 /* com_johnholdsworth */,
+				BB6651351F2E3F50004EFD5F /* android_toolchain */,
+				BB643B311F4873F7003E849E /* swift-android-gradle */,
 				BB9CF8971D61BAF4004781B9 /* swift-android-samples */,
+				BB6651301F2E39F6004EFD5F /* swift-android-kotlin */,
+				BB0AB6B71F755A5A00B60EC0 /* swift-android-injection */,
+				BBE0F86E20B733FC00332AC6 /* swift-android-Clibadder */,
+				BB408A1520BF102900B57CFB /* swift-android-opengl */,
+				BB408A1220BF101900B57CFB /* swift-android-zlib */,
+				BB0AB6B31F7559C700B60EC0 /* Injection4Android */,
 				BB5ACFDC1D35B09900E2386A /* Products */,
 				BBCD66EC1D36A03F00DF5E47 /* Frameworks */,
 			);
@@ -326,7 +365,7 @@
 			children = (
 				BB5ACFDB1D35B09900E2386A /* JDBC.app */,
 				BB8AC4621D3F11E600BD5B0F /* examples */,
-				BBC13DB61D48FDCE0035A039 /* org_genie_tests.xctest */,
+				BBC13DB61D48FDCE0035A039 /* org_swiftjava_tests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -348,8 +387,6 @@
 				BB19B4411D673986002F5586 /* README.md */,
 				BBBF3A681D4BCE36004142AE /* main.swift */,
 				BBBF3A471D4A8A17004142AE /* Package.swift */,
-				BB8A70511D5AF7AC00840B9E /* build_macos.sh */,
-				BB8A70531D5B164300840B9E /* build_linux.sh */,
 				BBBF3A511D4A8A1C004142AE /* Sources */,
 			);
 			path = examples;
@@ -406,16 +443,22 @@
 			name = Sources;
 			sourceTree = "<group>";
 		};
-		BBC13DB71D48FDCE0035A039 /* org_genie */ = {
+		BBC13DB71D48FDCE0035A039 /* org_swiftjava */ = {
 			isa = PBXGroup;
 			children = (
-				BBC13DC91D4918A30035A039 /* SwiftTest.java */,
+				BB63C9E41F7970EE0048D83B /* Fortify.swift */,
+				CE4A251C1F355B0A003AF384 /* SwiftTest.java */,
+				CE31850E1F368D44002046A6 /* SwiftHelloTypes_TextListener.swift */,
+				CE4A25141F355902003AF384 /* SwiftHelloTest_TestResponderAdapter.swift */,
+				CE4A25151F355902003AF384 /* SwiftHelloTest_SwiftTestListener.swift */,
+				CE4A251F1F355CA6003AF384 /* SwiftHelloTest_TestListener.swift */,
+				CE4A25131F355902003AF384 /* SwiftHelloTestImpl.swift */,
 				BBC13DC11D4900AA0035A039 /* SwiftTest.swift */,
-				BBC13DB81D48FDCE0035A039 /* org_genie.swift */,
+				BBC13DB81D48FDCE0035A039 /* org_swiftjava.swift */,
 				BBC13DC51D490B160035A039 /* test_body.swift */,
 				BBC13DBA1D48FDCE0035A039 /* Info.plist */,
 			);
-			path = org_genie;
+			path = org_swiftjava;
 			sourceTree = "<group>";
 		};
 		BBC13E5C1D49954A0035A039 /* Products */ = {
@@ -455,12 +498,48 @@
 			children = (
 				BB0543FE1D41F38C00F9B367 /* libjvm.dylib */,
 				BB8AC46E1D3F217D00BD5B0F /* libjvm.dylib */,
+				CE75236D1F33E9A3003795CA /* libjvm.dylib */,
 				BB8AC4391D3F035700BD5B0F /* libswiftCore.tbd */,
 				BBCD66ED1D36A03F00DF5E47 /* JavaVM.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		CE3185051F368C37002046A6 /* Bindings */ = {
+			isa = PBXGroup;
+			children = (
+				CE649E301F39E88200C5B7FE /* SwiftHelloTest.java */,
+				CE649E2F1F39E88200C5B7FE /* SwiftHelloBinding.java */,
+				CE649E2D1F39E88200C5B7FE /* SwiftHelloTypes.java */,
+			);
+			name = Bindings;
+			sourceTree = "<group>";
+		};
+		CE31850D1F368C77002046A6 /* Scripts */ = {
+			isa = PBXGroup;
+			children = (
+				BBCD9F871D3CD05900DF5E47 /* genswift.sh */,
+				BBCD6EBC1D383E3700DF5E47 /* genswift.java */,
+				BBCD75371D38DC4200DF5E47 /* overrides.pl */,
+				BBC13DC71D49149A0035A039 /* gentests.rb */,
+				BB9CF8921D619D1C004781B9 /* genhello.sh */,
+				BB31E20E1D4FF13400779860 /* genpkg.sh */,
+				BBAD3EE31D5A84700091D139 /* genall.sh */,
+				BB0544041D42D55200F9B367 /* genjar.sh */,
+			);
+			name = Scripts;
+			sourceTree = "<group>";
+		};
+		CE8102371F3693260069563B /* Android */ = {
+			isa = PBXGroup;
+			children = (
+				CE81023D1F369D8D0069563B /* SwiftHello.java */,
+				CE8102391F3693510069563B /* MainActivity.kt */,
+				BB88CEC721CC388400B79BD9 /* swifthello.swift */,
+			);
+			name = Android;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -511,9 +590,9 @@
 			productReference = BB8AC4621D3F11E600BD5B0F /* examples */;
 			productType = "com.apple.product-type.tool";
 		};
-		BBC13DB51D48FDCE0035A039 /* org_genie_tests */ = {
+		BBC13DB51D48FDCE0035A039 /* org_swiftjava_tests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = BBC13DBE1D48FDCE0035A039 /* Build configuration list for PBXNativeTarget "org_genie_tests" */;
+			buildConfigurationList = BBC13DBE1D48FDCE0035A039 /* Build configuration list for PBXNativeTarget "org_swiftjava_tests" */;
 			buildPhases = (
 				BBC13DB21D48FDCE0035A039 /* Sources */,
 				BBC13DB31D48FDCE0035A039 /* Frameworks */,
@@ -523,9 +602,9 @@
 			);
 			dependencies = (
 			);
-			name = org_genie_tests;
+			name = org_swiftjava_tests;
 			productName = org_genie;
-			productReference = BBC13DB61D48FDCE0035A039 /* org_genie_tests.xctest */;
+			productReference = BBC13DB61D48FDCE0035A039 /* org_swiftjava_tests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 /* End PBXNativeTarget section */
@@ -535,26 +614,28 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "John Holdsworth";
 				TargetAttributes = {
 					BB5ACFDA1D35B09900E2386A = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = 9V5A8WE85E;
 						DevelopmentTeamName = "John Holdsworth";
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					BB8AC4611D3F11E600BD5B0F = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = 9V5A8WE85E;
 						DevelopmentTeamName = "John Holdsworth";
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					BBC13DB51D48FDCE0035A039 = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = 9V5A8WE85E;
 						DevelopmentTeamName = "John Holdsworth";
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -564,6 +645,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -608,7 +690,7 @@
 			targets = (
 				BB5ACFDA1D35B09900E2386A /* JDBC */,
 				BB8AC4611D3F11E600BD5B0F /* examples */,
-				BBC13DB51D48FDCE0035A039 /* org_genie_tests */,
+				BBC13DB51D48FDCE0035A039 /* org_swiftjava_tests */,
 			);
 		};
 /* End PBXProject section */
@@ -677,13 +759,21 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CE4A25101F3555CA003AF384 /* com_johnholdsworth in Resources */,
+				BB408A1620BF102A00B57CFB /* swift-android-opengl in Resources */,
+				BBCCEF9A1F3C83440084F9E3 /* LICENSE in Resources */,
 				BB5ACFE11D35B09900E2386A /* Assets.xcassets in Resources */,
+				BBE0F86F20B733FE00332AC6 /* swift-android-Clibadder in Resources */,
 				BBAD3EE41D5A84700091D139 /* genall.sh in Resources */,
+				BB6651321F2E39F7004EFD5F /* swift-android-kotlin in Resources */,
+				BB6651361F2E3F51004EFD5F /* android_toolchain in Resources */,
 				BB31E20F1D4FF13400779860 /* genpkg.sh in Resources */,
+				BB408A1420BF101A00B57CFB /* swift-android-zlib in Resources */,
 				BBF280D91D64BC6100A7AF5D /* src in Resources */,
-				BB9CF8961D61BAE8004781B9 /* swift-android-gradle in Resources */,
+				BB643B321F4873F7003E849E /* swift-android-gradle in Resources */,
 				BB9CF8981D61BAF4004781B9 /* swift-android-samples in Resources */,
 				BB5ACFE41D35B09900E2386A /* MainMenu.xib in Resources */,
+				CE81023A1F3693510069563B /* MainActivity.kt in Resources */,
 				BB9CF8931D619D1C004781B9 /* genhello.sh in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -710,6 +800,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BBBF3A691D4BCE36004142AE /* main.swift in Sources */,
 				BBBF3A591D4A8B88004142AE /* ImageCanvas.swift in Sources */,
 				BBBF3A571D4A8B45004142AE /* SimpleEx.swift in Sources */,
 				BBBF3A5B1D4A8C27004142AE /* FocusTest.swift in Sources */,
@@ -717,10 +808,8 @@
 				BBBF3A631D4AC26B004142AE /* JComboBox.swift in Sources */,
 				BBBF3A551D4A8ADD004142AE /* SimpleJTreeExample.swift in Sources */,
 				BBBF3A531D4A8A68004142AE /* PhilosophersJList.swift in Sources */,
-				BBBF3A691D4BCE36004142AE /* main.swift in Sources */,
 				BBBF3A671D4B1B95004142AE /* PopupTest.swift in Sources */,
 				BBBF3A611D4AC24F004142AE /* TableColumnColor.swift in Sources */,
-				BB19B4421D673986002F5586 /* README.md in Sources */,
 				BBBF3A731D4BF8CF004142AE /* AWTGraphicsDemo.swift in Sources */,
 				BBAD3EDA1D59DDBC0091D139 /* TableColorSelection.swift in Sources */,
 				BBBF3A5D1D4AA59E004142AE /* TextText.swift in Sources */,
@@ -731,8 +820,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BBC13DB91D48FDCE0035A039 /* org_swiftjava.swift in Sources */,
+				CE4A25211F355CAC003AF384 /* SwiftHelloTest_TestListener.swift in Sources */,
+				CE4A25191F355910003AF384 /* SwiftHelloTest_SwiftTestListener.swift in Sources */,
+				BB63C9E51F7970F00048D83B /* Fortify.swift in Sources */,
 				BBC13DC21D4900AA0035A039 /* SwiftTest.swift in Sources */,
-				BBC13DB91D48FDCE0035A039 /* org_genie.swift in Sources */,
+				CE3185101F368D6B002046A6 /* SwiftHelloTypes_TextListener.swift in Sources */,
+				CE4A251A1F355914003AF384 /* SwiftHelloTest_TestResponderAdapter.swift in Sources */,
+				CE4A251B1F355918003AF384 /* SwiftHelloTestImpl.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -822,14 +917,24 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
@@ -869,14 +974,24 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
@@ -908,10 +1023,10 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = JDBC/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = org.genie.JDBC;
+				PRODUCT_BUNDLE_IDENTIFIER = org.swiftjava.JDBC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -924,9 +1039,9 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = JDBC/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = org.genie.JDBC;
+				PRODUCT_BUNDLE_IDENTIFIER = org.swiftjava.JDBC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -935,12 +1050,8 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(LOCAL_LIBRARY_DIR)/Java/JavaVirtualMachines/jdk1.8.0_91.jdk/Contents/Home/jre/lib/server",
-				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -949,12 +1060,8 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(LOCAL_LIBRARY_DIR)/Java/JavaVirtualMachines/jdk1.8.0_91.jdk/Contents/Home/jre/lib/server",
-				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -963,9 +1070,13 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = org_genie/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.genie.org-genie";
+				INFOPLIST_FILE = org_swiftjava/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks /Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/jre/lib/server";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LOCAL_LIBRARY_DIR)/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/jre/lib/server",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "org.swiftjava.org-swiftjava";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
 			};
@@ -976,9 +1087,13 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = org_genie/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.genie.org-genie";
+				INFOPLIST_FILE = org_swiftjava/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks /Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/jre/lib/server";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(LOCAL_LIBRARY_DIR)/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/jre/lib/server",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "org.swiftjava.org-swiftjava";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
 			};
@@ -1014,7 +1129,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		BBC13DBE1D48FDCE0035A039 /* Build configuration list for PBXNativeTarget "org_genie_tests" */ = {
+		BBC13DBE1D48FDCE0035A039 /* Build configuration list for PBXNativeTarget "org_swiftjava_tests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				BBC13DBF1D48FDCE0035A039 /* Debug */,
diff --git a/SwiftJava.xcodeproj/project.xcworkspace/xcshareddata/SwiftJava.xcscmblueprint b/SwiftJava.xcodeproj/project.xcworkspace/xcshareddata/SwiftJava.xcscmblueprint
new file mode 100644
index 0000000..586f2f1
--- /dev/null
+++ b/SwiftJava.xcodeproj/project.xcworkspace/xcshareddata/SwiftJava.xcscmblueprint
@@ -0,0 +1,114 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "878C2603E03822D160043D9D16A36206CED4E0CA",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "919E7FD20BEE11F783ACA7E8733E036FFD3CC2A7" : 0,
+    "975F9120751D6C438E9A5C85C38DE132AC6185DA" : 0,
+    "34073D21618405EACC233186A25025AB1438DB71" : 0,
+    "D69ED636B0A47DAAE52D01130A54526F3F08576F" : 0,
+    "2448595CDB5ED36D9EAF6DDDED0F943FA508C747" : 0,
+    "F35EB971E2A3FAC98274059126C5879BB91B08C3" : 0,
+    "88C7909D14364BE1B34BD9FA7515C938F2799EDA" : 0,
+    "F5602BE39D3BC51A40E8B26B29F3243856A652CB" : 0,
+    "878C2603E03822D160043D9D16A36206CED4E0CA" : 0,
+    "89DEE779F8BFE1CE8DDEF7AB113FB6B93E7D55C6" : 0,
+    "03D674EFBA86A077C658C74B9BF7405C80AD6E58" : 0,
+    "7FD9F53F3E97DB446A68FCFF0B1331098D829EA6" : 0,
+    "A4A5B9FFE9560298D43F77C6A13830755B45E233" : 0,
+    "685A538D4847A574735DC1EA392743F80472F6DF" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "6BFDE20B-CFCB-4CEC-B3D1-A0DEAE5DDDC0",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "919E7FD20BEE11F783ACA7E8733E036FFD3CC2A7" : "SwiftJava\/java_swift\/",
+    "975F9120751D6C438E9A5C85C38DE132AC6185DA" : "SwiftJava\/java_sql\/",
+    "34073D21618405EACC233186A25025AB1438DB71" : "SwiftJava\/javax_swing\/",
+    "D69ED636B0A47DAAE52D01130A54526F3F08576F" : "SwiftJava\/swift-android-samples\/",
+    "2448595CDB5ED36D9EAF6DDDED0F943FA508C747" : "SwiftJava\/android_toolchain\/",
+    "F35EB971E2A3FAC98274059126C5879BB91B08C3" : "SwiftJava\/java_lang\/",
+    "88C7909D14364BE1B34BD9FA7515C938F2799EDA" : "SwiftJava\/com_apple\/",
+    "F5602BE39D3BC51A40E8B26B29F3243856A652CB" : "SwiftJava\/java_awt\/",
+    "878C2603E03822D160043D9D16A36206CED4E0CA" : "SwiftJava\/",
+    "89DEE779F8BFE1CE8DDEF7AB113FB6B93E7D55C6" : "SwiftJava\/examples\/",
+    "03D674EFBA86A077C658C74B9BF7405C80AD6E58" : "SwiftJava\/CJavaVM\/",
+    "7FD9F53F3E97DB446A68FCFF0B1331098D829EA6" : "SwiftJava\/swift-android-gradle\/",
+    "A4A5B9FFE9560298D43F77C6A13830755B45E233" : "SwiftJava\/swift-android-kotlin\/",
+    "685A538D4847A574735DC1EA392743F80472F6DF" : "SwiftJava\/java_util\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "SwiftJava",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "SwiftJava.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/CJavaVM.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "03D674EFBA86A077C658C74B9BF7405C80AD6E58"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/android_toolchain",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "2448595CDB5ED36D9EAF6DDDED0F943FA508C747"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/javax_swing.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "34073D21618405EACC233186A25025AB1438DB71"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/java_util.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "685A538D4847A574735DC1EA392743F80472F6DF"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/swift-android-gradle.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "7FD9F53F3E97DB446A68FCFF0B1331098D829EA6"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "http:\/\/github.com\/SwiftJava\/SwiftJava",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "878C2603E03822D160043D9D16A36206CED4E0CA"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/com_apple.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "88C7909D14364BE1B34BD9FA7515C938F2799EDA"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/examples.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "89DEE779F8BFE1CE8DDEF7AB113FB6B93E7D55C6"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/java_swift.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "919E7FD20BEE11F783ACA7E8733E036FFD3CC2A7"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/java_sql.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "975F9120751D6C438E9A5C85C38DE132AC6185DA"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/swift-android-kotlin",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "A4A5B9FFE9560298D43F77C6A13830755B45E233"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/swift-android-samples.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D69ED636B0A47DAAE52D01130A54526F3F08576F"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/java_lang.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "F35EB971E2A3FAC98274059126C5879BB91B08C3"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/SwiftJava\/java_awt.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "F5602BE39D3BC51A40E8B26B29F3243856A652CB"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/android_toolchain b/android_toolchain
new file mode 160000
index 0000000..76847bc
--- /dev/null
+++ b/android_toolchain
@@ -0,0 +1 @@
+Subproject commit 76847bcd23f309109d408935fdc47d4815a478dc
diff --git a/com_apple b/com_apple
index 875316c..5714c6a 160000
--- a/com_apple
+++ b/com_apple
@@ -1 +1 @@
-Subproject commit 875316c11370148f149d345f75a1e8b5133c32a4
+Subproject commit 5714c6ac1b99f449f9be416ac4abf5aec15de62e
diff --git a/com_jh/Sources/SwiftHelloListener.swift b/com_jh/Sources/SwiftHelloListener.swift
deleted file mode 100644
index 802feb1..0000000
--- a/com_jh/Sources/SwiftHelloListener.swift
+++ /dev/null
@@ -1,127 +0,0 @@
-
-import java_swift
-
-/// interface com.jh.SwiftHelloListener ///
-
-public protocol SwiftHelloListener: JavaProtocol {
-
-    /// public abstract void com.jh.SwiftHelloListener.processNumber(double)
-
-    func processNumber( number: Double )
-    func processNumber( _ _number: Double )
-
-    /// public abstract void com.jh.SwiftHelloListener.processText(java.lang.String)
-
-    func processText( text: String? )
-    func processText( _ _text: String? )
-
-}
-
-open class SwiftHelloListenerForward: JNIObjectForward, SwiftHelloListener {
-
-    private static var SwiftHelloListenerJNIClass: jclass?
-
-    /// public abstract void com.jh.SwiftHelloListener.processNumber(double)
-
-    private static var processNumber_MethodID_3: jmethodID?
-
-    open func processNumber( number: Double ) {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: number, locals: &__locals )
-        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processNumber", methodSig: "(D)V", methodCache: &SwiftHelloListenerForward.processNumber_MethodID_3, args: &__args, locals: &__locals )
-    }
-
-    open func processNumber( _ _number: Double ) {
-        processNumber( number: _number )
-    }
-
-    /// public abstract void com.jh.SwiftHelloListener.processText(java.lang.String)
-
-    private static var processText_MethodID_4: jmethodID?
-
-    open func processText( text: String? ) {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: text, locals: &__locals )
-        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processText", methodSig: "(Ljava/lang/String;)V", methodCache: &SwiftHelloListenerForward.processText_MethodID_4, args: &__args, locals: &__locals )
-    }
-
-    open func processText( _ _text: String? ) {
-        processText( text: _text )
-    }
-
-}
-
-
-private typealias SwiftHelloListener_processNumber_0_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jdouble ) -> ()
-
-private func SwiftHelloListener_processNumber_0( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ number: jdouble ) -> () {
-    SwiftHelloListenerBase.swiftObject( jniEnv: __env, javaObject: __this ).processNumber( number: JNIType.decode( type: Double(), from: number ) )
-}
-
-private typealias SwiftHelloListener_processText_1_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jobject? ) -> ()
-
-private func SwiftHelloListener_processText_1( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ text: jobject? ) -> () {
-    SwiftHelloListenerBase.swiftObject( jniEnv: __env, javaObject: __this ).processText( text: JNIType.decode( type: String(), from: text ) )
-}
-
-open class SwiftHelloListenerBase: JNIObjectProxy, SwiftHelloListener {
-
-    private static var nativesRegistered = false
-
-    private static func registerNatives() {
-        if ( !nativesRegistered ) {
-            var natives = [JNINativeMethod]()
-
-            let SwiftHelloListener_processNumber_0_thunk: SwiftHelloListener_processNumber_0_type = SwiftHelloListener_processNumber_0
-            natives.append( JNINativeMethod( name: strdup("__processNumber"), signature: strdup("(D)V"), fnPtr: unsafeBitCast( SwiftHelloListener_processNumber_0_thunk, to: UnsafeMutableRawPointer.self ) ) )
-
-            let SwiftHelloListener_processText_1_thunk: SwiftHelloListener_processText_1_type = SwiftHelloListener_processText_1
-            natives.append( JNINativeMethod( name: strdup("__processText"), signature: strdup("(Ljava/lang/String;)V"), fnPtr: unsafeBitCast( SwiftHelloListener_processText_1_thunk, to: UnsafeMutableRawPointer.self ) ) )
-
-            withUnsafePointer(to: &natives[0]) {
-                nativesPtr in
-                let clazz = JNI.FindClass( "org/genie/com_jh/SwiftHelloListenerProxy" )
-                if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr, jint(natives.count) ) != jint(JNI_OK) {
-                    JNI.report( "Unable to register java natives" )
-                }
-            }
-
-            nativesRegistered = true
-        }
-    }
-
-    public convenience init() {
-        self.init( javaObject: nil )
-    }
-
-    public required init( javaObject: jobject! ) {
-        super.init( javaObject: javaObject )
-        SwiftHelloListenerBase.registerNatives()
-        createProxy( javaClassName: "org/genie/com_jh/SwiftHelloListenerProxy" )
-    }
-
-    static func swiftObject( jniEnv: UnsafeMutablePointer<JNIEnv?>?, javaObject: jobject? ) -> SwiftHelloListenerBase {
-        return unsafeBitCast( swiftPointer( jniEnv: jniEnv, object: javaObject ), to: SwiftHelloListenerBase.self )
-    }
-
-    /// public abstract void com.jh.SwiftHelloListener.processNumber(double)
-
-    open func processNumber( number: Double ) /**/ {
-        processNumber( number )
-    }
-
-    open func processNumber( _ _number: Double ) /**/ {
-    }
-
-    /// public abstract void com.jh.SwiftHelloListener.processText(java.lang.String)
-
-    open func processText( text: String? ) /**/ {
-        processText( text )
-    }
-
-    open func processText( _ _text: String? ) /**/ {
-    }
-
-}
diff --git a/com_jh/Sources/SwiftHelloResponder.swift b/com_jh/Sources/SwiftHelloResponder.swift
deleted file mode 100644
index 324502f..0000000
--- a/com_jh/Sources/SwiftHelloResponder.swift
+++ /dev/null
@@ -1,56 +0,0 @@
-
-import java_swift
-
-/// interface com.jh.SwiftHelloResponder ///
-
-public protocol SwiftHelloResponder: JavaProtocol {
-
-    /// public abstract void com.jh.SwiftHelloResponder.processedNumber(double)
-
-    func processedNumber( number: Double )
-    func processedNumber( _ _number: Double )
-
-    /// public abstract void com.jh.SwiftHelloResponder.processedText(java.lang.String)
-
-    func processedText( text: String? )
-    func processedText( _ _text: String? )
-
-}
-
-open class SwiftHelloResponderForward: JNIObjectForward, SwiftHelloResponder {
-
-    private static var SwiftHelloResponderJNIClass: jclass?
-
-    /// public abstract void com.jh.SwiftHelloResponder.processedNumber(double)
-
-    private static var processedNumber_MethodID_3: jmethodID?
-
-    open func processedNumber( number: Double ) {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: number, locals: &__locals )
-        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processedNumber", methodSig: "(D)V", methodCache: &SwiftHelloResponderForward.processedNumber_MethodID_3, args: &__args, locals: &__locals )
-    }
-
-    open func processedNumber( _ _number: Double ) {
-        processedNumber( number: _number )
-    }
-
-    /// public abstract void com.jh.SwiftHelloResponder.processedText(java.lang.String)
-
-    private static var processedText_MethodID_4: jmethodID?
-
-    open func processedText( text: String? ) {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: text, locals: &__locals )
-        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processedText", methodSig: "(Ljava/lang/String;)V", methodCache: &SwiftHelloResponderForward.processedText_MethodID_4, args: &__args, locals: &__locals )
-    }
-
-    open func processedText( _ _text: String? ) {
-        processedText( text: _text )
-    }
-
-}
-
-
diff --git a/com_johnholdsworth/Sources/SwiftHelloBinding.swift b/com_johnholdsworth/Sources/SwiftHelloBinding.swift
new file mode 100644
index 0000000..efcf81d
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloBinding.swift
@@ -0,0 +1,18 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.johnholdsworth.swiftbindings.SwiftHelloBinding ///
+
+public protocol SwiftHelloBinding: JavaProtocol {
+
+}
+
+
+open class SwiftHelloBindingForward: JNIObjectForward, SwiftHelloBinding {
+
+    private static var SwiftHelloBindingJNIClass: jclass?
+
+}
+
diff --git a/com_johnholdsworth/Sources/SwiftHelloBinding_Listener.swift b/com_johnholdsworth/Sources/SwiftHelloBinding_Listener.swift
new file mode 100644
index 0000000..4f6b4ec
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloBinding_Listener.swift
@@ -0,0 +1,380 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener ///
+
+public protocol SwiftHelloBinding_Listener: JavaProtocol {
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processNumber(double)
+
+    func processNumber( number: Double )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processStringMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMap)
+
+    func processStringMap( map: [String:String]? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processStringMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMapList)
+
+    func processStringMapList( map: [String:[String]]? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processText(java.lang.String)
+
+    func processText( text: String? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processedMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    func processedMap( map: [String:SwiftHelloTypes_TextListener]? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processedMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    func processedMapList( map: [String:[SwiftHelloTypes_TextListener]]? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.setCacheDir(java.lang.String)
+
+    func setCacheDir( cacheDir: String? )
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.testResponder(int)
+
+    func testResponder( loopback: Int ) -> SwiftHelloTest_TestListener!
+
+    /// public abstract double com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.throwException() throws java.lang.Exception
+
+    func throwException() throws /* java.lang.Exception */ -> Double
+
+}
+
+
+open class SwiftHelloBinding_ListenerForward: JNIObjectForward, SwiftHelloBinding_Listener {
+
+    private static var SwiftHelloBinding_ListenerJNIClass: jclass?
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processNumber(double)
+
+    private static var processNumber_MethodID_10: jmethodID?
+
+    open func processNumber( number: Double ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( d: number )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processNumber", methodSig: "(D)V", methodCache: &SwiftHelloBinding_ListenerForward.processNumber_MethodID_10, args: &__args, locals: &__locals )
+    }
+
+    open func processNumber( _ _number: Double ) {
+        processNumber( number: _number )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processStringMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMap)
+
+    private static var processStringMap_MethodID_11: jmethodID?
+
+    open func processStringMap( map: [String:String]? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: map, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMap", locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processStringMap", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMap;)V", methodCache: &SwiftHelloBinding_ListenerForward.processStringMap_MethodID_11, args: &__args, locals: &__locals )
+    }
+
+    open func processStringMap( _ _map: [String:String]? ) {
+        processStringMap( map: _map )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processStringMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMapList)
+
+    private static var processStringMapList_MethodID_12: jmethodID?
+
+    open func processStringMapList( map: [String:[String]]? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: map, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMapList", locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processStringMapList", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMapList;)V", methodCache: &SwiftHelloBinding_ListenerForward.processStringMapList_MethodID_12, args: &__args, locals: &__locals )
+    }
+
+    open func processStringMapList( _ _map: [String:[String]]? ) {
+        processStringMapList( map: _map )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processText(java.lang.String)
+
+    private static var processText_MethodID_13: jmethodID?
+
+    open func processText( text: String? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: text, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processText", methodSig: "(Ljava/lang/String;)V", methodCache: &SwiftHelloBinding_ListenerForward.processText_MethodID_13, args: &__args, locals: &__locals )
+    }
+
+    open func processText( _ _text: String? ) {
+        processText( text: _text )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processedMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    private static var processedMap_MethodID_14: jmethodID?
+
+    open func processedMap( map: [String:SwiftHelloTypes_TextListener]? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: map, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap", locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processedMap", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap;)V", methodCache: &SwiftHelloBinding_ListenerForward.processedMap_MethodID_14, args: &__args, locals: &__locals )
+    }
+
+    open func processedMap( _ _map: [String:SwiftHelloTypes_TextListener]? ) {
+        processedMap( map: _map )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processedMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    private static var processedMapList_MethodID_15: jmethodID?
+
+    open func processedMapList( map: [String:[SwiftHelloTypes_TextListener]]? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: map, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList", locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processedMapList", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList;)V", methodCache: &SwiftHelloBinding_ListenerForward.processedMapList_MethodID_15, args: &__args, locals: &__locals )
+    }
+
+    open func processedMapList( _ _map: [String:[SwiftHelloTypes_TextListener]]? ) {
+        processedMapList( map: _map )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.setCacheDir(java.lang.String)
+
+    private static var setCacheDir_MethodID_16: jmethodID?
+
+    open func setCacheDir( cacheDir: String? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: cacheDir, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "setCacheDir", methodSig: "(Ljava/lang/String;)V", methodCache: &SwiftHelloBinding_ListenerForward.setCacheDir_MethodID_16, args: &__args, locals: &__locals )
+    }
+
+    open func setCacheDir( _ _cacheDir: String? ) {
+        setCacheDir( cacheDir: _cacheDir )
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.testResponder(int)
+
+    private static var testResponder_MethodID_17: jmethodID?
+
+    open func testResponder( loopback: Int ) -> SwiftHelloTest_TestListener! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( i: jint(loopback) )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "testResponder", methodSig: "(I)Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &SwiftHelloBinding_ListenerForward.testResponder_MethodID_17, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? SwiftHelloTest_TestListenerForward( javaObject: __return ) : nil
+    }
+
+    open func testResponder( _ _loopback: Int ) -> SwiftHelloTest_TestListener! {
+        return testResponder( loopback: _loopback )
+    }
+
+    /// public abstract double com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.throwException() throws java.lang.Exception
+
+    private static var throwException_MethodID_18: jmethodID?
+
+    open func throwException() throws /* java.lang.Exception */ -> Double {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallDoubleMethod( object: javaObject, methodName: "throwException", methodSig: "()D", methodCache: &SwiftHelloBinding_ListenerForward.throwException_MethodID_18, args: &__args, locals: &__locals )
+        if let throwable = JNI.ExceptionCheck() {
+            defer { JNI.DeleteLocalRef( throwable ) }
+            throw java_swift.Exception( javaObject: throwable )
+        }
+        return __return
+    }
+
+
+}
+
+private typealias SwiftHelloBinding_Listener_processNumber_0_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jdouble ) -> ()
+
+private func SwiftHelloBinding_Listener_processNumber_0( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ number: jdouble ) -> () {
+    SwiftHelloBinding_ListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).processNumber( number: number )
+}
+
+private typealias SwiftHelloBinding_Listener_processStringMap_1_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> ()
+
+private func SwiftHelloBinding_Listener_processStringMap_1( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ map: jobject? ) -> () {
+    SwiftHelloBinding_ListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).processStringMap( map: JNIType.toSwift( type: [String:String].self, from: map, consume: false ) )
+}
+
+private typealias SwiftHelloBinding_Listener_processStringMapList_2_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> ()
+
+private func SwiftHelloBinding_Listener_processStringMapList_2( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ map: jobject? ) -> () {
+    SwiftHelloBinding_ListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).processStringMapList( map: JNIType.toSwift( type: [String:[String]].self, from: map, consume: false ) )
+}
+
+private typealias SwiftHelloBinding_Listener_processText_3_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> ()
+
+private func SwiftHelloBinding_Listener_processText_3( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ text: jobject? ) -> () {
+    SwiftHelloBinding_ListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).processText( text: text != nil ? String( javaObject: text ) : nil )
+}
+
+private typealias SwiftHelloBinding_Listener_processedMap_4_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> ()
+
+private func SwiftHelloBinding_Listener_processedMap_4( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ map: jobject? ) -> () {
+    SwiftHelloBinding_ListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).processedMap( map: JNIType.toSwift( type: [String:SwiftHelloTypes_TextListenerForward].self, from: map, consume: false ) )
+}
+
+private typealias SwiftHelloBinding_Listener_processedMapList_5_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> ()
+
+private func SwiftHelloBinding_Listener_processedMapList_5( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ map: jobject? ) -> () {
+    SwiftHelloBinding_ListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).processedMapList( map: JNIType.toSwift( type: [String:[SwiftHelloTypes_TextListenerForward]].self, from: map, consume: false ) )
+}
+
+private typealias SwiftHelloBinding_Listener_setCacheDir_6_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> ()
+
+private func SwiftHelloBinding_Listener_setCacheDir_6( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ cacheDir: jobject? ) -> () {
+    SwiftHelloBinding_ListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).setCacheDir( cacheDir: cacheDir != nil ? String( javaObject: cacheDir ) : nil )
+}
+
+private typealias SwiftHelloBinding_Listener_testResponder_7_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jint ) -> jobject?
+
+private func SwiftHelloBinding_Listener_testResponder_7( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ loopback: jint ) -> jobject? {
+    let __return = SwiftHelloBinding_ListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).testResponder( loopback: Int(loopback) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloBinding_Listener_throwException_8_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong ) -> jdouble
+
+private func SwiftHelloBinding_Listener_throwException_8( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong ) -> jdouble {
+    do {
+        let __return = try SwiftHelloBinding_ListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).throwException( )
+        var __locals = [jobject]()
+        return JNI.check( jvalue( d: __return ).d, &__locals, removeLast: true )
+    }
+    catch let exception as Throwable {
+        _ = exception.withJavaObject { JNI.api.Throw( JNI.env, $0 ) }
+        return 0
+    }
+    catch {
+        _ = Exception("Unknown exception").withJavaObject { JNI.api.Throw( JNI.env, $0 ) }
+        return 0
+    }
+}
+
+fileprivate class SwiftHelloBinding_ListenerLocal_: JNILocalProxy<SwiftHelloBinding_Listener, Any> {
+
+    fileprivate static let _proxyClass: jclass = {
+        var natives = [JNINativeMethod]()
+
+        let SwiftHelloBinding_Listener_processNumber_0_thunk: SwiftHelloBinding_Listener_processNumber_0_type = SwiftHelloBinding_Listener_processNumber_0
+        natives.append( JNINativeMethod( name: strdup("__processNumber"), signature: strdup("(JD)V"), fnPtr: unsafeBitCast( SwiftHelloBinding_Listener_processNumber_0_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloBinding_Listener_processStringMap_1_thunk: SwiftHelloBinding_Listener_processStringMap_1_type = SwiftHelloBinding_Listener_processStringMap_1
+        natives.append( JNINativeMethod( name: strdup("__processStringMap"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMap;)V"), fnPtr: unsafeBitCast( SwiftHelloBinding_Listener_processStringMap_1_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloBinding_Listener_processStringMapList_2_thunk: SwiftHelloBinding_Listener_processStringMapList_2_type = SwiftHelloBinding_Listener_processStringMapList_2
+        natives.append( JNINativeMethod( name: strdup("__processStringMapList"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMapList;)V"), fnPtr: unsafeBitCast( SwiftHelloBinding_Listener_processStringMapList_2_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloBinding_Listener_processText_3_thunk: SwiftHelloBinding_Listener_processText_3_type = SwiftHelloBinding_Listener_processText_3
+        natives.append( JNINativeMethod( name: strdup("__processText"), signature: strdup("(JLjava/lang/String;)V"), fnPtr: unsafeBitCast( SwiftHelloBinding_Listener_processText_3_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloBinding_Listener_processedMap_4_thunk: SwiftHelloBinding_Listener_processedMap_4_type = SwiftHelloBinding_Listener_processedMap_4
+        natives.append( JNINativeMethod( name: strdup("__processedMap"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap;)V"), fnPtr: unsafeBitCast( SwiftHelloBinding_Listener_processedMap_4_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloBinding_Listener_processedMapList_5_thunk: SwiftHelloBinding_Listener_processedMapList_5_type = SwiftHelloBinding_Listener_processedMapList_5
+        natives.append( JNINativeMethod( name: strdup("__processedMapList"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList;)V"), fnPtr: unsafeBitCast( SwiftHelloBinding_Listener_processedMapList_5_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloBinding_Listener_setCacheDir_6_thunk: SwiftHelloBinding_Listener_setCacheDir_6_type = SwiftHelloBinding_Listener_setCacheDir_6
+        natives.append( JNINativeMethod( name: strdup("__setCacheDir"), signature: strdup("(JLjava/lang/String;)V"), fnPtr: unsafeBitCast( SwiftHelloBinding_Listener_setCacheDir_6_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloBinding_Listener_testResponder_7_thunk: SwiftHelloBinding_Listener_testResponder_7_type = SwiftHelloBinding_Listener_testResponder_7
+        natives.append( JNINativeMethod( name: strdup("__testResponder"), signature: strdup("(JI)Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;"), fnPtr: unsafeBitCast( SwiftHelloBinding_Listener_testResponder_7_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloBinding_Listener_throwException_8_thunk: SwiftHelloBinding_Listener_throwException_8_type = SwiftHelloBinding_Listener_throwException_8
+        natives.append( JNINativeMethod( name: strdup("__throwException"), signature: strdup("(J)D"), fnPtr: unsafeBitCast( SwiftHelloBinding_Listener_throwException_8_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        natives.append( JNINativeMethod( name: strdup("__finalize"), signature: strdup("(J)V"), fnPtr: unsafeBitCast( JNIReleasableProxy__finalize_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let clazz = JNI.FindClass( proxyClassName() )
+        withUnsafePointer(to: &natives[0]) {
+            nativesPtr in
+            if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr, jint(natives.count) ) != jint(JNI_OK) {
+                JNI.report( "Unable to register java natives" )
+            }
+        }
+
+        defer { JNI.DeleteLocalRef( clazz ) }
+        return JNI.api.NewGlobalRef( JNI.env, clazz )!
+    }()
+
+    override open class func proxyClassName() -> String { return "org/swiftjava/com_johnholdsworth/SwiftHelloBinding_ListenerProxy" }
+    override open class func proxyClass() -> jclass? { return _proxyClass }
+
+}
+
+extension SwiftHelloBinding_Listener {
+
+    public func localJavaObject( _ locals: UnsafeMutablePointer<[jobject]> ) -> jobject? {
+        return SwiftHelloBinding_ListenerLocal_( owned: self, proto: self ).localJavaObject( locals )
+    }
+
+}
+
+open class SwiftHelloBinding_ListenerBase: SwiftHelloBinding_Listener {
+
+    public init() {}
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processNumber(double)
+
+    open func processNumber( number: Double ) /**/ {
+    }
+
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processStringMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMap)
+
+    open func processStringMap( map: [String:String]? ) /**/ {
+    }
+
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processStringMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMapList)
+
+    open func processStringMapList( map: [String:[String]]? ) /**/ {
+    }
+
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processText(java.lang.String)
+
+    open func processText( text: String? ) /**/ {
+    }
+
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processedMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    open func processedMap( map: [String:SwiftHelloTypes_TextListener]? ) /**/ {
+    }
+
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processedMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    open func processedMapList( map: [String:[SwiftHelloTypes_TextListener]]? ) /**/ {
+    }
+
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.setCacheDir(java.lang.String)
+
+    open func setCacheDir( cacheDir: String? ) /**/ {
+    }
+
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.testResponder(int)
+
+    open func testResponder( loopback: Int ) -> SwiftHelloTest_TestListener! /**/ {
+        return nil
+    }
+
+
+    /// public abstract double com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.throwException() throws java.lang.Exception
+
+    open func throwException() throws /* java.lang.Exception */ -> Double /**/ {
+        return 0
+    }
+
+
+}
diff --git a/com_johnholdsworth/Sources/SwiftHelloBinding_Responder.swift b/com_johnholdsworth/Sources/SwiftHelloBinding_Responder.swift
new file mode 100644
index 0000000..2515948
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloBinding_Responder.swift
@@ -0,0 +1,269 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder ///
+
+public protocol SwiftHelloBinding_Responder: JavaProtocol {
+
+    /// public abstract java.lang.String[] com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.debug(java.lang.String)
+
+    func debug( msg: String? ) -> [String]!
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.onMainThread(java.lang.Runnable)
+
+    func onMainThread( runnable: java_swift.Runnable? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    func processMap( map: [String:SwiftHelloTypes_TextListener]? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    func processMapList( map: [String:[SwiftHelloTypes_TextListener]]? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedNumber(double)
+
+    func processedNumber( number: Double )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedStringMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMap)
+
+    func processedStringMap( map: [String:String]? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedStringMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMapList)
+
+    func processedStringMapList( map: [String:[String]]? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedText(java.lang.String)
+
+    func processedText( text: String? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedTextListener(com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener)
+
+    func processedTextListener( text: SwiftHelloTypes_TextListener? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedTextListener2dArray(com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener[][])
+
+    func processedTextListener2dArray( text: [[SwiftHelloTypes_TextListener]]? )
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedTextListenerArray(com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener[])
+
+    func processedTextListenerArray( text: [SwiftHelloTypes_TextListener]? )
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.testResponder(int)
+
+    func testResponder( loopback: Int ) -> SwiftHelloTest_TestListener!
+
+    /// public abstract double com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.throwException() throws java.lang.Exception
+
+    func throwException() throws /* java.lang.Exception */ -> Double
+
+}
+
+
+open class SwiftHelloBinding_ResponderForward: JNIObjectForward, SwiftHelloBinding_Responder {
+
+    private static var SwiftHelloBinding_ResponderJNIClass: jclass?
+
+    /// public abstract java.lang.String[] com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.debug(java.lang.String)
+
+    private static var debug_MethodID_14: jmethodID?
+
+    open func debug( msg: String? ) -> [String]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: msg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "debug", methodSig: "(Ljava/lang/String;)[Ljava/lang/String;", methodCache: &SwiftHelloBinding_ResponderForward.debug_MethodID_14, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [String].self, from: __return )
+    }
+
+    open func debug( _ _msg: String? ) -> [String]! {
+        return debug( msg: _msg )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.onMainThread(java.lang.Runnable)
+
+    private static var onMainThread_MethodID_15: jmethodID?
+
+    open func onMainThread( runnable: java_swift.Runnable? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: runnable, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "onMainThread", methodSig: "(Ljava/lang/Runnable;)V", methodCache: &SwiftHelloBinding_ResponderForward.onMainThread_MethodID_15, args: &__args, locals: &__locals )
+    }
+
+    open func onMainThread( _ _runnable: java_swift.Runnable? ) {
+        onMainThread( runnable: _runnable )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    private static var processMap_MethodID_16: jmethodID?
+
+    open func processMap( map: [String:SwiftHelloTypes_TextListener]? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: map, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap", locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processMap", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap;)V", methodCache: &SwiftHelloBinding_ResponderForward.processMap_MethodID_16, args: &__args, locals: &__locals )
+    }
+
+    open func processMap( _ _map: [String:SwiftHelloTypes_TextListener]? ) {
+        processMap( map: _map )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    private static var processMapList_MethodID_17: jmethodID?
+
+    open func processMapList( map: [String:[SwiftHelloTypes_TextListener]]? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: map, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList", locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processMapList", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList;)V", methodCache: &SwiftHelloBinding_ResponderForward.processMapList_MethodID_17, args: &__args, locals: &__locals )
+    }
+
+    open func processMapList( _ _map: [String:[SwiftHelloTypes_TextListener]]? ) {
+        processMapList( map: _map )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedNumber(double)
+
+    private static var processedNumber_MethodID_18: jmethodID?
+
+    open func processedNumber( number: Double ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( d: number )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processedNumber", methodSig: "(D)V", methodCache: &SwiftHelloBinding_ResponderForward.processedNumber_MethodID_18, args: &__args, locals: &__locals )
+    }
+
+    open func processedNumber( _ _number: Double ) {
+        processedNumber( number: _number )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedStringMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMap)
+
+    private static var processedStringMap_MethodID_19: jmethodID?
+
+    open func processedStringMap( map: [String:String]? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: map, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMap", locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processedStringMap", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMap;)V", methodCache: &SwiftHelloBinding_ResponderForward.processedStringMap_MethodID_19, args: &__args, locals: &__locals )
+    }
+
+    open func processedStringMap( _ _map: [String:String]? ) {
+        processedStringMap( map: _map )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedStringMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMapList)
+
+    private static var processedStringMapList_MethodID_20: jmethodID?
+
+    open func processedStringMapList( map: [String:[String]]? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: map, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMapList", locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processedStringMapList", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMapList;)V", methodCache: &SwiftHelloBinding_ResponderForward.processedStringMapList_MethodID_20, args: &__args, locals: &__locals )
+    }
+
+    open func processedStringMapList( _ _map: [String:[String]]? ) {
+        processedStringMapList( map: _map )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedText(java.lang.String)
+
+    private static var processedText_MethodID_21: jmethodID?
+
+    open func processedText( text: String? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: text, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processedText", methodSig: "(Ljava/lang/String;)V", methodCache: &SwiftHelloBinding_ResponderForward.processedText_MethodID_21, args: &__args, locals: &__locals )
+    }
+
+    open func processedText( _ _text: String? ) {
+        processedText( text: _text )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedTextListener(com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener)
+
+    private static var processedTextListener_MethodID_22: jmethodID?
+
+    open func processedTextListener( text: SwiftHelloTypes_TextListener? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: text, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processedTextListener", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$TextListener;)V", methodCache: &SwiftHelloBinding_ResponderForward.processedTextListener_MethodID_22, args: &__args, locals: &__locals )
+    }
+
+    open func processedTextListener( _ _text: SwiftHelloTypes_TextListener? ) {
+        processedTextListener( text: _text )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedTextListener2dArray(com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener[][])
+
+    private static var processedTextListener2dArray_MethodID_23: jmethodID?
+
+    open func processedTextListener2dArray( text: [[SwiftHelloTypes_TextListener]]? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: text, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processedTextListener2dArray", methodSig: "([[Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$TextListener;)V", methodCache: &SwiftHelloBinding_ResponderForward.processedTextListener2dArray_MethodID_23, args: &__args, locals: &__locals )
+    }
+
+    open func processedTextListener2dArray( _ _text: [[SwiftHelloTypes_TextListener]]? ) {
+        processedTextListener2dArray( text: _text )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.processedTextListenerArray(com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener[])
+
+    private static var processedTextListenerArray_MethodID_24: jmethodID?
+
+    open func processedTextListenerArray( text: [SwiftHelloTypes_TextListener]? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: text, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "processedTextListenerArray", methodSig: "([Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$TextListener;)V", methodCache: &SwiftHelloBinding_ResponderForward.processedTextListenerArray_MethodID_24, args: &__args, locals: &__locals )
+    }
+
+    open func processedTextListenerArray( _ _text: [SwiftHelloTypes_TextListener]? ) {
+        processedTextListenerArray( text: _text )
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.testResponder(int)
+
+    private static var testResponder_MethodID_25: jmethodID?
+
+    open func testResponder( loopback: Int ) -> SwiftHelloTest_TestListener! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( i: jint(loopback) )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "testResponder", methodSig: "(I)Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &SwiftHelloBinding_ResponderForward.testResponder_MethodID_25, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? SwiftHelloTest_TestListenerForward( javaObject: __return ) : nil
+    }
+
+    open func testResponder( _ _loopback: Int ) -> SwiftHelloTest_TestListener! {
+        return testResponder( loopback: _loopback )
+    }
+
+    /// public abstract double com.johnholdsworth.swiftbindings.SwiftHelloBinding$Responder.throwException() throws java.lang.Exception
+
+    private static var throwException_MethodID_26: jmethodID?
+
+    open func throwException() throws /* java.lang.Exception */ -> Double {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallDoubleMethod( object: javaObject, methodName: "throwException", methodSig: "()D", methodCache: &SwiftHelloBinding_ResponderForward.throwException_MethodID_26, args: &__args, locals: &__locals )
+        if let throwable = JNI.ExceptionCheck() {
+            defer { JNI.DeleteLocalRef( throwable ) }
+            throw java_swift.Exception( javaObject: throwable )
+        }
+        return __return
+    }
+
+
+}
+
diff --git a/com_johnholdsworth/Sources/SwiftHelloTest.swift b/com_johnholdsworth/Sources/SwiftHelloTest.swift
new file mode 100644
index 0000000..29164fc
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTest.swift
@@ -0,0 +1,18 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.johnholdsworth.swiftbindings.SwiftHelloTest ///
+
+public protocol SwiftHelloTest: JavaProtocol {
+
+}
+
+
+open class SwiftHelloTestForward: JNIObjectForward, SwiftHelloTest {
+
+    private static var SwiftHelloTestJNIClass: jclass?
+
+}
+
diff --git a/com_johnholdsworth/Sources/SwiftHelloTestImpl.swift b/com_johnholdsworth/Sources/SwiftHelloTestImpl.swift
new file mode 100644
index 0000000..4a6b5b9
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTestImpl.swift
@@ -0,0 +1,315 @@
+
+// auto generated by ../../gentests.rb
+
+import java_swift
+import Foundation
+
+public class SwiftTestListener: SwiftHelloTest_TestListenerBase {
+
+    var loopback: SwiftHelloTest_TestListener?
+
+    override public func booleanMethod( arg: Bool ) -> Bool {
+        return loopback?.booleanMethod( arg: arg ) ?? arg
+    }
+
+    override public func booleanArrayMethod( arg: [Bool]? ) -> [Bool]? {
+        return loopback?.booleanArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func boolean2dArrayMethod( arg: [[Bool]]? ) -> [[Bool]]? {
+        return loopback?.boolean2dArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func byteMethod( arg: Int8 ) -> Int8 {
+        return loopback?.byteMethod( arg: arg ) ?? arg
+    }
+
+    override public func byteArrayMethod( arg: [Int8]? ) -> [Int8]? {
+        return loopback?.byteArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func byte2dArrayMethod( arg: [[Int8]]? ) -> [[Int8]]? {
+        return loopback?.byte2dArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func charMethod( arg: UInt16 ) -> UInt16 {
+        return loopback?.charMethod( arg: arg ) ?? arg
+    }
+
+    override public func charArrayMethod( arg: [UInt16]? ) -> [UInt16]? {
+        return loopback?.charArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func char2dArrayMethod( arg: [[UInt16]]? ) -> [[UInt16]]? {
+        return loopback?.char2dArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func shortMethod( arg: Int16 ) -> Int16 {
+        return loopback?.shortMethod( arg: arg ) ?? arg
+    }
+
+    override public func shortArrayMethod( arg: [Int16]? ) -> [Int16]? {
+        return loopback?.shortArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func short2dArrayMethod( arg: [[Int16]]? ) -> [[Int16]]? {
+        return loopback?.short2dArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func intMethod( arg: Int ) -> Int {
+        return loopback?.intMethod( arg: arg ) ?? arg
+    }
+
+    override public func intArrayMethod( arg: [Int32]? ) -> [Int32]? {
+        return loopback?.intArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func int2dArrayMethod( arg: [[Int32]]? ) -> [[Int32]]? {
+        return loopback?.int2dArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func longMethod( arg: Int64 ) -> Int64 {
+        return loopback?.longMethod( arg: arg ) ?? arg
+    }
+
+    override public func longArrayMethod( arg: [Int64]? ) -> [Int64]? {
+        return loopback?.longArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func long2dArrayMethod( arg: [[Int64]]? ) -> [[Int64]]? {
+        return loopback?.long2dArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func floatMethod( arg: Float ) -> Float {
+        return loopback?.floatMethod( arg: arg ) ?? arg
+    }
+
+    override public func floatArrayMethod( arg: [Float]? ) -> [Float]? {
+        return loopback?.floatArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func float2dArrayMethod( arg: [[Float]]? ) -> [[Float]]? {
+        return loopback?.float2dArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func doubleMethod( arg: Double ) -> Double {
+        return loopback?.doubleMethod( arg: arg ) ?? arg
+    }
+
+    override public func doubleArrayMethod( arg: [Double]? ) -> [Double]? {
+        return loopback?.doubleArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func double2dArrayMethod( arg: [[Double]]? ) -> [[Double]]? {
+        return loopback?.double2dArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func StringMethod( arg: String? ) -> String? {
+        return loopback?.StringMethod( arg: arg ) ?? arg
+    }
+
+    override public func StringArrayMethod( arg: [String]? ) -> [String]? {
+        return loopback?.StringArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func String2dArrayMethod( arg: [[String]]? ) -> [[String]]? {
+        return loopback?.String2dArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func TestListenerMethod( arg: SwiftHelloTest_TestListener? ) -> SwiftHelloTest_TestListener? {
+        return loopback?.TestListenerMethod( arg: arg ) ?? arg
+    }
+
+    override public func TestListenerArrayMethod( arg: [SwiftHelloTest_TestListener]? ) -> [SwiftHelloTest_TestListener]? {
+        return loopback?.TestListenerArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func TestListener2dArrayMethod( arg: [[SwiftHelloTest_TestListener]]? ) -> [[SwiftHelloTest_TestListener]]? {
+        return loopback?.TestListener2dArrayMethod( arg: arg ) ?? arg
+    }
+
+}
+
+public class SwiftTestResponder {
+
+    static var tcount = 0
+
+    public func respond( to responder: SwiftHelloTest_TestListener ) {
+        SwiftTestResponder.tcount += 1
+        NSLog("Swift -> Java \(SwiftTestResponder.tcount)...")
+
+        if true {
+            let reference: Bool = true
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            let response = responder.booleanMethod( arg: reference )
+            let responseArray = responder.booleanArrayMethod( arg: referenceArray )!
+            _ = responder.boolean2dArrayMethod( arg: reference2dArray )
+
+            if response != reference {
+                NSLog("Bool: \(String(describing: response)) != \(reference)")
+            }
+            if responseArray != referenceArray {
+                NSLog("Bool: \(responseArray) != \(referenceArray)")
+            }
+        }
+
+
+        if true {
+            let reference: Int8 = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            let response = responder.byteMethod( arg: reference )
+            let responseArray = responder.byteArrayMethod( arg: referenceArray )!
+            _ = responder.byte2dArrayMethod( arg: reference2dArray )
+
+            if response != reference {
+                NSLog("Int8: \(String(describing: response)) != \(reference)")
+            }
+            if responseArray != referenceArray {
+                NSLog("Int8: \(responseArray) != \(referenceArray)")
+            }
+        }
+
+
+        if true {
+            let reference: UInt16 = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            let response = responder.charMethod( arg: reference )
+            let responseArray = responder.charArrayMethod( arg: referenceArray )!
+            _ = responder.char2dArrayMethod( arg: reference2dArray )
+
+            if response != reference {
+                NSLog("UInt16: \(String(describing: response)) != \(reference)")
+            }
+            if responseArray != referenceArray {
+                NSLog("UInt16: \(responseArray) != \(referenceArray)")
+            }
+        }
+
+
+        if true {
+            let reference: Int16 = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            let response = responder.shortMethod( arg: reference )
+            let responseArray = responder.shortArrayMethod( arg: referenceArray )!
+            _ = responder.short2dArrayMethod( arg: reference2dArray )
+
+            if response != reference {
+                NSLog("Int16: \(String(describing: response)) != \(reference)")
+            }
+            if responseArray != referenceArray {
+                NSLog("Int16: \(responseArray) != \(referenceArray)")
+            }
+        }
+
+
+        if true {
+            let reference: Int = 123
+            let referenceArray = [Int32(reference)]
+            let reference2dArray = [referenceArray]
+
+            let response = responder.intMethod( arg: reference )
+            let responseArray = responder.intArrayMethod( arg: referenceArray )!
+            _ = responder.int2dArrayMethod( arg: reference2dArray )
+
+            if response != reference {
+                NSLog("Int: \(String(describing: response)) != \(reference)")
+            }
+            if responseArray != referenceArray {
+                NSLog("Int: \(responseArray) != \(referenceArray)")
+            }
+        }
+
+
+        if true {
+            let reference: Int64 = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            let response = responder.longMethod( arg: reference )
+            let responseArray = responder.longArrayMethod( arg: referenceArray )!
+            _ = responder.long2dArrayMethod( arg: reference2dArray )
+
+            if response != reference {
+                NSLog("Int64: \(String(describing: response)) != \(reference)")
+            }
+            if responseArray != referenceArray {
+                NSLog("Int64: \(responseArray) != \(referenceArray)")
+            }
+        }
+
+
+        if true {
+            let reference: Float = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            let response = responder.floatMethod( arg: reference )
+            let responseArray = responder.floatArrayMethod( arg: referenceArray )!
+            _ = responder.float2dArrayMethod( arg: reference2dArray )
+
+            if response != reference {
+                NSLog("Float: \(String(describing: response)) != \(reference)")
+            }
+            if responseArray != referenceArray {
+                NSLog("Float: \(responseArray) != \(referenceArray)")
+            }
+        }
+
+
+        if true {
+            let reference: Double = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            let response = responder.doubleMethod( arg: reference )
+            let responseArray = responder.doubleArrayMethod( arg: referenceArray )!
+            _ = responder.double2dArrayMethod( arg: reference2dArray )
+
+            if response != reference {
+                NSLog("Double: \(String(describing: response)) != \(reference)")
+            }
+            if responseArray != referenceArray {
+                NSLog("Double: \(responseArray) != \(referenceArray)")
+            }
+        }
+
+
+        if true {
+            let reference: String = "123"
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            let response = responder.StringMethod( arg: reference )
+            let responseArray = responder.StringArrayMethod( arg: referenceArray )!
+            _ = responder.String2dArrayMethod( arg: reference2dArray )
+
+            if response != reference {
+                NSLog("String: \(String(describing: response)) != \(reference)")
+            }
+            if responseArray != referenceArray {
+                NSLog("String: \(responseArray) != \(referenceArray)")
+            }
+        }
+
+
+        if true {
+            let reference: SwiftHelloTest_TestListener = SwiftTestListener()
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            let response = responder.TestListenerMethod( arg: reference )
+            let responseArray = responder.TestListenerArrayMethod( arg: referenceArray )!
+            _ = responder.TestListener2dArrayMethod( arg: reference2dArray )
+        }
+
+    }
+
+}
diff --git a/com_johnholdsworth/Sources/SwiftHelloTest_SwiftTestListener.swift b/com_johnholdsworth/Sources/SwiftHelloTest_SwiftTestListener.swift
new file mode 100644
index 0000000..e724137
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTest_SwiftTestListener.swift
@@ -0,0 +1,68 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class com.johnholdsworth.swiftbindings.SwiftHelloTest$SwiftTestListener ///
+
+open class SwiftHelloTest_SwiftTestListener: SwiftHelloTest_TestResponderAdapter {
+
+    public convenience init?( casting object: java_swift.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
+        self.init( javaObject: nil )
+        object.withJavaObject {
+            self.javaObject = $0
+        }
+    }
+
+    private static var SwiftHelloTest_SwiftTestListenerJNIClass: jclass?
+
+    /// static int com.johnholdsworth.swiftbindings.SwiftHelloTest$SwiftTestListener.tcount
+
+    // Skipping field: true false false false false false 
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.loopback
+
+    private static var loopback_FieldID: jfieldID?
+
+    override open var loopback: SwiftHelloTest_TestListener! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "loopback", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftHelloTest_SwiftTestListener.loopback_FieldID, object: javaObject )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? SwiftHelloTest_TestListenerForward( javaObject: __value ) : nil
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "loopback", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftHelloTest_SwiftTestListener.loopback_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$SwiftTestListener()
+
+    private static var new_MethodID_1: jmethodID?
+
+    public convenience init() {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __object = JNIMethod.NewObject( className: "com/johnholdsworth/swiftbindings/SwiftHelloTest$SwiftTestListener", classCache: &SwiftHelloTest_SwiftTestListener.SwiftHelloTest_SwiftTestListenerJNIClass, methodSig: "()V", methodCache: &SwiftHelloTest_SwiftTestListener.new_MethodID_1, args: &__args, locals: &__locals )
+        self.init( javaObject: __object )
+        JNI.DeleteLocalRef( __object )
+    }
+
+    /// public void com.johnholdsworth.swiftbindings.SwiftHelloTest$SwiftTestListener.respond(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    private static var respond_MethodID_2: jmethodID?
+
+    open func respond( responder: SwiftHelloTest_TestListener? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: responder, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "respond", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)V", methodCache: &SwiftHelloTest_SwiftTestListener.respond_MethodID_2, args: &__args, locals: &__locals )
+    }
+
+    open func respond( _ _responder: SwiftHelloTest_TestListener? ) {
+        respond( responder: _responder )
+    }
+
+}
+
diff --git a/com_johnholdsworth/Sources/SwiftHelloTest_TestListener.swift b/com_johnholdsworth/Sources/SwiftHelloTest_TestListener.swift
new file mode 100644
index 0000000..d853b49
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTest_TestListener.swift
@@ -0,0 +1,1307 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener ///
+
+public protocol SwiftHelloTest_TestListener: JavaProtocol {
+
+    /// public abstract java.lang.String[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.String2dArrayMethod(java.lang.String[][])
+
+    func String2dArrayMethod( arg: [[String]]? ) -> [[String]]!
+
+    /// public abstract java.lang.String[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.StringArrayMethod(java.lang.String[])
+
+    func StringArrayMethod( arg: [String]? ) -> [String]!
+
+    /// public abstract java.lang.String com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.StringMethod(java.lang.String)
+
+    func StringMethod( arg: String? ) -> String!
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListener2dArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][])
+
+    func TestListener2dArrayMethod( arg: [[SwiftHelloTest_TestListener]]? ) -> [[SwiftHelloTest_TestListener]]!
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListenerArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[])
+
+    func TestListenerArrayMethod( arg: [SwiftHelloTest_TestListener]? ) -> [SwiftHelloTest_TestListener]!
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListenerMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    func TestListenerMethod( arg: SwiftHelloTest_TestListener? ) -> SwiftHelloTest_TestListener!
+
+    /// public abstract boolean[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.boolean2dArrayMethod(boolean[][])
+
+    func boolean2dArrayMethod( arg: [[Bool]]? ) -> [[Bool]]!
+
+    /// public abstract boolean[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.booleanArrayMethod(boolean[])
+
+    func booleanArrayMethod( arg: [Bool]? ) -> [Bool]!
+
+    /// public abstract boolean com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.booleanMethod(boolean)
+
+    func booleanMethod( arg: Bool ) -> Bool
+
+    /// public abstract byte[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byte2dArrayMethod(byte[][])
+
+    func byte2dArrayMethod( arg: [[Int8]]? ) -> [[Int8]]!
+
+    /// public abstract byte[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byteArrayMethod(byte[])
+
+    func byteArrayMethod( arg: [Int8]? ) -> [Int8]!
+
+    /// public abstract byte com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byteMethod(byte)
+
+    func byteMethod( arg: Int8 ) -> Int8
+
+    /// public abstract char[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.char2dArrayMethod(char[][])
+
+    func char2dArrayMethod( arg: [[UInt16]]? ) -> [[UInt16]]!
+
+    /// public abstract char[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.charArrayMethod(char[])
+
+    func charArrayMethod( arg: [UInt16]? ) -> [UInt16]!
+
+    /// public abstract char com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.charMethod(char)
+
+    func charMethod( arg: UInt16 ) -> UInt16
+
+    /// public abstract double[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.double2dArrayMethod(double[][])
+
+    func double2dArrayMethod( arg: [[Double]]? ) -> [[Double]]!
+
+    /// public abstract double[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.doubleArrayMethod(double[])
+
+    func doubleArrayMethod( arg: [Double]? ) -> [Double]!
+
+    /// public abstract double com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.doubleMethod(double)
+
+    func doubleMethod( arg: Double ) -> Double
+
+    /// public abstract float[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.float2dArrayMethod(float[][])
+
+    func float2dArrayMethod( arg: [[Float]]? ) -> [[Float]]!
+
+    /// public abstract float[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.floatArrayMethod(float[])
+
+    func floatArrayMethod( arg: [Float]? ) -> [Float]!
+
+    /// public abstract float com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.floatMethod(float)
+
+    func floatMethod( arg: Float ) -> Float
+
+    /// public abstract int[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.int2dArrayMethod(int[][])
+
+    func int2dArrayMethod( arg: [[Int32]]? ) -> [[Int32]]!
+
+    /// public abstract int[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.intArrayMethod(int[])
+
+    func intArrayMethod( arg: [Int32]? ) -> [Int32]!
+
+    /// public abstract int com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.intMethod(int)
+
+    func intMethod( arg: Int ) -> Int
+
+    /// public abstract long[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.long2dArrayMethod(long[][])
+
+    func long2dArrayMethod( arg: [[Int64]]? ) -> [[Int64]]!
+
+    /// public abstract long[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.longArrayMethod(long[])
+
+    func longArrayMethod( arg: [Int64]? ) -> [Int64]!
+
+    /// public abstract long com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.longMethod(long)
+
+    func longMethod( arg: Int64 ) -> Int64
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.setLoopback(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    func setLoopback( loopback: SwiftHelloTest_TestListener? )
+
+    /// public abstract short[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.short2dArrayMethod(short[][])
+
+    func short2dArrayMethod( arg: [[Int16]]? ) -> [[Int16]]!
+
+    /// public abstract short[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.shortArrayMethod(short[])
+
+    func shortArrayMethod( arg: [Int16]? ) -> [Int16]!
+
+    /// public abstract short com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.shortMethod(short)
+
+    func shortMethod( arg: Int16 ) -> Int16
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.testMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    func testMap( arg: [String:SwiftHelloTypes_TextListener]? ) -> [String:SwiftHelloTypes_TextListener]!
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.testMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    func testMapList( arg: [String:[SwiftHelloTypes_TextListener]]? ) -> [String:[SwiftHelloTypes_TextListener]]!
+
+}
+
+
+open class SwiftHelloTest_TestListenerForward: JNIObjectForward, SwiftHelloTest_TestListener {
+
+    private static var SwiftHelloTest_TestListenerJNIClass: jclass?
+
+    /// public abstract java.lang.String[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.String2dArrayMethod(java.lang.String[][])
+
+    private static var String2dArrayMethod_MethodID_34: jmethodID?
+
+    open func String2dArrayMethod( arg: [[String]]? ) -> [[String]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "String2dArrayMethod", methodSig: "([[Ljava/lang/String;)[[Ljava/lang/String;", methodCache: &SwiftHelloTest_TestListenerForward.String2dArrayMethod_MethodID_34, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[String]].self, from: __return )
+    }
+
+    open func String2dArrayMethod( _ _arg: [[String]]? ) -> [[String]]! {
+        return String2dArrayMethod( arg: _arg )
+    }
+
+    /// public abstract java.lang.String[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.StringArrayMethod(java.lang.String[])
+
+    private static var StringArrayMethod_MethodID_35: jmethodID?
+
+    open func StringArrayMethod( arg: [String]? ) -> [String]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "StringArrayMethod", methodSig: "([Ljava/lang/String;)[Ljava/lang/String;", methodCache: &SwiftHelloTest_TestListenerForward.StringArrayMethod_MethodID_35, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [String].self, from: __return )
+    }
+
+    open func StringArrayMethod( _ _arg: [String]? ) -> [String]! {
+        return StringArrayMethod( arg: _arg )
+    }
+
+    /// public abstract java.lang.String com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.StringMethod(java.lang.String)
+
+    private static var StringMethod_MethodID_36: jmethodID?
+
+    open func StringMethod( arg: String? ) -> String! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "StringMethod", methodSig: "(Ljava/lang/String;)Ljava/lang/String;", methodCache: &SwiftHelloTest_TestListenerForward.StringMethod_MethodID_36, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? String( javaObject: __return ) : nil
+    }
+
+    open func StringMethod( _ _arg: String? ) -> String! {
+        return StringMethod( arg: _arg )
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListener2dArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][])
+
+    private static var TestListener2dArrayMethod_MethodID_37: jmethodID?
+
+    open func TestListener2dArrayMethod( arg: [[SwiftHelloTest_TestListener]]? ) -> [[SwiftHelloTest_TestListener]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "TestListener2dArrayMethod", methodSig: "([[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &SwiftHelloTest_TestListenerForward.TestListener2dArrayMethod_MethodID_37, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[SwiftHelloTest_TestListenerForward]].self, from: __return )
+    }
+
+    open func TestListener2dArrayMethod( _ _arg: [[SwiftHelloTest_TestListener]]? ) -> [[SwiftHelloTest_TestListener]]! {
+        return TestListener2dArrayMethod( arg: _arg )
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListenerArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[])
+
+    private static var TestListenerArrayMethod_MethodID_38: jmethodID?
+
+    open func TestListenerArrayMethod( arg: [SwiftHelloTest_TestListener]? ) -> [SwiftHelloTest_TestListener]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "TestListenerArrayMethod", methodSig: "([Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &SwiftHelloTest_TestListenerForward.TestListenerArrayMethod_MethodID_38, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [SwiftHelloTest_TestListenerForward].self, from: __return )
+    }
+
+    open func TestListenerArrayMethod( _ _arg: [SwiftHelloTest_TestListener]? ) -> [SwiftHelloTest_TestListener]! {
+        return TestListenerArrayMethod( arg: _arg )
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListenerMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    private static var TestListenerMethod_MethodID_39: jmethodID?
+
+    open func TestListenerMethod( arg: SwiftHelloTest_TestListener? ) -> SwiftHelloTest_TestListener! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "TestListenerMethod", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &SwiftHelloTest_TestListenerForward.TestListenerMethod_MethodID_39, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? SwiftHelloTest_TestListenerForward( javaObject: __return ) : nil
+    }
+
+    open func TestListenerMethod( _ _arg: SwiftHelloTest_TestListener? ) -> SwiftHelloTest_TestListener! {
+        return TestListenerMethod( arg: _arg )
+    }
+
+    /// public abstract boolean[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.boolean2dArrayMethod(boolean[][])
+
+    private static var boolean2dArrayMethod_MethodID_40: jmethodID?
+
+    open func boolean2dArrayMethod( arg: [[Bool]]? ) -> [[Bool]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "boolean2dArrayMethod", methodSig: "([[Z)[[Z", methodCache: &SwiftHelloTest_TestListenerForward.boolean2dArrayMethod_MethodID_40, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Bool]].self, from: __return )
+    }
+
+    open func boolean2dArrayMethod( _ _arg: [[Bool]]? ) -> [[Bool]]! {
+        return boolean2dArrayMethod( arg: _arg )
+    }
+
+    /// public abstract boolean[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.booleanArrayMethod(boolean[])
+
+    private static var booleanArrayMethod_MethodID_41: jmethodID?
+
+    open func booleanArrayMethod( arg: [Bool]? ) -> [Bool]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "booleanArrayMethod", methodSig: "([Z)[Z", methodCache: &SwiftHelloTest_TestListenerForward.booleanArrayMethod_MethodID_41, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Bool].self, from: __return )
+    }
+
+    open func booleanArrayMethod( _ _arg: [Bool]? ) -> [Bool]! {
+        return booleanArrayMethod( arg: _arg )
+    }
+
+    /// public abstract boolean com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.booleanMethod(boolean)
+
+    private static var booleanMethod_MethodID_42: jmethodID?
+
+    open func booleanMethod( arg: Bool ) -> Bool {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( z: jboolean(arg ? JNI_TRUE : JNI_FALSE) )
+        let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "booleanMethod", methodSig: "(Z)Z", methodCache: &SwiftHelloTest_TestListenerForward.booleanMethod_MethodID_42, args: &__args, locals: &__locals )
+        return __return != jboolean(JNI_FALSE)
+    }
+
+    open func booleanMethod( _ _arg: Bool ) -> Bool {
+        return booleanMethod( arg: _arg )
+    }
+
+    /// public abstract byte[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byte2dArrayMethod(byte[][])
+
+    private static var byte2dArrayMethod_MethodID_43: jmethodID?
+
+    open func byte2dArrayMethod( arg: [[Int8]]? ) -> [[Int8]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "byte2dArrayMethod", methodSig: "([[B)[[B", methodCache: &SwiftHelloTest_TestListenerForward.byte2dArrayMethod_MethodID_43, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int8]].self, from: __return )
+    }
+
+    open func byte2dArrayMethod( _ _arg: [[Int8]]? ) -> [[Int8]]! {
+        return byte2dArrayMethod( arg: _arg )
+    }
+
+    /// public abstract byte[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byteArrayMethod(byte[])
+
+    private static var byteArrayMethod_MethodID_44: jmethodID?
+
+    open func byteArrayMethod( arg: [Int8]? ) -> [Int8]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "byteArrayMethod", methodSig: "([B)[B", methodCache: &SwiftHelloTest_TestListenerForward.byteArrayMethod_MethodID_44, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int8].self, from: __return )
+    }
+
+    open func byteArrayMethod( _ _arg: [Int8]? ) -> [Int8]! {
+        return byteArrayMethod( arg: _arg )
+    }
+
+    /// public abstract byte com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byteMethod(byte)
+
+    private static var byteMethod_MethodID_45: jmethodID?
+
+    open func byteMethod( arg: Int8 ) -> Int8 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( b: arg )
+        let __return = JNIMethod.CallByteMethod( object: javaObject, methodName: "byteMethod", methodSig: "(B)B", methodCache: &SwiftHelloTest_TestListenerForward.byteMethod_MethodID_45, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func byteMethod( _ _arg: Int8 ) -> Int8 {
+        return byteMethod( arg: _arg )
+    }
+
+    /// public abstract char[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.char2dArrayMethod(char[][])
+
+    private static var char2dArrayMethod_MethodID_46: jmethodID?
+
+    open func char2dArrayMethod( arg: [[UInt16]]? ) -> [[UInt16]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "char2dArrayMethod", methodSig: "([[C)[[C", methodCache: &SwiftHelloTest_TestListenerForward.char2dArrayMethod_MethodID_46, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[UInt16]].self, from: __return )
+    }
+
+    open func char2dArrayMethod( _ _arg: [[UInt16]]? ) -> [[UInt16]]! {
+        return char2dArrayMethod( arg: _arg )
+    }
+
+    /// public abstract char[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.charArrayMethod(char[])
+
+    private static var charArrayMethod_MethodID_47: jmethodID?
+
+    open func charArrayMethod( arg: [UInt16]? ) -> [UInt16]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "charArrayMethod", methodSig: "([C)[C", methodCache: &SwiftHelloTest_TestListenerForward.charArrayMethod_MethodID_47, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [UInt16].self, from: __return )
+    }
+
+    open func charArrayMethod( _ _arg: [UInt16]? ) -> [UInt16]! {
+        return charArrayMethod( arg: _arg )
+    }
+
+    /// public abstract char com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.charMethod(char)
+
+    private static var charMethod_MethodID_48: jmethodID?
+
+    open func charMethod( arg: UInt16 ) -> UInt16 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( c: arg )
+        let __return = JNIMethod.CallCharMethod( object: javaObject, methodName: "charMethod", methodSig: "(C)C", methodCache: &SwiftHelloTest_TestListenerForward.charMethod_MethodID_48, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func charMethod( _ _arg: UInt16 ) -> UInt16 {
+        return charMethod( arg: _arg )
+    }
+
+    /// public abstract double[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.double2dArrayMethod(double[][])
+
+    private static var double2dArrayMethod_MethodID_49: jmethodID?
+
+    open func double2dArrayMethod( arg: [[Double]]? ) -> [[Double]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "double2dArrayMethod", methodSig: "([[D)[[D", methodCache: &SwiftHelloTest_TestListenerForward.double2dArrayMethod_MethodID_49, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Double]].self, from: __return )
+    }
+
+    open func double2dArrayMethod( _ _arg: [[Double]]? ) -> [[Double]]! {
+        return double2dArrayMethod( arg: _arg )
+    }
+
+    /// public abstract double[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.doubleArrayMethod(double[])
+
+    private static var doubleArrayMethod_MethodID_50: jmethodID?
+
+    open func doubleArrayMethod( arg: [Double]? ) -> [Double]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "doubleArrayMethod", methodSig: "([D)[D", methodCache: &SwiftHelloTest_TestListenerForward.doubleArrayMethod_MethodID_50, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Double].self, from: __return )
+    }
+
+    open func doubleArrayMethod( _ _arg: [Double]? ) -> [Double]! {
+        return doubleArrayMethod( arg: _arg )
+    }
+
+    /// public abstract double com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.doubleMethod(double)
+
+    private static var doubleMethod_MethodID_51: jmethodID?
+
+    open func doubleMethod( arg: Double ) -> Double {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( d: arg )
+        let __return = JNIMethod.CallDoubleMethod( object: javaObject, methodName: "doubleMethod", methodSig: "(D)D", methodCache: &SwiftHelloTest_TestListenerForward.doubleMethod_MethodID_51, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func doubleMethod( _ _arg: Double ) -> Double {
+        return doubleMethod( arg: _arg )
+    }
+
+    /// public abstract float[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.float2dArrayMethod(float[][])
+
+    private static var float2dArrayMethod_MethodID_52: jmethodID?
+
+    open func float2dArrayMethod( arg: [[Float]]? ) -> [[Float]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "float2dArrayMethod", methodSig: "([[F)[[F", methodCache: &SwiftHelloTest_TestListenerForward.float2dArrayMethod_MethodID_52, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Float]].self, from: __return )
+    }
+
+    open func float2dArrayMethod( _ _arg: [[Float]]? ) -> [[Float]]! {
+        return float2dArrayMethod( arg: _arg )
+    }
+
+    /// public abstract float[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.floatArrayMethod(float[])
+
+    private static var floatArrayMethod_MethodID_53: jmethodID?
+
+    open func floatArrayMethod( arg: [Float]? ) -> [Float]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "floatArrayMethod", methodSig: "([F)[F", methodCache: &SwiftHelloTest_TestListenerForward.floatArrayMethod_MethodID_53, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Float].self, from: __return )
+    }
+
+    open func floatArrayMethod( _ _arg: [Float]? ) -> [Float]! {
+        return floatArrayMethod( arg: _arg )
+    }
+
+    /// public abstract float com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.floatMethod(float)
+
+    private static var floatMethod_MethodID_54: jmethodID?
+
+    open func floatMethod( arg: Float ) -> Float {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( f: arg )
+        let __return = JNIMethod.CallFloatMethod( object: javaObject, methodName: "floatMethod", methodSig: "(F)F", methodCache: &SwiftHelloTest_TestListenerForward.floatMethod_MethodID_54, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func floatMethod( _ _arg: Float ) -> Float {
+        return floatMethod( arg: _arg )
+    }
+
+    /// public abstract int[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.int2dArrayMethod(int[][])
+
+    private static var int2dArrayMethod_MethodID_55: jmethodID?
+
+    open func int2dArrayMethod( arg: [[Int32]]? ) -> [[Int32]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "int2dArrayMethod", methodSig: "([[I)[[I", methodCache: &SwiftHelloTest_TestListenerForward.int2dArrayMethod_MethodID_55, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int32]].self, from: __return )
+    }
+
+    open func int2dArrayMethod( _ _arg: [[Int32]]? ) -> [[Int32]]! {
+        return int2dArrayMethod( arg: _arg )
+    }
+
+    /// public abstract int[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.intArrayMethod(int[])
+
+    private static var intArrayMethod_MethodID_56: jmethodID?
+
+    open func intArrayMethod( arg: [Int32]? ) -> [Int32]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "intArrayMethod", methodSig: "([I)[I", methodCache: &SwiftHelloTest_TestListenerForward.intArrayMethod_MethodID_56, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int32].self, from: __return )
+    }
+
+    open func intArrayMethod( _ _arg: [Int32]? ) -> [Int32]! {
+        return intArrayMethod( arg: _arg )
+    }
+
+    /// public abstract int com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.intMethod(int)
+
+    private static var intMethod_MethodID_57: jmethodID?
+
+    open func intMethod( arg: Int ) -> Int {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( i: jint(arg) )
+        let __return = JNIMethod.CallIntMethod( object: javaObject, methodName: "intMethod", methodSig: "(I)I", methodCache: &SwiftHelloTest_TestListenerForward.intMethod_MethodID_57, args: &__args, locals: &__locals )
+        return Int(__return)
+    }
+
+    open func intMethod( _ _arg: Int ) -> Int {
+        return intMethod( arg: _arg )
+    }
+
+    /// public abstract long[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.long2dArrayMethod(long[][])
+
+    private static var long2dArrayMethod_MethodID_58: jmethodID?
+
+    open func long2dArrayMethod( arg: [[Int64]]? ) -> [[Int64]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "long2dArrayMethod", methodSig: "([[J)[[J", methodCache: &SwiftHelloTest_TestListenerForward.long2dArrayMethod_MethodID_58, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int64]].self, from: __return )
+    }
+
+    open func long2dArrayMethod( _ _arg: [[Int64]]? ) -> [[Int64]]! {
+        return long2dArrayMethod( arg: _arg )
+    }
+
+    /// public abstract long[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.longArrayMethod(long[])
+
+    private static var longArrayMethod_MethodID_59: jmethodID?
+
+    open func longArrayMethod( arg: [Int64]? ) -> [Int64]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "longArrayMethod", methodSig: "([J)[J", methodCache: &SwiftHelloTest_TestListenerForward.longArrayMethod_MethodID_59, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int64].self, from: __return )
+    }
+
+    open func longArrayMethod( _ _arg: [Int64]? ) -> [Int64]! {
+        return longArrayMethod( arg: _arg )
+    }
+
+    /// public abstract long com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.longMethod(long)
+
+    private static var longMethod_MethodID_60: jmethodID?
+
+    open func longMethod( arg: Int64 ) -> Int64 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( j: arg )
+        let __return = JNIMethod.CallLongMethod( object: javaObject, methodName: "longMethod", methodSig: "(J)J", methodCache: &SwiftHelloTest_TestListenerForward.longMethod_MethodID_60, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func longMethod( _ _arg: Int64 ) -> Int64 {
+        return longMethod( arg: _arg )
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.setLoopback(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    private static var setLoopback_MethodID_61: jmethodID?
+
+    open func setLoopback( loopback: SwiftHelloTest_TestListener? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: loopback, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "setLoopback", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)V", methodCache: &SwiftHelloTest_TestListenerForward.setLoopback_MethodID_61, args: &__args, locals: &__locals )
+    }
+
+    open func setLoopback( _ _loopback: SwiftHelloTest_TestListener? ) {
+        setLoopback( loopback: _loopback )
+    }
+
+    /// public abstract short[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.short2dArrayMethod(short[][])
+
+    private static var short2dArrayMethod_MethodID_62: jmethodID?
+
+    open func short2dArrayMethod( arg: [[Int16]]? ) -> [[Int16]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "short2dArrayMethod", methodSig: "([[S)[[S", methodCache: &SwiftHelloTest_TestListenerForward.short2dArrayMethod_MethodID_62, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int16]].self, from: __return )
+    }
+
+    open func short2dArrayMethod( _ _arg: [[Int16]]? ) -> [[Int16]]! {
+        return short2dArrayMethod( arg: _arg )
+    }
+
+    /// public abstract short[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.shortArrayMethod(short[])
+
+    private static var shortArrayMethod_MethodID_63: jmethodID?
+
+    open func shortArrayMethod( arg: [Int16]? ) -> [Int16]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "shortArrayMethod", methodSig: "([S)[S", methodCache: &SwiftHelloTest_TestListenerForward.shortArrayMethod_MethodID_63, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int16].self, from: __return )
+    }
+
+    open func shortArrayMethod( _ _arg: [Int16]? ) -> [Int16]! {
+        return shortArrayMethod( arg: _arg )
+    }
+
+    /// public abstract short com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.shortMethod(short)
+
+    private static var shortMethod_MethodID_64: jmethodID?
+
+    open func shortMethod( arg: Int16 ) -> Int16 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( s: arg )
+        let __return = JNIMethod.CallShortMethod( object: javaObject, methodName: "shortMethod", methodSig: "(S)S", methodCache: &SwiftHelloTest_TestListenerForward.shortMethod_MethodID_64, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func shortMethod( _ _arg: Int16 ) -> Int16 {
+        return shortMethod( arg: _arg )
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.testMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    private static var testMap_MethodID_65: jmethodID?
+
+    open func testMap( arg: [String:SwiftHelloTypes_TextListener]? ) -> [String:SwiftHelloTypes_TextListener]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap", locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "testMap", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap;", methodCache: &SwiftHelloTest_TestListenerForward.testMap_MethodID_65, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [String:SwiftHelloTypes_TextListenerForward].self, from: __return )
+    }
+
+    open func testMap( _ _arg: [String:SwiftHelloTypes_TextListener]? ) -> [String:SwiftHelloTypes_TextListener]! {
+        return testMap( arg: _arg )
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.testMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    private static var testMapList_MethodID_66: jmethodID?
+
+    open func testMapList( arg: [String:[SwiftHelloTypes_TextListener]]? ) -> [String:[SwiftHelloTypes_TextListener]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList", locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "testMapList", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList;", methodCache: &SwiftHelloTest_TestListenerForward.testMapList_MethodID_66, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [String:[SwiftHelloTypes_TextListenerForward]].self, from: __return )
+    }
+
+    open func testMapList( _ _arg: [String:[SwiftHelloTypes_TextListener]]? ) -> [String:[SwiftHelloTypes_TextListener]]! {
+        return testMapList( arg: _arg )
+    }
+
+}
+
+private typealias SwiftHelloTest_TestListener_String2dArrayMethod_0_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_String2dArrayMethod_0( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).String2dArrayMethod( arg: JNIType.toSwift( type: [[String]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_StringArrayMethod_1_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_StringArrayMethod_1( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).StringArrayMethod( arg: JNIType.toSwift( type: [String].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_StringMethod_2_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_StringMethod_2( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).StringMethod( arg: arg != nil ? String( javaObject: arg ) : nil )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_TestListener2dArrayMethod_3_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_TestListener2dArrayMethod_3( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).TestListener2dArrayMethod( arg: JNIType.toSwift( type: [[SwiftHelloTest_TestListenerForward]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_TestListenerArrayMethod_4_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_TestListenerArrayMethod_4( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).TestListenerArrayMethod( arg: JNIType.toSwift( type: [SwiftHelloTest_TestListenerForward].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_TestListenerMethod_5_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_TestListenerMethod_5( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).TestListenerMethod( arg: arg != nil ? SwiftHelloTest_TestListenerForward( javaObject: arg ) : nil )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_boolean2dArrayMethod_6_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_boolean2dArrayMethod_6( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).boolean2dArrayMethod( arg: JNIType.toSwift( type: [[Bool]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_booleanArrayMethod_7_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_booleanArrayMethod_7( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).booleanArrayMethod( arg: JNIType.toSwift( type: [Bool].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_booleanMethod_8_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jboolean ) -> jboolean
+
+private func SwiftHelloTest_TestListener_booleanMethod_8( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jboolean ) -> jboolean {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).booleanMethod( arg: arg != jboolean(JNI_FALSE) )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( z: jboolean(__return ? JNI_TRUE : JNI_FALSE) ).z, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_byte2dArrayMethod_9_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_byte2dArrayMethod_9( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).byte2dArrayMethod( arg: JNIType.toSwift( type: [[Int8]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_byteArrayMethod_10_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_byteArrayMethod_10( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).byteArrayMethod( arg: JNIType.toSwift( type: [Int8].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_byteMethod_11_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jbyte ) -> jbyte
+
+private func SwiftHelloTest_TestListener_byteMethod_11( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jbyte ) -> jbyte {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).byteMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( b: __return ).b, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_char2dArrayMethod_12_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_char2dArrayMethod_12( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).char2dArrayMethod( arg: JNIType.toSwift( type: [[UInt16]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_charArrayMethod_13_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_charArrayMethod_13( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).charArrayMethod( arg: JNIType.toSwift( type: [UInt16].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_charMethod_14_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jchar ) -> jchar
+
+private func SwiftHelloTest_TestListener_charMethod_14( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jchar ) -> jchar {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).charMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( c: __return ).c, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_double2dArrayMethod_15_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_double2dArrayMethod_15( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).double2dArrayMethod( arg: JNIType.toSwift( type: [[Double]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_doubleArrayMethod_16_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_doubleArrayMethod_16( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).doubleArrayMethod( arg: JNIType.toSwift( type: [Double].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_doubleMethod_17_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jdouble ) -> jdouble
+
+private func SwiftHelloTest_TestListener_doubleMethod_17( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jdouble ) -> jdouble {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).doubleMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( d: __return ).d, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_float2dArrayMethod_18_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_float2dArrayMethod_18( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).float2dArrayMethod( arg: JNIType.toSwift( type: [[Float]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_floatArrayMethod_19_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_floatArrayMethod_19( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).floatArrayMethod( arg: JNIType.toSwift( type: [Float].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_floatMethod_20_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jfloat ) -> jfloat
+
+private func SwiftHelloTest_TestListener_floatMethod_20( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jfloat ) -> jfloat {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).floatMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( f: __return ).f, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_int2dArrayMethod_21_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_int2dArrayMethod_21( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).int2dArrayMethod( arg: JNIType.toSwift( type: [[Int32]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_intArrayMethod_22_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_intArrayMethod_22( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).intArrayMethod( arg: JNIType.toSwift( type: [Int32].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_intMethod_23_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jint ) -> jint
+
+private func SwiftHelloTest_TestListener_intMethod_23( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jint ) -> jint {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).intMethod( arg: Int(arg) )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( i: jint(__return) ).i, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_long2dArrayMethod_24_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_long2dArrayMethod_24( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).long2dArrayMethod( arg: JNIType.toSwift( type: [[Int64]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_longArrayMethod_25_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_longArrayMethod_25( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).longArrayMethod( arg: JNIType.toSwift( type: [Int64].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_longMethod_26_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jlong ) -> jlong
+
+private func SwiftHelloTest_TestListener_longMethod_26( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jlong ) -> jlong {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).longMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( j: __return ).j, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_setLoopback_27_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> ()
+
+private func SwiftHelloTest_TestListener_setLoopback_27( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ loopback: jobject? ) -> () {
+    SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).setLoopback( loopback: loopback != nil ? SwiftHelloTest_TestListenerForward( javaObject: loopback ) : nil )
+}
+
+private typealias SwiftHelloTest_TestListener_short2dArrayMethod_28_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_short2dArrayMethod_28( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).short2dArrayMethod( arg: JNIType.toSwift( type: [[Int16]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_shortArrayMethod_29_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_shortArrayMethod_29( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).shortArrayMethod( arg: JNIType.toSwift( type: [Int16].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_shortMethod_30_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jshort ) -> jshort
+
+private func SwiftHelloTest_TestListener_shortMethod_30( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jshort ) -> jshort {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).shortMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( s: __return ).s, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_testMap_31_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_testMap_31( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).testMap( arg: JNIType.toSwift( type: [String:SwiftHelloTypes_TextListenerForward].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap", locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestListener_testMapList_32_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestListener_testMapList_32( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).testMapList( arg: JNIType.toSwift( type: [String:[SwiftHelloTypes_TextListenerForward]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList", locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+fileprivate class SwiftHelloTest_TestListenerLocal_: JNILocalProxy<SwiftHelloTest_TestListener, Any> {
+
+    fileprivate static let _proxyClass: jclass = {
+        var natives = [JNINativeMethod]()
+
+        let SwiftHelloTest_TestListener_String2dArrayMethod_0_thunk: SwiftHelloTest_TestListener_String2dArrayMethod_0_type = SwiftHelloTest_TestListener_String2dArrayMethod_0
+        natives.append( JNINativeMethod( name: strdup("__String2dArrayMethod"), signature: strdup("(J[[Ljava/lang/String;)[[Ljava/lang/String;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_String2dArrayMethod_0_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_StringArrayMethod_1_thunk: SwiftHelloTest_TestListener_StringArrayMethod_1_type = SwiftHelloTest_TestListener_StringArrayMethod_1
+        natives.append( JNINativeMethod( name: strdup("__StringArrayMethod"), signature: strdup("(J[Ljava/lang/String;)[Ljava/lang/String;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_StringArrayMethod_1_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_StringMethod_2_thunk: SwiftHelloTest_TestListener_StringMethod_2_type = SwiftHelloTest_TestListener_StringMethod_2
+        natives.append( JNINativeMethod( name: strdup("__StringMethod"), signature: strdup("(JLjava/lang/String;)Ljava/lang/String;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_StringMethod_2_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_TestListener2dArrayMethod_3_thunk: SwiftHelloTest_TestListener_TestListener2dArrayMethod_3_type = SwiftHelloTest_TestListener_TestListener2dArrayMethod_3
+        natives.append( JNINativeMethod( name: strdup("__TestListener2dArrayMethod"), signature: strdup("(J[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_TestListener2dArrayMethod_3_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_TestListenerArrayMethod_4_thunk: SwiftHelloTest_TestListener_TestListenerArrayMethod_4_type = SwiftHelloTest_TestListener_TestListenerArrayMethod_4
+        natives.append( JNINativeMethod( name: strdup("__TestListenerArrayMethod"), signature: strdup("(J[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_TestListenerArrayMethod_4_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_TestListenerMethod_5_thunk: SwiftHelloTest_TestListener_TestListenerMethod_5_type = SwiftHelloTest_TestListener_TestListenerMethod_5
+        natives.append( JNINativeMethod( name: strdup("__TestListenerMethod"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_TestListenerMethod_5_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_boolean2dArrayMethod_6_thunk: SwiftHelloTest_TestListener_boolean2dArrayMethod_6_type = SwiftHelloTest_TestListener_boolean2dArrayMethod_6
+        natives.append( JNINativeMethod( name: strdup("__boolean2dArrayMethod"), signature: strdup("(J[[Z)[[Z"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_boolean2dArrayMethod_6_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_booleanArrayMethod_7_thunk: SwiftHelloTest_TestListener_booleanArrayMethod_7_type = SwiftHelloTest_TestListener_booleanArrayMethod_7
+        natives.append( JNINativeMethod( name: strdup("__booleanArrayMethod"), signature: strdup("(J[Z)[Z"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_booleanArrayMethod_7_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_booleanMethod_8_thunk: SwiftHelloTest_TestListener_booleanMethod_8_type = SwiftHelloTest_TestListener_booleanMethod_8
+        natives.append( JNINativeMethod( name: strdup("__booleanMethod"), signature: strdup("(JZ)Z"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_booleanMethod_8_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_byte2dArrayMethod_9_thunk: SwiftHelloTest_TestListener_byte2dArrayMethod_9_type = SwiftHelloTest_TestListener_byte2dArrayMethod_9
+        natives.append( JNINativeMethod( name: strdup("__byte2dArrayMethod"), signature: strdup("(J[[B)[[B"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_byte2dArrayMethod_9_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_byteArrayMethod_10_thunk: SwiftHelloTest_TestListener_byteArrayMethod_10_type = SwiftHelloTest_TestListener_byteArrayMethod_10
+        natives.append( JNINativeMethod( name: strdup("__byteArrayMethod"), signature: strdup("(J[B)[B"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_byteArrayMethod_10_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_byteMethod_11_thunk: SwiftHelloTest_TestListener_byteMethod_11_type = SwiftHelloTest_TestListener_byteMethod_11
+        natives.append( JNINativeMethod( name: strdup("__byteMethod"), signature: strdup("(JB)B"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_byteMethod_11_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_char2dArrayMethod_12_thunk: SwiftHelloTest_TestListener_char2dArrayMethod_12_type = SwiftHelloTest_TestListener_char2dArrayMethod_12
+        natives.append( JNINativeMethod( name: strdup("__char2dArrayMethod"), signature: strdup("(J[[C)[[C"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_char2dArrayMethod_12_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_charArrayMethod_13_thunk: SwiftHelloTest_TestListener_charArrayMethod_13_type = SwiftHelloTest_TestListener_charArrayMethod_13
+        natives.append( JNINativeMethod( name: strdup("__charArrayMethod"), signature: strdup("(J[C)[C"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_charArrayMethod_13_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_charMethod_14_thunk: SwiftHelloTest_TestListener_charMethod_14_type = SwiftHelloTest_TestListener_charMethod_14
+        natives.append( JNINativeMethod( name: strdup("__charMethod"), signature: strdup("(JC)C"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_charMethod_14_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_double2dArrayMethod_15_thunk: SwiftHelloTest_TestListener_double2dArrayMethod_15_type = SwiftHelloTest_TestListener_double2dArrayMethod_15
+        natives.append( JNINativeMethod( name: strdup("__double2dArrayMethod"), signature: strdup("(J[[D)[[D"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_double2dArrayMethod_15_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_doubleArrayMethod_16_thunk: SwiftHelloTest_TestListener_doubleArrayMethod_16_type = SwiftHelloTest_TestListener_doubleArrayMethod_16
+        natives.append( JNINativeMethod( name: strdup("__doubleArrayMethod"), signature: strdup("(J[D)[D"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_doubleArrayMethod_16_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_doubleMethod_17_thunk: SwiftHelloTest_TestListener_doubleMethod_17_type = SwiftHelloTest_TestListener_doubleMethod_17
+        natives.append( JNINativeMethod( name: strdup("__doubleMethod"), signature: strdup("(JD)D"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_doubleMethod_17_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_float2dArrayMethod_18_thunk: SwiftHelloTest_TestListener_float2dArrayMethod_18_type = SwiftHelloTest_TestListener_float2dArrayMethod_18
+        natives.append( JNINativeMethod( name: strdup("__float2dArrayMethod"), signature: strdup("(J[[F)[[F"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_float2dArrayMethod_18_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_floatArrayMethod_19_thunk: SwiftHelloTest_TestListener_floatArrayMethod_19_type = SwiftHelloTest_TestListener_floatArrayMethod_19
+        natives.append( JNINativeMethod( name: strdup("__floatArrayMethod"), signature: strdup("(J[F)[F"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_floatArrayMethod_19_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_floatMethod_20_thunk: SwiftHelloTest_TestListener_floatMethod_20_type = SwiftHelloTest_TestListener_floatMethod_20
+        natives.append( JNINativeMethod( name: strdup("__floatMethod"), signature: strdup("(JF)F"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_floatMethod_20_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_int2dArrayMethod_21_thunk: SwiftHelloTest_TestListener_int2dArrayMethod_21_type = SwiftHelloTest_TestListener_int2dArrayMethod_21
+        natives.append( JNINativeMethod( name: strdup("__int2dArrayMethod"), signature: strdup("(J[[I)[[I"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_int2dArrayMethod_21_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_intArrayMethod_22_thunk: SwiftHelloTest_TestListener_intArrayMethod_22_type = SwiftHelloTest_TestListener_intArrayMethod_22
+        natives.append( JNINativeMethod( name: strdup("__intArrayMethod"), signature: strdup("(J[I)[I"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_intArrayMethod_22_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_intMethod_23_thunk: SwiftHelloTest_TestListener_intMethod_23_type = SwiftHelloTest_TestListener_intMethod_23
+        natives.append( JNINativeMethod( name: strdup("__intMethod"), signature: strdup("(JI)I"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_intMethod_23_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_long2dArrayMethod_24_thunk: SwiftHelloTest_TestListener_long2dArrayMethod_24_type = SwiftHelloTest_TestListener_long2dArrayMethod_24
+        natives.append( JNINativeMethod( name: strdup("__long2dArrayMethod"), signature: strdup("(J[[J)[[J"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_long2dArrayMethod_24_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_longArrayMethod_25_thunk: SwiftHelloTest_TestListener_longArrayMethod_25_type = SwiftHelloTest_TestListener_longArrayMethod_25
+        natives.append( JNINativeMethod( name: strdup("__longArrayMethod"), signature: strdup("(J[J)[J"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_longArrayMethod_25_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_longMethod_26_thunk: SwiftHelloTest_TestListener_longMethod_26_type = SwiftHelloTest_TestListener_longMethod_26
+        natives.append( JNINativeMethod( name: strdup("__longMethod"), signature: strdup("(JJ)J"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_longMethod_26_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_setLoopback_27_thunk: SwiftHelloTest_TestListener_setLoopback_27_type = SwiftHelloTest_TestListener_setLoopback_27
+        natives.append( JNINativeMethod( name: strdup("__setLoopback"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)V"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_setLoopback_27_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_short2dArrayMethod_28_thunk: SwiftHelloTest_TestListener_short2dArrayMethod_28_type = SwiftHelloTest_TestListener_short2dArrayMethod_28
+        natives.append( JNINativeMethod( name: strdup("__short2dArrayMethod"), signature: strdup("(J[[S)[[S"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_short2dArrayMethod_28_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_shortArrayMethod_29_thunk: SwiftHelloTest_TestListener_shortArrayMethod_29_type = SwiftHelloTest_TestListener_shortArrayMethod_29
+        natives.append( JNINativeMethod( name: strdup("__shortArrayMethod"), signature: strdup("(J[S)[S"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_shortArrayMethod_29_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_shortMethod_30_thunk: SwiftHelloTest_TestListener_shortMethod_30_type = SwiftHelloTest_TestListener_shortMethod_30
+        natives.append( JNINativeMethod( name: strdup("__shortMethod"), signature: strdup("(JS)S"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_shortMethod_30_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_testMap_31_thunk: SwiftHelloTest_TestListener_testMap_31_type = SwiftHelloTest_TestListener_testMap_31
+        natives.append( JNINativeMethod( name: strdup("__testMap"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_testMap_31_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestListener_testMapList_32_thunk: SwiftHelloTest_TestListener_testMapList_32_type = SwiftHelloTest_TestListener_testMapList_32
+        natives.append( JNINativeMethod( name: strdup("__testMapList"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestListener_testMapList_32_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        natives.append( JNINativeMethod( name: strdup("__finalize"), signature: strdup("(J)V"), fnPtr: unsafeBitCast( JNIReleasableProxy__finalize_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let clazz = JNI.FindClass( proxyClassName() )
+        withUnsafePointer(to: &natives[0]) {
+            nativesPtr in
+            if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr, jint(natives.count) ) != jint(JNI_OK) {
+                JNI.report( "Unable to register java natives" )
+            }
+        }
+
+        defer { JNI.DeleteLocalRef( clazz ) }
+        return JNI.api.NewGlobalRef( JNI.env, clazz )!
+    }()
+
+    override open class func proxyClassName() -> String { return "org/swiftjava/com_johnholdsworth/SwiftHelloTest_TestListenerProxy" }
+    override open class func proxyClass() -> jclass? { return _proxyClass }
+
+}
+
+extension SwiftHelloTest_TestListener {
+
+    public func localJavaObject( _ locals: UnsafeMutablePointer<[jobject]> ) -> jobject? {
+        return SwiftHelloTest_TestListenerLocal_( owned: self, proto: self ).localJavaObject( locals )
+    }
+
+}
+
+open class SwiftHelloTest_TestListenerBase: SwiftHelloTest_TestListener {
+
+    public init() {}
+
+    /// public abstract java.lang.String[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.String2dArrayMethod(java.lang.String[][])
+
+    open func String2dArrayMethod( arg: [[String]]? ) -> [[String]]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract java.lang.String[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.StringArrayMethod(java.lang.String[])
+
+    open func StringArrayMethod( arg: [String]? ) -> [String]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract java.lang.String com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.StringMethod(java.lang.String)
+
+    open func StringMethod( arg: String? ) -> String! /**/ {
+        return nil
+    }
+
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListener2dArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][])
+
+    open func TestListener2dArrayMethod( arg: [[SwiftHelloTest_TestListener]]? ) -> [[SwiftHelloTest_TestListener]]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListenerArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[])
+
+    open func TestListenerArrayMethod( arg: [SwiftHelloTest_TestListener]? ) -> [SwiftHelloTest_TestListener]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListenerMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    open func TestListenerMethod( arg: SwiftHelloTest_TestListener? ) -> SwiftHelloTest_TestListener! /**/ {
+        return nil
+    }
+
+
+    /// public abstract boolean[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.boolean2dArrayMethod(boolean[][])
+
+    open func boolean2dArrayMethod( arg: [[Bool]]? ) -> [[Bool]]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract boolean[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.booleanArrayMethod(boolean[])
+
+    open func booleanArrayMethod( arg: [Bool]? ) -> [Bool]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract boolean com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.booleanMethod(boolean)
+
+    open func booleanMethod( arg: Bool ) -> Bool /**/ {
+        return false
+    }
+
+
+    /// public abstract byte[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byte2dArrayMethod(byte[][])
+
+    open func byte2dArrayMethod( arg: [[Int8]]? ) -> [[Int8]]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract byte[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byteArrayMethod(byte[])
+
+    open func byteArrayMethod( arg: [Int8]? ) -> [Int8]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract byte com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byteMethod(byte)
+
+    open func byteMethod( arg: Int8 ) -> Int8 /**/ {
+        return 0
+    }
+
+
+    /// public abstract char[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.char2dArrayMethod(char[][])
+
+    open func char2dArrayMethod( arg: [[UInt16]]? ) -> [[UInt16]]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract char[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.charArrayMethod(char[])
+
+    open func charArrayMethod( arg: [UInt16]? ) -> [UInt16]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract char com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.charMethod(char)
+
+    open func charMethod( arg: UInt16 ) -> UInt16 /**/ {
+        return 0
+    }
+
+
+    /// public abstract double[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.double2dArrayMethod(double[][])
+
+    open func double2dArrayMethod( arg: [[Double]]? ) -> [[Double]]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract double[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.doubleArrayMethod(double[])
+
+    open func doubleArrayMethod( arg: [Double]? ) -> [Double]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract double com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.doubleMethod(double)
+
+    open func doubleMethod( arg: Double ) -> Double /**/ {
+        return 0
+    }
+
+
+    /// public abstract float[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.float2dArrayMethod(float[][])
+
+    open func float2dArrayMethod( arg: [[Float]]? ) -> [[Float]]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract float[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.floatArrayMethod(float[])
+
+    open func floatArrayMethod( arg: [Float]? ) -> [Float]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract float com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.floatMethod(float)
+
+    open func floatMethod( arg: Float ) -> Float /**/ {
+        return 0
+    }
+
+
+    /// public abstract int[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.int2dArrayMethod(int[][])
+
+    open func int2dArrayMethod( arg: [[Int32]]? ) -> [[Int32]]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract int[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.intArrayMethod(int[])
+
+    open func intArrayMethod( arg: [Int32]? ) -> [Int32]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract int com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.intMethod(int)
+
+    open func intMethod( arg: Int ) -> Int /**/ {
+        return 0
+    }
+
+
+    /// public abstract long[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.long2dArrayMethod(long[][])
+
+    open func long2dArrayMethod( arg: [[Int64]]? ) -> [[Int64]]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract long[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.longArrayMethod(long[])
+
+    open func longArrayMethod( arg: [Int64]? ) -> [Int64]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract long com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.longMethod(long)
+
+    open func longMethod( arg: Int64 ) -> Int64 /**/ {
+        return 0
+    }
+
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.setLoopback(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    open func setLoopback( loopback: SwiftHelloTest_TestListener? ) /**/ {
+    }
+
+
+    /// public abstract short[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.short2dArrayMethod(short[][])
+
+    open func short2dArrayMethod( arg: [[Int16]]? ) -> [[Int16]]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract short[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.shortArrayMethod(short[])
+
+    open func shortArrayMethod( arg: [Int16]? ) -> [Int16]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract short com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.shortMethod(short)
+
+    open func shortMethod( arg: Int16 ) -> Int16 /**/ {
+        return 0
+    }
+
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.testMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    open func testMap( arg: [String:SwiftHelloTypes_TextListener]? ) -> [String:SwiftHelloTypes_TextListener]! /**/ {
+        return nil
+    }
+
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.testMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    open func testMapList( arg: [String:[SwiftHelloTypes_TextListener]]? ) -> [String:[SwiftHelloTypes_TextListener]]! /**/ {
+        return nil
+    }
+
+
+}
diff --git a/com_johnholdsworth/Sources/SwiftHelloTest_TestResponderAdapter.swift b/com_johnholdsworth/Sources/SwiftHelloTest_TestResponderAdapter.swift
new file mode 100644
index 0000000..ecd9a5e
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTest_TestResponderAdapter.swift
@@ -0,0 +1,1030 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter ///
+
+open class SwiftHelloTest_TestResponderAdapter: java_swift.JavaObject, SwiftHelloTest_TestListener {
+
+    public convenience init?( casting object: java_swift.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
+        self.init( javaObject: nil )
+        object.withJavaObject {
+            self.javaObject = $0
+        }
+    }
+
+    private static var SwiftHelloTest_TestResponderAdapterJNIClass: jclass?
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.loopback
+
+    private static var loopback_FieldID: jfieldID?
+
+    open var loopback: SwiftHelloTest_TestListener! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "loopback", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftHelloTest_TestResponderAdapter.loopback_FieldID, object: javaObject )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? SwiftHelloTest_TestListenerForward( javaObject: __value ) : nil
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "loopback", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftHelloTest_TestResponderAdapter.loopback_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter()
+
+    private static var new_MethodID_1: jmethodID?
+
+    public convenience init() {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __object = JNIMethod.NewObject( className: "com/johnholdsworth/swiftbindings/SwiftHelloTest$TestResponderAdapter", classCache: &SwiftHelloTest_TestResponderAdapter.SwiftHelloTest_TestResponderAdapterJNIClass, methodSig: "()V", methodCache: &SwiftHelloTest_TestResponderAdapter.new_MethodID_1, args: &__args, locals: &__locals )
+        self.init( javaObject: __object )
+        JNI.DeleteLocalRef( __object )
+    }
+
+    /// public java.lang.String[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.String2dArrayMethod(java.lang.String[][])
+
+    private static var String2dArrayMethod_MethodID_2: jmethodID?
+
+    open func String2dArrayMethod( arg: [[String]]? ) -> [[String]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "String2dArrayMethod", methodSig: "([[Ljava/lang/String;)[[Ljava/lang/String;", methodCache: &SwiftHelloTest_TestResponderAdapter.String2dArrayMethod_MethodID_2, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[String]].self, from: __return )
+    }
+
+    open func String2dArrayMethod( _ _arg: [[String]]? ) -> [[String]]! {
+        return String2dArrayMethod( arg: _arg )
+    }
+
+    /// public java.lang.String[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.StringArrayMethod(java.lang.String[])
+
+    private static var StringArrayMethod_MethodID_3: jmethodID?
+
+    open func StringArrayMethod( arg: [String]? ) -> [String]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "StringArrayMethod", methodSig: "([Ljava/lang/String;)[Ljava/lang/String;", methodCache: &SwiftHelloTest_TestResponderAdapter.StringArrayMethod_MethodID_3, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [String].self, from: __return )
+    }
+
+    open func StringArrayMethod( _ _arg: [String]? ) -> [String]! {
+        return StringArrayMethod( arg: _arg )
+    }
+
+    /// public java.lang.String com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.StringMethod(java.lang.String)
+
+    private static var StringMethod_MethodID_4: jmethodID?
+
+    open func StringMethod( arg: String? ) -> String! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "StringMethod", methodSig: "(Ljava/lang/String;)Ljava/lang/String;", methodCache: &SwiftHelloTest_TestResponderAdapter.StringMethod_MethodID_4, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? String( javaObject: __return ) : nil
+    }
+
+    open func StringMethod( _ _arg: String? ) -> String! {
+        return StringMethod( arg: _arg )
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.TestListener2dArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][])
+
+    private static var TestListener2dArrayMethod_MethodID_5: jmethodID?
+
+    open func TestListener2dArrayMethod( arg: [[SwiftHelloTest_TestListener]]? ) -> [[SwiftHelloTest_TestListener]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "TestListener2dArrayMethod", methodSig: "([[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &SwiftHelloTest_TestResponderAdapter.TestListener2dArrayMethod_MethodID_5, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[SwiftHelloTest_TestListenerForward]].self, from: __return )
+    }
+
+    open func TestListener2dArrayMethod( _ _arg: [[SwiftHelloTest_TestListener]]? ) -> [[SwiftHelloTest_TestListener]]! {
+        return TestListener2dArrayMethod( arg: _arg )
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.TestListenerArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[])
+
+    private static var TestListenerArrayMethod_MethodID_6: jmethodID?
+
+    open func TestListenerArrayMethod( arg: [SwiftHelloTest_TestListener]? ) -> [SwiftHelloTest_TestListener]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "TestListenerArrayMethod", methodSig: "([Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &SwiftHelloTest_TestResponderAdapter.TestListenerArrayMethod_MethodID_6, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [SwiftHelloTest_TestListenerForward].self, from: __return )
+    }
+
+    open func TestListenerArrayMethod( _ _arg: [SwiftHelloTest_TestListener]? ) -> [SwiftHelloTest_TestListener]! {
+        return TestListenerArrayMethod( arg: _arg )
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.TestListenerMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    private static var TestListenerMethod_MethodID_7: jmethodID?
+
+    open func TestListenerMethod( arg: SwiftHelloTest_TestListener? ) -> SwiftHelloTest_TestListener! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "TestListenerMethod", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &SwiftHelloTest_TestResponderAdapter.TestListenerMethod_MethodID_7, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? SwiftHelloTest_TestListenerForward( javaObject: __return ) : nil
+    }
+
+    open func TestListenerMethod( _ _arg: SwiftHelloTest_TestListener? ) -> SwiftHelloTest_TestListener! {
+        return TestListenerMethod( arg: _arg )
+    }
+
+    /// public boolean[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.boolean2dArrayMethod(boolean[][])
+
+    private static var boolean2dArrayMethod_MethodID_8: jmethodID?
+
+    open func boolean2dArrayMethod( arg: [[Bool]]? ) -> [[Bool]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "boolean2dArrayMethod", methodSig: "([[Z)[[Z", methodCache: &SwiftHelloTest_TestResponderAdapter.boolean2dArrayMethod_MethodID_8, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Bool]].self, from: __return )
+    }
+
+    open func boolean2dArrayMethod( _ _arg: [[Bool]]? ) -> [[Bool]]! {
+        return boolean2dArrayMethod( arg: _arg )
+    }
+
+    /// public boolean[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.booleanArrayMethod(boolean[])
+
+    private static var booleanArrayMethod_MethodID_9: jmethodID?
+
+    open func booleanArrayMethod( arg: [Bool]? ) -> [Bool]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "booleanArrayMethod", methodSig: "([Z)[Z", methodCache: &SwiftHelloTest_TestResponderAdapter.booleanArrayMethod_MethodID_9, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Bool].self, from: __return )
+    }
+
+    open func booleanArrayMethod( _ _arg: [Bool]? ) -> [Bool]! {
+        return booleanArrayMethod( arg: _arg )
+    }
+
+    /// public boolean com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.booleanMethod(boolean)
+
+    private static var booleanMethod_MethodID_10: jmethodID?
+
+    open func booleanMethod( arg: Bool ) -> Bool {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( z: jboolean(arg ? JNI_TRUE : JNI_FALSE) )
+        let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "booleanMethod", methodSig: "(Z)Z", methodCache: &SwiftHelloTest_TestResponderAdapter.booleanMethod_MethodID_10, args: &__args, locals: &__locals )
+        return __return != jboolean(JNI_FALSE)
+    }
+
+    open func booleanMethod( _ _arg: Bool ) -> Bool {
+        return booleanMethod( arg: _arg )
+    }
+
+    /// public byte[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.byte2dArrayMethod(byte[][])
+
+    private static var byte2dArrayMethod_MethodID_11: jmethodID?
+
+    open func byte2dArrayMethod( arg: [[Int8]]? ) -> [[Int8]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "byte2dArrayMethod", methodSig: "([[B)[[B", methodCache: &SwiftHelloTest_TestResponderAdapter.byte2dArrayMethod_MethodID_11, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int8]].self, from: __return )
+    }
+
+    open func byte2dArrayMethod( _ _arg: [[Int8]]? ) -> [[Int8]]! {
+        return byte2dArrayMethod( arg: _arg )
+    }
+
+    /// public byte[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.byteArrayMethod(byte[])
+
+    private static var byteArrayMethod_MethodID_12: jmethodID?
+
+    open func byteArrayMethod( arg: [Int8]? ) -> [Int8]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "byteArrayMethod", methodSig: "([B)[B", methodCache: &SwiftHelloTest_TestResponderAdapter.byteArrayMethod_MethodID_12, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int8].self, from: __return )
+    }
+
+    open func byteArrayMethod( _ _arg: [Int8]? ) -> [Int8]! {
+        return byteArrayMethod( arg: _arg )
+    }
+
+    /// public byte com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.byteMethod(byte)
+
+    private static var byteMethod_MethodID_13: jmethodID?
+
+    open func byteMethod( arg: Int8 ) -> Int8 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( b: arg )
+        let __return = JNIMethod.CallByteMethod( object: javaObject, methodName: "byteMethod", methodSig: "(B)B", methodCache: &SwiftHelloTest_TestResponderAdapter.byteMethod_MethodID_13, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func byteMethod( _ _arg: Int8 ) -> Int8 {
+        return byteMethod( arg: _arg )
+    }
+
+    /// public char[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.char2dArrayMethod(char[][])
+
+    private static var char2dArrayMethod_MethodID_14: jmethodID?
+
+    open func char2dArrayMethod( arg: [[UInt16]]? ) -> [[UInt16]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "char2dArrayMethod", methodSig: "([[C)[[C", methodCache: &SwiftHelloTest_TestResponderAdapter.char2dArrayMethod_MethodID_14, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[UInt16]].self, from: __return )
+    }
+
+    open func char2dArrayMethod( _ _arg: [[UInt16]]? ) -> [[UInt16]]! {
+        return char2dArrayMethod( arg: _arg )
+    }
+
+    /// public char[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.charArrayMethod(char[])
+
+    private static var charArrayMethod_MethodID_15: jmethodID?
+
+    open func charArrayMethod( arg: [UInt16]? ) -> [UInt16]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "charArrayMethod", methodSig: "([C)[C", methodCache: &SwiftHelloTest_TestResponderAdapter.charArrayMethod_MethodID_15, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [UInt16].self, from: __return )
+    }
+
+    open func charArrayMethod( _ _arg: [UInt16]? ) -> [UInt16]! {
+        return charArrayMethod( arg: _arg )
+    }
+
+    /// public char com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.charMethod(char)
+
+    private static var charMethod_MethodID_16: jmethodID?
+
+    open func charMethod( arg: UInt16 ) -> UInt16 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( c: arg )
+        let __return = JNIMethod.CallCharMethod( object: javaObject, methodName: "charMethod", methodSig: "(C)C", methodCache: &SwiftHelloTest_TestResponderAdapter.charMethod_MethodID_16, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func charMethod( _ _arg: UInt16 ) -> UInt16 {
+        return charMethod( arg: _arg )
+    }
+
+    /// public double[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.double2dArrayMethod(double[][])
+
+    private static var double2dArrayMethod_MethodID_17: jmethodID?
+
+    open func double2dArrayMethod( arg: [[Double]]? ) -> [[Double]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "double2dArrayMethod", methodSig: "([[D)[[D", methodCache: &SwiftHelloTest_TestResponderAdapter.double2dArrayMethod_MethodID_17, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Double]].self, from: __return )
+    }
+
+    open func double2dArrayMethod( _ _arg: [[Double]]? ) -> [[Double]]! {
+        return double2dArrayMethod( arg: _arg )
+    }
+
+    /// public double[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.doubleArrayMethod(double[])
+
+    private static var doubleArrayMethod_MethodID_18: jmethodID?
+
+    open func doubleArrayMethod( arg: [Double]? ) -> [Double]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "doubleArrayMethod", methodSig: "([D)[D", methodCache: &SwiftHelloTest_TestResponderAdapter.doubleArrayMethod_MethodID_18, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Double].self, from: __return )
+    }
+
+    open func doubleArrayMethod( _ _arg: [Double]? ) -> [Double]! {
+        return doubleArrayMethod( arg: _arg )
+    }
+
+    /// public double com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.doubleMethod(double)
+
+    private static var doubleMethod_MethodID_19: jmethodID?
+
+    open func doubleMethod( arg: Double ) -> Double {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( d: arg )
+        let __return = JNIMethod.CallDoubleMethod( object: javaObject, methodName: "doubleMethod", methodSig: "(D)D", methodCache: &SwiftHelloTest_TestResponderAdapter.doubleMethod_MethodID_19, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func doubleMethod( _ _arg: Double ) -> Double {
+        return doubleMethod( arg: _arg )
+    }
+
+    /// public float[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.float2dArrayMethod(float[][])
+
+    private static var float2dArrayMethod_MethodID_20: jmethodID?
+
+    open func float2dArrayMethod( arg: [[Float]]? ) -> [[Float]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "float2dArrayMethod", methodSig: "([[F)[[F", methodCache: &SwiftHelloTest_TestResponderAdapter.float2dArrayMethod_MethodID_20, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Float]].self, from: __return )
+    }
+
+    open func float2dArrayMethod( _ _arg: [[Float]]? ) -> [[Float]]! {
+        return float2dArrayMethod( arg: _arg )
+    }
+
+    /// public float[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.floatArrayMethod(float[])
+
+    private static var floatArrayMethod_MethodID_21: jmethodID?
+
+    open func floatArrayMethod( arg: [Float]? ) -> [Float]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "floatArrayMethod", methodSig: "([F)[F", methodCache: &SwiftHelloTest_TestResponderAdapter.floatArrayMethod_MethodID_21, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Float].self, from: __return )
+    }
+
+    open func floatArrayMethod( _ _arg: [Float]? ) -> [Float]! {
+        return floatArrayMethod( arg: _arg )
+    }
+
+    /// public float com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.floatMethod(float)
+
+    private static var floatMethod_MethodID_22: jmethodID?
+
+    open func floatMethod( arg: Float ) -> Float {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( f: arg )
+        let __return = JNIMethod.CallFloatMethod( object: javaObject, methodName: "floatMethod", methodSig: "(F)F", methodCache: &SwiftHelloTest_TestResponderAdapter.floatMethod_MethodID_22, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func floatMethod( _ _arg: Float ) -> Float {
+        return floatMethod( arg: _arg )
+    }
+
+    /// public int[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.int2dArrayMethod(int[][])
+
+    private static var int2dArrayMethod_MethodID_23: jmethodID?
+
+    open func int2dArrayMethod( arg: [[Int32]]? ) -> [[Int32]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "int2dArrayMethod", methodSig: "([[I)[[I", methodCache: &SwiftHelloTest_TestResponderAdapter.int2dArrayMethod_MethodID_23, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int32]].self, from: __return )
+    }
+
+    open func int2dArrayMethod( _ _arg: [[Int32]]? ) -> [[Int32]]! {
+        return int2dArrayMethod( arg: _arg )
+    }
+
+    /// public int[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.intArrayMethod(int[])
+
+    private static var intArrayMethod_MethodID_24: jmethodID?
+
+    open func intArrayMethod( arg: [Int32]? ) -> [Int32]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "intArrayMethod", methodSig: "([I)[I", methodCache: &SwiftHelloTest_TestResponderAdapter.intArrayMethod_MethodID_24, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int32].self, from: __return )
+    }
+
+    open func intArrayMethod( _ _arg: [Int32]? ) -> [Int32]! {
+        return intArrayMethod( arg: _arg )
+    }
+
+    /// public int com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.intMethod(int)
+
+    private static var intMethod_MethodID_25: jmethodID?
+
+    open func intMethod( arg: Int ) -> Int {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( i: jint(arg) )
+        let __return = JNIMethod.CallIntMethod( object: javaObject, methodName: "intMethod", methodSig: "(I)I", methodCache: &SwiftHelloTest_TestResponderAdapter.intMethod_MethodID_25, args: &__args, locals: &__locals )
+        return Int(__return)
+    }
+
+    open func intMethod( _ _arg: Int ) -> Int {
+        return intMethod( arg: _arg )
+    }
+
+    /// public long[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.long2dArrayMethod(long[][])
+
+    private static var long2dArrayMethod_MethodID_26: jmethodID?
+
+    open func long2dArrayMethod( arg: [[Int64]]? ) -> [[Int64]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "long2dArrayMethod", methodSig: "([[J)[[J", methodCache: &SwiftHelloTest_TestResponderAdapter.long2dArrayMethod_MethodID_26, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int64]].self, from: __return )
+    }
+
+    open func long2dArrayMethod( _ _arg: [[Int64]]? ) -> [[Int64]]! {
+        return long2dArrayMethod( arg: _arg )
+    }
+
+    /// public long[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.longArrayMethod(long[])
+
+    private static var longArrayMethod_MethodID_27: jmethodID?
+
+    open func longArrayMethod( arg: [Int64]? ) -> [Int64]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "longArrayMethod", methodSig: "([J)[J", methodCache: &SwiftHelloTest_TestResponderAdapter.longArrayMethod_MethodID_27, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int64].self, from: __return )
+    }
+
+    open func longArrayMethod( _ _arg: [Int64]? ) -> [Int64]! {
+        return longArrayMethod( arg: _arg )
+    }
+
+    /// public long com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.longMethod(long)
+
+    private static var longMethod_MethodID_28: jmethodID?
+
+    open func longMethod( arg: Int64 ) -> Int64 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( j: arg )
+        let __return = JNIMethod.CallLongMethod( object: javaObject, methodName: "longMethod", methodSig: "(J)J", methodCache: &SwiftHelloTest_TestResponderAdapter.longMethod_MethodID_28, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func longMethod( _ _arg: Int64 ) -> Int64 {
+        return longMethod( arg: _arg )
+    }
+
+    /// public void com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.setLoopback(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    private static var setLoopback_MethodID_29: jmethodID?
+
+    open func setLoopback( loopback: SwiftHelloTest_TestListener? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: loopback, locals: &__locals )
+        JNIMethod.CallVoidMethod( object: javaObject, methodName: "setLoopback", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)V", methodCache: &SwiftHelloTest_TestResponderAdapter.setLoopback_MethodID_29, args: &__args, locals: &__locals )
+    }
+
+    open func setLoopback( _ _loopback: SwiftHelloTest_TestListener? ) {
+        setLoopback( loopback: _loopback )
+    }
+
+    /// public short[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.short2dArrayMethod(short[][])
+
+    private static var short2dArrayMethod_MethodID_30: jmethodID?
+
+    open func short2dArrayMethod( arg: [[Int16]]? ) -> [[Int16]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "short2dArrayMethod", methodSig: "([[S)[[S", methodCache: &SwiftHelloTest_TestResponderAdapter.short2dArrayMethod_MethodID_30, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int16]].self, from: __return )
+    }
+
+    open func short2dArrayMethod( _ _arg: [[Int16]]? ) -> [[Int16]]! {
+        return short2dArrayMethod( arg: _arg )
+    }
+
+    /// public short[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.shortArrayMethod(short[])
+
+    private static var shortArrayMethod_MethodID_31: jmethodID?
+
+    open func shortArrayMethod( arg: [Int16]? ) -> [Int16]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "shortArrayMethod", methodSig: "([S)[S", methodCache: &SwiftHelloTest_TestResponderAdapter.shortArrayMethod_MethodID_31, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int16].self, from: __return )
+    }
+
+    open func shortArrayMethod( _ _arg: [Int16]? ) -> [Int16]! {
+        return shortArrayMethod( arg: _arg )
+    }
+
+    /// public short com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.shortMethod(short)
+
+    private static var shortMethod_MethodID_32: jmethodID?
+
+    open func shortMethod( arg: Int16 ) -> Int16 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( s: arg )
+        let __return = JNIMethod.CallShortMethod( object: javaObject, methodName: "shortMethod", methodSig: "(S)S", methodCache: &SwiftHelloTest_TestResponderAdapter.shortMethod_MethodID_32, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func shortMethod( _ _arg: Int16 ) -> Int16 {
+        return shortMethod( arg: _arg )
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.testMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    private static var testMap_MethodID_33: jmethodID?
+
+    open func testMap( arg: [String:SwiftHelloTypes_TextListener]? ) -> [String:SwiftHelloTypes_TextListener]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap", locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "testMap", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap;", methodCache: &SwiftHelloTest_TestResponderAdapter.testMap_MethodID_33, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [String:SwiftHelloTypes_TextListenerForward].self, from: __return )
+    }
+
+    open func testMap( _ _arg: [String:SwiftHelloTypes_TextListener]? ) -> [String:SwiftHelloTypes_TextListener]! {
+        return testMap( arg: _arg )
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.testMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    private static var testMapList_MethodID_34: jmethodID?
+
+    open func testMapList( arg: [String:[SwiftHelloTypes_TextListener]]? ) -> [String:[SwiftHelloTypes_TextListener]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList", locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "testMapList", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList;", methodCache: &SwiftHelloTest_TestResponderAdapter.testMapList_MethodID_34, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [String:[SwiftHelloTypes_TextListenerForward]].self, from: __return )
+    }
+
+    open func testMapList( _ _arg: [String:[SwiftHelloTypes_TextListener]]? ) -> [String:[SwiftHelloTypes_TextListener]]! {
+        return testMapList( arg: _arg )
+    }
+
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_String2dArrayMethod_0_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_String2dArrayMethod_0( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).String2dArrayMethod( arg: JNIType.toSwift( type: [[String]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_StringArrayMethod_1_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_StringArrayMethod_1( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).StringArrayMethod( arg: JNIType.toSwift( type: [String].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_StringMethod_2_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_StringMethod_2( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).StringMethod( arg: arg != nil ? String( javaObject: arg ) : nil )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_TestListener2dArrayMethod_3_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_TestListener2dArrayMethod_3( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).TestListener2dArrayMethod( arg: JNIType.toSwift( type: [[SwiftHelloTest_TestListenerForward]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_TestListenerArrayMethod_4_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_TestListenerArrayMethod_4( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).TestListenerArrayMethod( arg: JNIType.toSwift( type: [SwiftHelloTest_TestListenerForward].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_TestListenerMethod_5_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_TestListenerMethod_5( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).TestListenerMethod( arg: arg != nil ? SwiftHelloTest_TestListenerForward( javaObject: arg ) : nil )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_boolean2dArrayMethod_6_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_boolean2dArrayMethod_6( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).boolean2dArrayMethod( arg: JNIType.toSwift( type: [[Bool]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_booleanArrayMethod_7_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_booleanArrayMethod_7( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).booleanArrayMethod( arg: JNIType.toSwift( type: [Bool].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_booleanMethod_8_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jboolean ) -> jboolean
+
+private func SwiftHelloTest_TestResponderAdapter_booleanMethod_8( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jboolean ) -> jboolean {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).booleanMethod( arg: arg != jboolean(JNI_FALSE) )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( z: jboolean(__return ? JNI_TRUE : JNI_FALSE) ).z, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_byte2dArrayMethod_9_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_byte2dArrayMethod_9( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).byte2dArrayMethod( arg: JNIType.toSwift( type: [[Int8]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_byteArrayMethod_10_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_byteArrayMethod_10( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).byteArrayMethod( arg: JNIType.toSwift( type: [Int8].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_byteMethod_11_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jbyte ) -> jbyte
+
+private func SwiftHelloTest_TestResponderAdapter_byteMethod_11( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jbyte ) -> jbyte {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).byteMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( b: __return ).b, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_char2dArrayMethod_12_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_char2dArrayMethod_12( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).char2dArrayMethod( arg: JNIType.toSwift( type: [[UInt16]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_charArrayMethod_13_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_charArrayMethod_13( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).charArrayMethod( arg: JNIType.toSwift( type: [UInt16].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_charMethod_14_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jchar ) -> jchar
+
+private func SwiftHelloTest_TestResponderAdapter_charMethod_14( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jchar ) -> jchar {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).charMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( c: __return ).c, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_double2dArrayMethod_15_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_double2dArrayMethod_15( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).double2dArrayMethod( arg: JNIType.toSwift( type: [[Double]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_doubleArrayMethod_16_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_doubleArrayMethod_16( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).doubleArrayMethod( arg: JNIType.toSwift( type: [Double].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_doubleMethod_17_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jdouble ) -> jdouble
+
+private func SwiftHelloTest_TestResponderAdapter_doubleMethod_17( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jdouble ) -> jdouble {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).doubleMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( d: __return ).d, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_equals_18_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jboolean
+
+private func SwiftHelloTest_TestResponderAdapter_equals_18( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg0: jobject? ) -> jboolean {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).equals( arg0: arg0 != nil ? java_swift.JavaObject( javaObject: arg0 ) : nil )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( z: jboolean(__return ? JNI_TRUE : JNI_FALSE) ).z, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_float2dArrayMethod_19_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_float2dArrayMethod_19( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).float2dArrayMethod( arg: JNIType.toSwift( type: [[Float]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_floatArrayMethod_20_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_floatArrayMethod_20( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).floatArrayMethod( arg: JNIType.toSwift( type: [Float].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_floatMethod_21_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jfloat ) -> jfloat
+
+private func SwiftHelloTest_TestResponderAdapter_floatMethod_21( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jfloat ) -> jfloat {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).floatMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( f: __return ).f, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_hashCode_23_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong ) -> jint
+
+private func SwiftHelloTest_TestResponderAdapter_hashCode_23( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong ) -> jint {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).hashCode( )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( i: jint(__return) ).i, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_int2dArrayMethod_24_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_int2dArrayMethod_24( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).int2dArrayMethod( arg: JNIType.toSwift( type: [[Int32]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_intArrayMethod_25_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_intArrayMethod_25( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).intArrayMethod( arg: JNIType.toSwift( type: [Int32].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_intMethod_26_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jint ) -> jint
+
+private func SwiftHelloTest_TestResponderAdapter_intMethod_26( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jint ) -> jint {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).intMethod( arg: Int(arg) )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( i: jint(__return) ).i, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_long2dArrayMethod_27_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_long2dArrayMethod_27( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).long2dArrayMethod( arg: JNIType.toSwift( type: [[Int64]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_longArrayMethod_28_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_longArrayMethod_28( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).longArrayMethod( arg: JNIType.toSwift( type: [Int64].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_longMethod_29_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jlong ) -> jlong
+
+private func SwiftHelloTest_TestResponderAdapter_longMethod_29( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jlong ) -> jlong {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).longMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( j: __return ).j, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_setLoopback_32_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> ()
+
+private func SwiftHelloTest_TestResponderAdapter_setLoopback_32( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ loopback: jobject? ) -> () {
+    SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).setLoopback( loopback: loopback != nil ? SwiftHelloTest_TestListenerForward( javaObject: loopback ) : nil )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_short2dArrayMethod_33_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_short2dArrayMethod_33( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).short2dArrayMethod( arg: JNIType.toSwift( type: [[Int16]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_shortArrayMethod_34_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_shortArrayMethod_34( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).shortArrayMethod( arg: JNIType.toSwift( type: [Int16].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_shortMethod_35_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jshort ) -> jshort
+
+private func SwiftHelloTest_TestResponderAdapter_shortMethod_35( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jshort ) -> jshort {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).shortMethod( arg: arg )
+    var __locals = [jobject]()
+    return JNI.check( jvalue( s: __return ).s, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_testMap_36_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_testMap_36( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).testMap( arg: JNIType.toSwift( type: [String:SwiftHelloTypes_TextListenerForward].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap", locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_testMapList_37_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong, _: jobject? ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_testMapList_37( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong, _ arg: jobject? ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).testMapList( arg: JNIType.toSwift( type: [String:[SwiftHelloTypes_TextListenerForward]].self, from: arg, consume: false ) )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, mapClass: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList", locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+private typealias SwiftHelloTest_TestResponderAdapter_toString_38_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong ) -> jobject?
+
+private func SwiftHelloTest_TestResponderAdapter_toString_38( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong ) -> jobject? {
+    let __return = SwiftHelloTest_TestResponderAdapterLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).toString( )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+fileprivate class SwiftHelloTest_TestResponderAdapterLocal_: JNIObjectProxy<SwiftHelloTest_TestResponderAdapter> {
+
+    fileprivate static let _proxyClass: jclass = {
+        var natives = [JNINativeMethod]()
+
+        let SwiftHelloTest_TestResponderAdapter_String2dArrayMethod_0_thunk: SwiftHelloTest_TestResponderAdapter_String2dArrayMethod_0_type = SwiftHelloTest_TestResponderAdapter_String2dArrayMethod_0
+        natives.append( JNINativeMethod( name: strdup("__String2dArrayMethod"), signature: strdup("(J[[Ljava/lang/String;)[[Ljava/lang/String;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_String2dArrayMethod_0_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_StringArrayMethod_1_thunk: SwiftHelloTest_TestResponderAdapter_StringArrayMethod_1_type = SwiftHelloTest_TestResponderAdapter_StringArrayMethod_1
+        natives.append( JNINativeMethod( name: strdup("__StringArrayMethod"), signature: strdup("(J[Ljava/lang/String;)[Ljava/lang/String;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_StringArrayMethod_1_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_StringMethod_2_thunk: SwiftHelloTest_TestResponderAdapter_StringMethod_2_type = SwiftHelloTest_TestResponderAdapter_StringMethod_2
+        natives.append( JNINativeMethod( name: strdup("__StringMethod"), signature: strdup("(JLjava/lang/String;)Ljava/lang/String;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_StringMethod_2_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_TestListener2dArrayMethod_3_thunk: SwiftHelloTest_TestResponderAdapter_TestListener2dArrayMethod_3_type = SwiftHelloTest_TestResponderAdapter_TestListener2dArrayMethod_3
+        natives.append( JNINativeMethod( name: strdup("__TestListener2dArrayMethod"), signature: strdup("(J[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_TestListener2dArrayMethod_3_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_TestListenerArrayMethod_4_thunk: SwiftHelloTest_TestResponderAdapter_TestListenerArrayMethod_4_type = SwiftHelloTest_TestResponderAdapter_TestListenerArrayMethod_4
+        natives.append( JNINativeMethod( name: strdup("__TestListenerArrayMethod"), signature: strdup("(J[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_TestListenerArrayMethod_4_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_TestListenerMethod_5_thunk: SwiftHelloTest_TestResponderAdapter_TestListenerMethod_5_type = SwiftHelloTest_TestResponderAdapter_TestListenerMethod_5
+        natives.append( JNINativeMethod( name: strdup("__TestListenerMethod"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_TestListenerMethod_5_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_boolean2dArrayMethod_6_thunk: SwiftHelloTest_TestResponderAdapter_boolean2dArrayMethod_6_type = SwiftHelloTest_TestResponderAdapter_boolean2dArrayMethod_6
+        natives.append( JNINativeMethod( name: strdup("__boolean2dArrayMethod"), signature: strdup("(J[[Z)[[Z"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_boolean2dArrayMethod_6_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_booleanArrayMethod_7_thunk: SwiftHelloTest_TestResponderAdapter_booleanArrayMethod_7_type = SwiftHelloTest_TestResponderAdapter_booleanArrayMethod_7
+        natives.append( JNINativeMethod( name: strdup("__booleanArrayMethod"), signature: strdup("(J[Z)[Z"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_booleanArrayMethod_7_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_booleanMethod_8_thunk: SwiftHelloTest_TestResponderAdapter_booleanMethod_8_type = SwiftHelloTest_TestResponderAdapter_booleanMethod_8
+        natives.append( JNINativeMethod( name: strdup("__booleanMethod"), signature: strdup("(JZ)Z"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_booleanMethod_8_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_byte2dArrayMethod_9_thunk: SwiftHelloTest_TestResponderAdapter_byte2dArrayMethod_9_type = SwiftHelloTest_TestResponderAdapter_byte2dArrayMethod_9
+        natives.append( JNINativeMethod( name: strdup("__byte2dArrayMethod"), signature: strdup("(J[[B)[[B"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_byte2dArrayMethod_9_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_byteArrayMethod_10_thunk: SwiftHelloTest_TestResponderAdapter_byteArrayMethod_10_type = SwiftHelloTest_TestResponderAdapter_byteArrayMethod_10
+        natives.append( JNINativeMethod( name: strdup("__byteArrayMethod"), signature: strdup("(J[B)[B"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_byteArrayMethod_10_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_byteMethod_11_thunk: SwiftHelloTest_TestResponderAdapter_byteMethod_11_type = SwiftHelloTest_TestResponderAdapter_byteMethod_11
+        natives.append( JNINativeMethod( name: strdup("__byteMethod"), signature: strdup("(JB)B"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_byteMethod_11_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_char2dArrayMethod_12_thunk: SwiftHelloTest_TestResponderAdapter_char2dArrayMethod_12_type = SwiftHelloTest_TestResponderAdapter_char2dArrayMethod_12
+        natives.append( JNINativeMethod( name: strdup("__char2dArrayMethod"), signature: strdup("(J[[C)[[C"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_char2dArrayMethod_12_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_charArrayMethod_13_thunk: SwiftHelloTest_TestResponderAdapter_charArrayMethod_13_type = SwiftHelloTest_TestResponderAdapter_charArrayMethod_13
+        natives.append( JNINativeMethod( name: strdup("__charArrayMethod"), signature: strdup("(J[C)[C"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_charArrayMethod_13_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_charMethod_14_thunk: SwiftHelloTest_TestResponderAdapter_charMethod_14_type = SwiftHelloTest_TestResponderAdapter_charMethod_14
+        natives.append( JNINativeMethod( name: strdup("__charMethod"), signature: strdup("(JC)C"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_charMethod_14_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_double2dArrayMethod_15_thunk: SwiftHelloTest_TestResponderAdapter_double2dArrayMethod_15_type = SwiftHelloTest_TestResponderAdapter_double2dArrayMethod_15
+        natives.append( JNINativeMethod( name: strdup("__double2dArrayMethod"), signature: strdup("(J[[D)[[D"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_double2dArrayMethod_15_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_doubleArrayMethod_16_thunk: SwiftHelloTest_TestResponderAdapter_doubleArrayMethod_16_type = SwiftHelloTest_TestResponderAdapter_doubleArrayMethod_16
+        natives.append( JNINativeMethod( name: strdup("__doubleArrayMethod"), signature: strdup("(J[D)[D"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_doubleArrayMethod_16_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_doubleMethod_17_thunk: SwiftHelloTest_TestResponderAdapter_doubleMethod_17_type = SwiftHelloTest_TestResponderAdapter_doubleMethod_17
+        natives.append( JNINativeMethod( name: strdup("__doubleMethod"), signature: strdup("(JD)D"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_doubleMethod_17_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_equals_18_thunk: SwiftHelloTest_TestResponderAdapter_equals_18_type = SwiftHelloTest_TestResponderAdapter_equals_18
+        natives.append( JNINativeMethod( name: strdup("__equals"), signature: strdup("(JLjava/lang/Object;)Z"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_equals_18_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_float2dArrayMethod_19_thunk: SwiftHelloTest_TestResponderAdapter_float2dArrayMethod_19_type = SwiftHelloTest_TestResponderAdapter_float2dArrayMethod_19
+        natives.append( JNINativeMethod( name: strdup("__float2dArrayMethod"), signature: strdup("(J[[F)[[F"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_float2dArrayMethod_19_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_floatArrayMethod_20_thunk: SwiftHelloTest_TestResponderAdapter_floatArrayMethod_20_type = SwiftHelloTest_TestResponderAdapter_floatArrayMethod_20
+        natives.append( JNINativeMethod( name: strdup("__floatArrayMethod"), signature: strdup("(J[F)[F"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_floatArrayMethod_20_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_floatMethod_21_thunk: SwiftHelloTest_TestResponderAdapter_floatMethod_21_type = SwiftHelloTest_TestResponderAdapter_floatMethod_21
+        natives.append( JNINativeMethod( name: strdup("__floatMethod"), signature: strdup("(JF)F"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_floatMethod_21_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_hashCode_23_thunk: SwiftHelloTest_TestResponderAdapter_hashCode_23_type = SwiftHelloTest_TestResponderAdapter_hashCode_23
+        natives.append( JNINativeMethod( name: strdup("__hashCode"), signature: strdup("(J)I"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_hashCode_23_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_int2dArrayMethod_24_thunk: SwiftHelloTest_TestResponderAdapter_int2dArrayMethod_24_type = SwiftHelloTest_TestResponderAdapter_int2dArrayMethod_24
+        natives.append( JNINativeMethod( name: strdup("__int2dArrayMethod"), signature: strdup("(J[[I)[[I"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_int2dArrayMethod_24_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_intArrayMethod_25_thunk: SwiftHelloTest_TestResponderAdapter_intArrayMethod_25_type = SwiftHelloTest_TestResponderAdapter_intArrayMethod_25
+        natives.append( JNINativeMethod( name: strdup("__intArrayMethod"), signature: strdup("(J[I)[I"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_intArrayMethod_25_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_intMethod_26_thunk: SwiftHelloTest_TestResponderAdapter_intMethod_26_type = SwiftHelloTest_TestResponderAdapter_intMethod_26
+        natives.append( JNINativeMethod( name: strdup("__intMethod"), signature: strdup("(JI)I"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_intMethod_26_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_long2dArrayMethod_27_thunk: SwiftHelloTest_TestResponderAdapter_long2dArrayMethod_27_type = SwiftHelloTest_TestResponderAdapter_long2dArrayMethod_27
+        natives.append( JNINativeMethod( name: strdup("__long2dArrayMethod"), signature: strdup("(J[[J)[[J"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_long2dArrayMethod_27_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_longArrayMethod_28_thunk: SwiftHelloTest_TestResponderAdapter_longArrayMethod_28_type = SwiftHelloTest_TestResponderAdapter_longArrayMethod_28
+        natives.append( JNINativeMethod( name: strdup("__longArrayMethod"), signature: strdup("(J[J)[J"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_longArrayMethod_28_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_longMethod_29_thunk: SwiftHelloTest_TestResponderAdapter_longMethod_29_type = SwiftHelloTest_TestResponderAdapter_longMethod_29
+        natives.append( JNINativeMethod( name: strdup("__longMethod"), signature: strdup("(JJ)J"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_longMethod_29_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_setLoopback_32_thunk: SwiftHelloTest_TestResponderAdapter_setLoopback_32_type = SwiftHelloTest_TestResponderAdapter_setLoopback_32
+        natives.append( JNINativeMethod( name: strdup("__setLoopback"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)V"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_setLoopback_32_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_short2dArrayMethod_33_thunk: SwiftHelloTest_TestResponderAdapter_short2dArrayMethod_33_type = SwiftHelloTest_TestResponderAdapter_short2dArrayMethod_33
+        natives.append( JNINativeMethod( name: strdup("__short2dArrayMethod"), signature: strdup("(J[[S)[[S"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_short2dArrayMethod_33_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_shortArrayMethod_34_thunk: SwiftHelloTest_TestResponderAdapter_shortArrayMethod_34_type = SwiftHelloTest_TestResponderAdapter_shortArrayMethod_34
+        natives.append( JNINativeMethod( name: strdup("__shortArrayMethod"), signature: strdup("(J[S)[S"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_shortArrayMethod_34_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_shortMethod_35_thunk: SwiftHelloTest_TestResponderAdapter_shortMethod_35_type = SwiftHelloTest_TestResponderAdapter_shortMethod_35
+        natives.append( JNINativeMethod( name: strdup("__shortMethod"), signature: strdup("(JS)S"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_shortMethod_35_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_testMap_36_thunk: SwiftHelloTest_TestResponderAdapter_testMap_36_type = SwiftHelloTest_TestResponderAdapter_testMap_36
+        natives.append( JNINativeMethod( name: strdup("__testMap"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_testMap_36_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_testMapList_37_thunk: SwiftHelloTest_TestResponderAdapter_testMapList_37_type = SwiftHelloTest_TestResponderAdapter_testMapList_37
+        natives.append( JNINativeMethod( name: strdup("__testMapList"), signature: strdup("(JLcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_testMapList_37_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let SwiftHelloTest_TestResponderAdapter_toString_38_thunk: SwiftHelloTest_TestResponderAdapter_toString_38_type = SwiftHelloTest_TestResponderAdapter_toString_38
+        natives.append( JNINativeMethod( name: strdup("__toString"), signature: strdup("(J)Ljava/lang/String;"), fnPtr: unsafeBitCast( SwiftHelloTest_TestResponderAdapter_toString_38_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        natives.append( JNINativeMethod( name: strdup("__finalize"), signature: strdup("(J)V"), fnPtr: unsafeBitCast( JNIReleasableProxy__finalize_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let clazz = JNI.FindClass( proxyClassName() )
+        withUnsafePointer(to: &natives[0]) {
+            nativesPtr in
+            if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr, jint(natives.count) ) != jint(JNI_OK) {
+                JNI.report( "Unable to register java natives" )
+            }
+        }
+
+        defer { JNI.DeleteLocalRef( clazz ) }
+        return JNI.api.NewGlobalRef( JNI.env, clazz )!
+    }()
+
+    override open class func proxyClassName() -> String { return "org/swiftjava/com_johnholdsworth/SwiftHelloTest_TestResponderAdapterProxy" }
+    override open class func proxyClass() -> jclass? { return _proxyClass }
+
+}
+
+open class SwiftHelloTest_TestResponderAdapterBase: SwiftHelloTest_TestResponderAdapter {
+
+    private static var SwiftHelloTest_TestResponderAdapterBaseJNIClass: jclass? = SwiftHelloTest_TestResponderAdapterLocal_.proxyClass()
+
+    private lazy var __local: SwiftHelloTest_TestResponderAdapterLocal_? = SwiftHelloTest_TestResponderAdapterLocal_( owned: self, proto: self )
+
+    override open func clearLocal() {
+        __local = nil
+    }
+
+    open func inherit( _ parent: JNIObjectProtocol ) {
+        parent.withJavaObject {
+            self.javaObject = $0
+            self.__local?.takeOwnership(javaObject: $0)
+        }
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter()
+
+    private static var new_MethodID_35: jmethodID?
+
+    public convenience init() {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+
+        self.init( javaObject: nil )
+        __args[0] = __local!.swiftValue()
+
+        let __object = JNIMethod.NewObject( className: "org/swiftjava/com_johnholdsworth/SwiftHelloTest_TestResponderAdapterProxy", classCache: &SwiftHelloTest_TestResponderAdapterBase.SwiftHelloTest_TestResponderAdapterBaseJNIClass, methodSig: "(J)V", methodCache: &SwiftHelloTest_TestResponderAdapterBase.new_MethodID_35, args: &__args, locals: &__locals )
+        self.javaObject = __object
+        JNI.DeleteLocalRef( __object )
+    }
+
+}
diff --git a/com_johnholdsworth/Sources/SwiftHelloTypes.swift b/com_johnholdsworth/Sources/SwiftHelloTypes.swift
new file mode 100644
index 0000000..d46c71b
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTypes.swift
@@ -0,0 +1,18 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.johnholdsworth.swiftbindings.SwiftHelloTypes ///
+
+public protocol SwiftHelloTypes: JavaProtocol {
+
+}
+
+
+open class SwiftHelloTypesForward: JNIObjectForward, SwiftHelloTypes {
+
+    private static var SwiftHelloTypesJNIClass: jclass?
+
+}
+
diff --git a/com_johnholdsworth/Sources/SwiftHelloTypes_ListenerMap.swift b/com_johnholdsworth/Sources/SwiftHelloTypes_ListenerMap.swift
new file mode 100644
index 0000000..86ae8f4
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTypes_ListenerMap.swift
@@ -0,0 +1,103 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap ///
+
+open class SwiftHelloTypes_ListenerMap: java_swift.HashMap {
+
+    public convenience init?( casting object: java_swift.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
+        self.init( javaObject: nil )
+        object.withJavaObject {
+            self.javaObject = $0
+        }
+    }
+
+    private static var SwiftHelloTypes_ListenerMapJNIClass: jclass?
+
+    /// static final int java.util.HashMap.DEFAULT_INITIAL_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final float java.util.HashMap.DEFAULT_LOAD_FACTOR
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.MAXIMUM_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.MIN_TREEIFY_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.TREEIFY_THRESHOLD
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.UNTREEIFY_THRESHOLD
+
+    // Skipping field: true false false false false false 
+
+    /// private static final long java.util.HashMap.serialVersionUID
+
+    /// transient java.util.Set java.util.HashMap.entrySet
+
+    // Skipping field: true false false false false false 
+
+    /// final float java.util.HashMap.loadFactor
+
+    // Skipping field: true false false false false false 
+
+    /// transient int java.util.HashMap.modCount
+
+    // Skipping field: true false false false false false 
+
+    /// transient int java.util.HashMap.size
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.HashMap$Node[] java.util.HashMap.table
+
+    // Skipping field: true false false false false false 
+
+    /// int java.util.HashMap.threshold
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.Set java.util.AbstractMap.keySet
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.Collection java.util.AbstractMap.values
+
+    // Skipping field: true false false false false false 
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap()
+
+    private static var new_MethodID_1: jmethodID?
+
+    public convenience init() {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __object = JNIMethod.NewObject( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap", classCache: &SwiftHelloTypes_ListenerMap.SwiftHelloTypes_ListenerMapJNIClass, methodSig: "()V", methodCache: &SwiftHelloTypes_ListenerMap.new_MethodID_1, args: &__args, locals: &__locals )
+        self.init( javaObject: __object )
+        JNI.DeleteLocalRef( __object )
+    }
+
+    /// public static java.lang.Class com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap.valueClass()
+
+    private static var valueClass_MethodID_2: jmethodID?
+
+    open class func valueClass() -> java_swift.JavaClass! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMap", classCache: &SwiftHelloTypes_ListenerMapJNIClass, methodName: "valueClass", methodSig: "()Ljava/lang/Class;", methodCache: &valueClass_MethodID_2, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? java_swift.JavaClass( javaObject: __return ) : nil
+    }
+
+
+}
+
diff --git a/com_johnholdsworth/Sources/SwiftHelloTypes_ListenerMapList.swift b/com_johnholdsworth/Sources/SwiftHelloTypes_ListenerMapList.swift
new file mode 100644
index 0000000..d25267f
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTypes_ListenerMapList.swift
@@ -0,0 +1,103 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList ///
+
+open class SwiftHelloTypes_ListenerMapList: java_swift.HashMap {
+
+    public convenience init?( casting object: java_swift.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
+        self.init( javaObject: nil )
+        object.withJavaObject {
+            self.javaObject = $0
+        }
+    }
+
+    private static var SwiftHelloTypes_ListenerMapListJNIClass: jclass?
+
+    /// static final int java.util.HashMap.DEFAULT_INITIAL_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final float java.util.HashMap.DEFAULT_LOAD_FACTOR
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.MAXIMUM_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.MIN_TREEIFY_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.TREEIFY_THRESHOLD
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.UNTREEIFY_THRESHOLD
+
+    // Skipping field: true false false false false false 
+
+    /// private static final long java.util.HashMap.serialVersionUID
+
+    /// transient java.util.Set java.util.HashMap.entrySet
+
+    // Skipping field: true false false false false false 
+
+    /// final float java.util.HashMap.loadFactor
+
+    // Skipping field: true false false false false false 
+
+    /// transient int java.util.HashMap.modCount
+
+    // Skipping field: true false false false false false 
+
+    /// transient int java.util.HashMap.size
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.HashMap$Node[] java.util.HashMap.table
+
+    // Skipping field: true false false false false false 
+
+    /// int java.util.HashMap.threshold
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.Set java.util.AbstractMap.keySet
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.Collection java.util.AbstractMap.values
+
+    // Skipping field: true false false false false false 
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList()
+
+    private static var new_MethodID_1: jmethodID?
+
+    public convenience init() {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __object = JNIMethod.NewObject( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList", classCache: &SwiftHelloTypes_ListenerMapList.SwiftHelloTypes_ListenerMapListJNIClass, methodSig: "()V", methodCache: &SwiftHelloTypes_ListenerMapList.new_MethodID_1, args: &__args, locals: &__locals )
+        self.init( javaObject: __object )
+        JNI.DeleteLocalRef( __object )
+    }
+
+    /// public static java.lang.Class com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList.valueClass()
+
+    private static var valueClass_MethodID_2: jmethodID?
+
+    open class func valueClass() -> java_swift.JavaClass! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$ListenerMapList", classCache: &SwiftHelloTypes_ListenerMapListJNIClass, methodName: "valueClass", methodSig: "()Ljava/lang/Class;", methodCache: &valueClass_MethodID_2, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? java_swift.JavaClass( javaObject: __return ) : nil
+    }
+
+
+}
+
diff --git a/com_johnholdsworth/Sources/SwiftHelloTypes_Planet.swift b/com_johnholdsworth/Sources/SwiftHelloTypes_Planet.swift
new file mode 100644
index 0000000..09718d0
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTypes_Planet.swift
@@ -0,0 +1,357 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet ///
+
+public enum SwiftHelloTypes_Planet: Int, JNIObjectProtocol, JNIObjectInit {
+
+    case MERCURY, VENUS, EARTH, MARS, JUPITER, SATURN, URANUS, NEPTUNE
+
+    static let enumConstants = try! JavaClass.forName("com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet")
+        .getEnumConstants()!.map { SwiftHelloTypes_PlanetForward( javaObject: $0.javaObject ) }
+
+    public func underlier() -> SwiftHelloTypes_PlanetForward {
+        return SwiftHelloTypes_Planet.enumConstants[self.rawValue]
+    }
+
+    public func localJavaObject(_ locals: UnsafeMutablePointer<[jobject]>) -> jobject? {
+        return underlier().localJavaObject( locals )
+    }
+
+    public init( javaObject: jobject? ) {
+        self = SwiftHelloTypes_Planet( rawValue: JavaEnum( javaObject: javaObject ).ordinal() )!
+    }
+
+    /// public static com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.valueOf(java.lang.String)
+
+    private static var valueOf_MethodID_1: jmethodID?
+
+    public static func valueOf( name: String? ) -> SwiftHelloTypes_Planet! {
+        return SwiftHelloTypes_PlanetForward.valueOf( name: name )
+    }
+    public static func valueOf( _ _name: String? ) -> SwiftHelloTypes_Planet! {
+        return valueOf( name: _name )
+    }
+
+    /// public static com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet[] com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.values()
+
+    private static var values_MethodID_2: jmethodID?
+
+    public static func values() -> [SwiftHelloTypes_Planet]! {
+        return SwiftHelloTypes_PlanetForward.values( )
+    }
+
+    /// public double com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.mass()
+
+    private static var mass_MethodID_3: jmethodID?
+
+    public func mass() -> Double {
+        return underlier().mass( )
+    }
+
+    /// public double com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.radius()
+
+    private static var radius_MethodID_4: jmethodID?
+
+    public func radius() -> Double {
+        return underlier().radius( )
+    }
+
+    /// public double com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.surfaceGravity()
+
+    private static var surfaceGravity_MethodID_5: jmethodID?
+
+    public func surfaceGravity() -> Double {
+        return underlier().surfaceGravity( )
+    }
+
+    /// public double com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.surfaceWeight(double)
+
+    private static var surfaceWeight_MethodID_6: jmethodID?
+
+    public func surfaceWeight( otherMass: Double ) -> Double {
+        return underlier().surfaceWeight( otherMass: otherMass )
+    }
+    public func surfaceWeight( _ _otherMass: Double ) -> Double {
+        return surfaceWeight( otherMass: _otherMass )
+    }
+
+}
+
+
+open class SwiftHelloTypes_PlanetForward: JNIObjectForward {
+
+    private static var SwiftHelloTypes_PlanetJNIClass: jclass?
+
+    /// private static final com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet[] com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.$VALUES
+
+    /// public static final com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.EARTH
+
+    private static var EARTH_FieldID: jfieldID?
+
+    public static var EARTH: SwiftHelloTypes_Planet! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "EARTH", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &EARTH_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? SwiftHelloTypes_Planet( javaObject: __value ) : nil
+        }
+    }
+
+    /// public static final double com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.G
+
+    private static var G_FieldID: jfieldID?
+
+    public static var G: Double {
+        get {
+            let __value = JNIField.GetStaticDoubleField( fieldName: "G", fieldType: "D", fieldCache: &G_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
+            return __value
+        }
+    }
+
+    /// public static final com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.JUPITER
+
+    private static var JUPITER_FieldID: jfieldID?
+
+    public static var JUPITER: SwiftHelloTypes_Planet! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "JUPITER", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &JUPITER_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? SwiftHelloTypes_Planet( javaObject: __value ) : nil
+        }
+    }
+
+    /// public static final com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.MARS
+
+    private static var MARS_FieldID: jfieldID?
+
+    public static var MARS: SwiftHelloTypes_Planet! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "MARS", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &MARS_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? SwiftHelloTypes_Planet( javaObject: __value ) : nil
+        }
+    }
+
+    /// public static final com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.MERCURY
+
+    private static var MERCURY_FieldID: jfieldID?
+
+    public static var MERCURY: SwiftHelloTypes_Planet! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "MERCURY", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &MERCURY_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? SwiftHelloTypes_Planet( javaObject: __value ) : nil
+        }
+    }
+
+    /// public static final com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.NEPTUNE
+
+    private static var NEPTUNE_FieldID: jfieldID?
+
+    public static var NEPTUNE: SwiftHelloTypes_Planet! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "NEPTUNE", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &NEPTUNE_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? SwiftHelloTypes_Planet( javaObject: __value ) : nil
+        }
+    }
+
+    /// public static final com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.SATURN
+
+    private static var SATURN_FieldID: jfieldID?
+
+    public static var SATURN: SwiftHelloTypes_Planet! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "SATURN", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &SATURN_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? SwiftHelloTypes_Planet( javaObject: __value ) : nil
+        }
+    }
+
+    /// public static final com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.URANUS
+
+    private static var URANUS_FieldID: jfieldID?
+
+    public static var URANUS: SwiftHelloTypes_Planet! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "URANUS", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &URANUS_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? SwiftHelloTypes_Planet( javaObject: __value ) : nil
+        }
+    }
+
+    /// public static final com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.VENUS
+
+    private static var VENUS_FieldID: jfieldID?
+
+    public static var VENUS: SwiftHelloTypes_Planet! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "VENUS", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &VENUS_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? SwiftHelloTypes_Planet( javaObject: __value ) : nil
+        }
+    }
+
+    /// private final double com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.mass
+
+    /// private final double com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.radius
+
+    /// public static com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.valueOf(java.lang.String)
+
+    private static var valueOf_MethodID_7: jmethodID?
+
+    open class func valueOf( name: String? ) -> SwiftHelloTypes_Planet! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: name, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass, methodName: "valueOf", methodSig: "(Ljava/lang/String;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", methodCache: &valueOf_MethodID_7, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? SwiftHelloTypes_Planet( javaObject: __return ) : nil
+    }
+
+    open class func valueOf( _ _name: String? ) -> SwiftHelloTypes_Planet! {
+        return valueOf( name: _name )
+    }
+
+    /// public static java.lang.Enum java.lang.Enum.valueOf(java.lang.Class,java.lang.String)
+
+    private static var valueOf_MethodID_8: jmethodID?
+
+    open class func valueOf( enumType: java_swift.JavaClass?, name: String? ) -> java_swift.JavaEnum! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 2 )
+        __args[0] = JNIType.toJava( value: enumType, locals: &__locals )
+        __args[1] = JNIType.toJava( value: name, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass, methodName: "valueOf", methodSig: "(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;", methodCache: &valueOf_MethodID_8, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? java_swift.JavaEnum( javaObject: __return ) : nil
+    }
+
+    open class func valueOf( _ _enumType: java_swift.JavaClass?, _ _name: String? ) -> java_swift.JavaEnum! {
+        return valueOf( enumType: _enumType, name: _name )
+    }
+
+    /// public static com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet[] com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.values()
+
+    private static var values_MethodID_9: jmethodID?
+
+    open class func values() -> [SwiftHelloTypes_Planet]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass, methodName: "values", methodSig: "()[Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", methodCache: &values_MethodID_9, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [SwiftHelloTypes_Planet].self, from: __return )
+    }
+
+
+    /// public final int java.lang.Enum.compareTo(java.lang.Enum)
+
+    // Skipping method: false true false false false 
+
+    /// public int java.lang.Enum.compareTo(java.lang.Object)
+
+    // Skipping method: false true false false false 
+
+    /// public final boolean java.lang.Enum.equals(java.lang.Object)
+
+    // Skipping method: false true false false false 
+
+    /// public final native java.lang.Class java.lang.Object.getClass()
+
+    // Skipping method: false true false false false 
+
+    /// public final java.lang.Class java.lang.Enum.getDeclaringClass()
+
+    // Skipping method: false true false false false 
+
+    /// public final int java.lang.Enum.hashCode()
+
+    // Skipping method: false true false false false 
+
+    /// public double com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.mass()
+
+    private static var mass_MethodID_10: jmethodID?
+
+    open func mass() -> Double {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallDoubleMethod( object: javaObject, methodName: "mass", methodSig: "()D", methodCache: &SwiftHelloTypes_PlanetForward.mass_MethodID_10, args: &__args, locals: &__locals )
+        return __return
+    }
+
+
+    /// public final java.lang.String java.lang.Enum.name()
+
+    // Skipping method: false true false false false 
+
+    /// public final native void java.lang.Object.notify()
+
+    // Skipping method: false true false false false 
+
+    /// public final native void java.lang.Object.notifyAll()
+
+    // Skipping method: false true false false false 
+
+    /// public final int java.lang.Enum.ordinal()
+
+    // Skipping method: false true false false false 
+
+    /// public double com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.radius()
+
+    private static var radius_MethodID_11: jmethodID?
+
+    open func radius() -> Double {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallDoubleMethod( object: javaObject, methodName: "radius", methodSig: "()D", methodCache: &SwiftHelloTypes_PlanetForward.radius_MethodID_11, args: &__args, locals: &__locals )
+        return __return
+    }
+
+
+    /// public double com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.surfaceGravity()
+
+    private static var surfaceGravity_MethodID_12: jmethodID?
+
+    open func surfaceGravity() -> Double {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallDoubleMethod( object: javaObject, methodName: "surfaceGravity", methodSig: "()D", methodCache: &SwiftHelloTypes_PlanetForward.surfaceGravity_MethodID_12, args: &__args, locals: &__locals )
+        return __return
+    }
+
+
+    /// public double com.johnholdsworth.swiftbindings.SwiftHelloTypes$Planet.surfaceWeight(double)
+
+    private static var surfaceWeight_MethodID_13: jmethodID?
+
+    open func surfaceWeight( otherMass: Double ) -> Double {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( d: otherMass )
+        let __return = JNIMethod.CallDoubleMethod( object: javaObject, methodName: "surfaceWeight", methodSig: "(D)D", methodCache: &SwiftHelloTypes_PlanetForward.surfaceWeight_MethodID_13, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func surfaceWeight( _ _otherMass: Double ) -> Double {
+        return surfaceWeight( otherMass: _otherMass )
+    }
+
+    /// public java.lang.String java.lang.Enum.toString()
+
+    // Skipping method: false true false false false 
+
+    /// public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException
+
+    // Skipping method: false true false false false 
+
+    /// public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException
+
+    // Skipping method: false true false false false 
+
+    /// public final void java.lang.Object.wait() throws java.lang.InterruptedException
+
+    // Skipping method: false true false false false 
+
+}
+
diff --git a/com_johnholdsworth/Sources/SwiftHelloTypes_StringMap.swift b/com_johnholdsworth/Sources/SwiftHelloTypes_StringMap.swift
new file mode 100644
index 0000000..d1e6211
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTypes_StringMap.swift
@@ -0,0 +1,120 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMap ///
+
+open class SwiftHelloTypes_StringMap: java_swift.HashMap {
+
+    public convenience init?( casting object: java_swift.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
+        self.init( javaObject: nil )
+        object.withJavaObject {
+            self.javaObject = $0
+        }
+    }
+
+    private static var SwiftHelloTypes_StringMapJNIClass: jclass?
+
+    /// static final int java.util.HashMap.DEFAULT_INITIAL_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final float java.util.HashMap.DEFAULT_LOAD_FACTOR
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.MAXIMUM_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.MIN_TREEIFY_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.TREEIFY_THRESHOLD
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.UNTREEIFY_THRESHOLD
+
+    // Skipping field: true false false false false false 
+
+    /// private static final long java.util.HashMap.serialVersionUID
+
+    /// transient java.util.Set java.util.HashMap.entrySet
+
+    // Skipping field: true false false false false false 
+
+    /// final float java.util.HashMap.loadFactor
+
+    // Skipping field: true false false false false false 
+
+    /// transient int java.util.HashMap.modCount
+
+    // Skipping field: true false false false false false 
+
+    /// transient int java.util.HashMap.size
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.HashMap$Node[] java.util.HashMap.table
+
+    // Skipping field: true false false false false false 
+
+    /// int java.util.HashMap.threshold
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.Set java.util.AbstractMap.keySet
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.Collection java.util.AbstractMap.values
+
+    // Skipping field: true false false false false false 
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMap()
+
+    private static var new_MethodID_1: jmethodID?
+
+    public convenience init() {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __object = JNIMethod.NewObject( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMap", classCache: &SwiftHelloTypes_StringMap.SwiftHelloTypes_StringMapJNIClass, methodSig: "()V", methodCache: &SwiftHelloTypes_StringMap.new_MethodID_1, args: &__args, locals: &__locals )
+        self.init( javaObject: __object )
+        JNI.DeleteLocalRef( __object )
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMap(java.util.Map)
+
+    private static var new_MethodID_2: jmethodID?
+
+    public convenience init( map: java_swift.JavaMap? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: map, mapClass: "java/util/Map", locals: &__locals )
+        let __object = JNIMethod.NewObject( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMap", classCache: &SwiftHelloTypes_StringMap.SwiftHelloTypes_StringMapJNIClass, methodSig: "(Ljava/util/Map;)V", methodCache: &SwiftHelloTypes_StringMap.new_MethodID_2, args: &__args, locals: &__locals )
+        self.init( javaObject: __object )
+        JNI.DeleteLocalRef( __object )
+    }
+
+    public convenience init( _ _map: java_swift.JavaMap? ) {
+        self.init( map: _map )
+    }
+
+    /// public static java.lang.Class com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMap.valueClass()
+
+    private static var valueClass_MethodID_3: jmethodID?
+
+    open class func valueClass() -> java_swift.JavaClass! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMap", classCache: &SwiftHelloTypes_StringMapJNIClass, methodName: "valueClass", methodSig: "()Ljava/lang/Class;", methodCache: &valueClass_MethodID_3, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? java_swift.JavaClass( javaObject: __return ) : nil
+    }
+
+
+}
+
diff --git a/com_johnholdsworth/Sources/SwiftHelloTypes_StringMapList.swift b/com_johnholdsworth/Sources/SwiftHelloTypes_StringMapList.swift
new file mode 100644
index 0000000..05f93a3
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTypes_StringMapList.swift
@@ -0,0 +1,120 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMapList ///
+
+open class SwiftHelloTypes_StringMapList: java_swift.HashMap {
+
+    public convenience init?( casting object: java_swift.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
+        self.init( javaObject: nil )
+        object.withJavaObject {
+            self.javaObject = $0
+        }
+    }
+
+    private static var SwiftHelloTypes_StringMapListJNIClass: jclass?
+
+    /// static final int java.util.HashMap.DEFAULT_INITIAL_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final float java.util.HashMap.DEFAULT_LOAD_FACTOR
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.MAXIMUM_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.MIN_TREEIFY_CAPACITY
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.TREEIFY_THRESHOLD
+
+    // Skipping field: true false false false false false 
+
+    /// static final int java.util.HashMap.UNTREEIFY_THRESHOLD
+
+    // Skipping field: true false false false false false 
+
+    /// private static final long java.util.HashMap.serialVersionUID
+
+    /// transient java.util.Set java.util.HashMap.entrySet
+
+    // Skipping field: true false false false false false 
+
+    /// final float java.util.HashMap.loadFactor
+
+    // Skipping field: true false false false false false 
+
+    /// transient int java.util.HashMap.modCount
+
+    // Skipping field: true false false false false false 
+
+    /// transient int java.util.HashMap.size
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.HashMap$Node[] java.util.HashMap.table
+
+    // Skipping field: true false false false false false 
+
+    /// int java.util.HashMap.threshold
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.Set java.util.AbstractMap.keySet
+
+    // Skipping field: true false false false false false 
+
+    /// transient java.util.Collection java.util.AbstractMap.values
+
+    // Skipping field: true false false false false false 
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMapList()
+
+    private static var new_MethodID_1: jmethodID?
+
+    public convenience init() {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __object = JNIMethod.NewObject( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMapList", classCache: &SwiftHelloTypes_StringMapList.SwiftHelloTypes_StringMapListJNIClass, methodSig: "()V", methodCache: &SwiftHelloTypes_StringMapList.new_MethodID_1, args: &__args, locals: &__locals )
+        self.init( javaObject: __object )
+        JNI.DeleteLocalRef( __object )
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMapList(java.util.Map)
+
+    private static var new_MethodID_2: jmethodID?
+
+    public convenience init( map: java_swift.JavaMap? ) {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: map, mapClass: "java/util/Map", locals: &__locals )
+        let __object = JNIMethod.NewObject( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMapList", classCache: &SwiftHelloTypes_StringMapList.SwiftHelloTypes_StringMapListJNIClass, methodSig: "(Ljava/util/Map;)V", methodCache: &SwiftHelloTypes_StringMapList.new_MethodID_2, args: &__args, locals: &__locals )
+        self.init( javaObject: __object )
+        JNI.DeleteLocalRef( __object )
+    }
+
+    public convenience init( _ _map: java_swift.JavaMap? ) {
+        self.init( map: _map )
+    }
+
+    /// public static java.lang.Class com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMapList.valueClass()
+
+    private static var valueClass_MethodID_3: jmethodID?
+
+    open class func valueClass() -> java_swift.JavaClass! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$StringMapList", classCache: &SwiftHelloTypes_StringMapListJNIClass, methodName: "valueClass", methodSig: "()Ljava/lang/Class;", methodCache: &valueClass_MethodID_3, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? java_swift.JavaClass( javaObject: __return ) : nil
+    }
+
+
+}
+
diff --git a/com_johnholdsworth/Sources/SwiftHelloTypes_TextListener.swift b/com_johnholdsworth/Sources/SwiftHelloTypes_TextListener.swift
new file mode 100644
index 0000000..4025704
--- /dev/null
+++ b/com_johnholdsworth/Sources/SwiftHelloTypes_TextListener.swift
@@ -0,0 +1,90 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener ///
+
+public protocol SwiftHelloTypes_TextListener: JavaProtocol {
+
+    /// public abstract java.lang.String com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener.getText()
+
+    func getText() -> String!
+
+}
+
+
+open class SwiftHelloTypes_TextListenerForward: JNIObjectForward, SwiftHelloTypes_TextListener {
+
+    private static var SwiftHelloTypes_TextListenerJNIClass: jclass?
+
+    /// public abstract java.lang.String com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener.getText()
+
+    private static var getText_MethodID_2: jmethodID?
+
+    open func getText() -> String! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getText", methodSig: "()Ljava/lang/String;", methodCache: &SwiftHelloTypes_TextListenerForward.getText_MethodID_2, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? String( javaObject: __return ) : nil
+    }
+
+
+}
+
+private typealias SwiftHelloTypes_TextListener_getText_0_type = @convention(c) ( _: UnsafeMutablePointer<JNIEnv?>, _: jobject?, _: jlong ) -> jobject?
+
+private func SwiftHelloTypes_TextListener_getText_0( _ __env: UnsafeMutablePointer<JNIEnv?>, _ __this: jobject?, _ __swiftObject: jlong ) -> jobject? {
+    let __return = SwiftHelloTypes_TextListenerLocal_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject ).getText( )
+    var __locals = [jobject]()
+    return JNI.check( JNIType.toJava( value: __return, locals: &__locals ).l, &__locals, removeLast: true )
+}
+
+fileprivate class SwiftHelloTypes_TextListenerLocal_: JNILocalProxy<SwiftHelloTypes_TextListener, Any> {
+
+    fileprivate static let _proxyClass: jclass = {
+        var natives = [JNINativeMethod]()
+
+        let SwiftHelloTypes_TextListener_getText_0_thunk: SwiftHelloTypes_TextListener_getText_0_type = SwiftHelloTypes_TextListener_getText_0
+        natives.append( JNINativeMethod( name: strdup("__getText"), signature: strdup("(J)Ljava/lang/String;"), fnPtr: unsafeBitCast( SwiftHelloTypes_TextListener_getText_0_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        natives.append( JNINativeMethod( name: strdup("__finalize"), signature: strdup("(J)V"), fnPtr: unsafeBitCast( JNIReleasableProxy__finalize_thunk, to: UnsafeMutableRawPointer.self ) ) )
+
+        let clazz = JNI.FindClass( proxyClassName() )
+        withUnsafePointer(to: &natives[0]) {
+            nativesPtr in
+            if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr, jint(natives.count) ) != jint(JNI_OK) {
+                JNI.report( "Unable to register java natives" )
+            }
+        }
+
+        defer { JNI.DeleteLocalRef( clazz ) }
+        return JNI.api.NewGlobalRef( JNI.env, clazz )!
+    }()
+
+    override open class func proxyClassName() -> String { return "org/swiftjava/com_johnholdsworth/SwiftHelloTypes_TextListenerProxy" }
+    override open class func proxyClass() -> jclass? { return _proxyClass }
+
+}
+
+extension SwiftHelloTypes_TextListener {
+
+    public func localJavaObject( _ locals: UnsafeMutablePointer<[jobject]> ) -> jobject? {
+        return SwiftHelloTypes_TextListenerLocal_( owned: self, proto: self ).localJavaObject( locals )
+    }
+
+}
+
+open class SwiftHelloTypes_TextListenerBase: SwiftHelloTypes_TextListener {
+
+    public init() {}
+
+    /// public abstract java.lang.String com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener.getText()
+
+    open func getText() -> String! /**/ {
+        return nil
+    }
+
+
+}
diff --git a/examples b/examples
index cf05565..fd5f6cd 160000
--- a/examples
+++ b/examples
@@ -1 +1 @@
-Subproject commit cf055657131634efe7a47e017a83a69d7a1f123b
+Subproject commit fd5f6cd92cbc692481c739da674a507e2cb459d0
diff --git a/genall.sh b/genall.sh
index 562348e..7a9256b 100755
--- a/genall.sh
+++ b/genall.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 #
-# Regenerate all bridge sources
+# Regenerate all bridge sources - if only it was this simple!
 #
 
-cd `dirname $0`
+cd "$(dirname "$0")" &&
 
 for i in java_lang java_util java_sql java_awt javax_swing com_apple; do
     ./genswift.sh $i
diff --git a/genhello.sh b/genhello.sh
index 2dff906..6e3d271 100755
--- a/genhello.sh
+++ b/genhello.sh
@@ -1,23 +1,42 @@
 #!/bin/bash
 #
 # Generates Proxy and Swift sources for swifthello Android sample
-# Note use of -parameters option when compiling to record names
+# Note: use of -parameters option when compiling to record names
 #
 
-cd `dirname $0`/src &&
+cd "$(dirname "$0")/src" &&
 
-$JAVA_HOME/bin/javac -parameters com/jh/*.java &&
+export JAVA_HOME=${JAVA_HOME?-Please export JAVA_HOME}
 
-$JAVA_HOME/bin/jar cf /tmp/hello.jar com/jh/*.class &&
+export COMPANY=johnholdsworth
+
+# clear out any generated swift files
+\rm `find ../{swift-android-samples,swift-android-kotlin} -name 'SwiftHello*.swift'` 2>/dev/null
+
+# clear out generated Java proxy files
+\rm -rf ../{swift-android-samples,swift-android-kotlin}/*/src/main/java/org/swiftjava/com_$COMPANY
+
+# compile bindings and package them into for jar for genswift.sh
+$JAVA_HOME/bin/javac -Xlint:unchecked -parameters com/$COMPANY/swiftbindings/*.java &&
+
+$JAVA_HOME/bin/jar cf /tmp/swifthello.jar com/$COMPANY/swiftbindings/*.class &&
 
 # The last argument is the frameworks the project
 # is dependent on. java_lang for example will add
 # about 2mb to the app's apk and needs to be added
 # to the project's src/main/swift/Package.swift
 
-cd .. && ./genswift.sh com.jh /tmp/hello.jar "" &&
+cd .. && ./genswift.sh com.$COMPANY.swiftbindings /tmp/swifthello.jar "" &&
+
+# copy newly generated sources derived from the bindings into the example projects
+
+mkdir -p swift-android-samples/swifthello/src/main/java/{com/$COMPANY/swiftbindings,org/swiftjava/com_$COMPANY} swift-android-kotlin/app/src/main/java/{com/$COMPANY/swiftbindings,org/swiftjava/com_$COMPANY} &&
+
+\cp -v src/com/$COMPANY/swiftbindings/*.java swift-android-samples/swifthello/src/main/java/com/$COMPANY/swiftbindings &&
+\cp -v src/com/$COMPANY/swiftbindings/*.java swift-android-kotlin/app/src/main/java/com/$COMPANY/swiftbindings &&
 
-mkdir -p swift-android-samples/swifthello/src/main/java/{com/jh,org/genie/com_jh} &&
+\cp -v src/org/swiftjava/com_$COMPANY/*.java swift-android-samples/swifthello/src/main/java/org/swiftjava/com_$COMPANY &&
+\cp -v src/org/swiftjava/com_$COMPANY/*.java swift-android-kotlin/app/src/main/java/org/swiftjava/com_$COMPANY &&
 
-\cp -v src/com/jh/*.java swift-android-samples/swifthello/src/main/java/com/jh &&
-\cp -v src/org/genie/com_jh/*.java swift-android-samples/swifthello/src/main/java/org/genie/com_jh
+\cp -v com_$COMPANY/Sources/SwiftHello*.swift swift-android-samples/swifthello/src/main/swift/Sources
+\cp -v com_$COMPANY/Sources/SwiftHello*.swift swift-android-kotlin/app/src/main/swift/Sources
diff --git a/genie.jar b/genie.jar
deleted file mode 100644
index cb497ce..0000000
Binary files a/genie.jar and /dev/null differ
diff --git a/genjar.sh b/genjar.sh
index efc708b..baf77ae 100755
--- a/genjar.sh
+++ b/genjar.sh
@@ -3,16 +3,16 @@
 # This build the jar of classes required to implement Runnable and Listener events from Java to Swift
 #
 
-cd `dirname $0`/src
+cd "$(dirname "$0")/src" &&
 
 # legacy JVM downloadable from here: https://support.apple.com/kb/dl1572?locale=en_US
 
-export JAVA_HOME=${1:-/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home}
+export JAVA_HOME=/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
 
 \rm `find . -name '*.class'` 2>/dev/null
 
-$JAVA_HOME/bin/javac org/genie/{*,*/*}.java &&
+$JAVA_HOME/bin/javac org/swiftjava/{*,*/*}.java com/johnholdsworth/swiftbindings/*.java &&
 
-$JAVA_HOME/bin/jar cfv ../genie.jar org/genie/{*,*/*}.class &&
+$JAVA_HOME/bin/jar cfv ../swiftjava.jar org/swiftjava/{*,*/*}.class  com/johnholdsworth/swiftbindings/*.class &&
 
-\cp ../genie.jar ~/.genie.jar
+\cp ../swiftjava.jar ~/.swiftjava.jar
diff --git a/genpkg.sh b/genpkg.sh
index d1e88cf..7aa8dcf 100755
--- a/genpkg.sh
+++ b/genpkg.sh
@@ -3,13 +3,16 @@
 # Build until all overrides are captured in build.log and there are no errors
 #
 
-cd `dirname $0`
+cd "$(dirname "$0")" &&
 
-XCODEBUILD=/Applications/Xcode-beta5.app/Contents/Developer/usr/bin/xcodebuild
+XCODEBUILD=/Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild
+
+# downloadable from https://support.apple.com/kb/dl1572?locale=en_US
+export JAVA_HOME=${JAVA_HOME:-/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home}
 
 for i in $*; do
-    ./genswift.sh $i
-    ./overrides.pl $i
+    ./genswift.sh $i $JAVA_HOME/jre/lib/rt.jar &&
+    ./overrides.pl $i &&
     while true; do
         ($XCODEBUILD SYMROOT=/tmp -config Debug -target examples -project SwiftJava.xcodeproj; STATUS=$?) | tee -a $i/build.log
         ./overrides.pl $i
@@ -18,3 +21,4 @@ for i in $*; do
         fi
     done
 done
+
diff --git a/genswift.sh b/genswift.sh
index 4de2cc2..cdd2e15 100755
--- a/genswift.sh
+++ b/genswift.sh
@@ -10,14 +10,16 @@
 # need to compile with the new-to-Java8 option -parameters.
 #
 
-FILTER=${1:-java/lang|java/util|java/sql|java/awt|javax/swing}
+export JAVA_HOME="${JAVA_HOME?-Please export JAVA_HOME}"
 
-FILTER=$(echo $FILTER | sed s@[._]@/@)
+FILTER="${1:-java/lang|java/util|java/sql|java/awt|javax/swing}"
 
-TARGET_JAR=${2:-$JAVA_HOME/jre/lib/rt.jar}
+FILTER="$(echo "$FILTER" | sed 's@[._]@/@g' | sed 's@\$@\\$@g')"
+
+TARGET_JAR="${2:-$JAVA_HOME/jre/lib/rt.jar}"
 
 PACKAGE_ORDER=${3:-java/lang|java/util|java/sql|java/awt|javax/swing}
 
-cd `dirname $0` && cd src && $JAVA_HOME/bin/javac genswift.java && cd - &&
+cd "$(dirname "$0")/src" && mkdir -p ../bin && "$JAVA_HOME/bin/javac" -d ../bin genswift.java && cd .. &&
 
-$JAVA_HOME/bin/jar tf "$TARGET_JAR" | egrep "^($FILTER)" | sed "s@\\.class\$@@" | $JAVA_HOME/bin/java -cp "src:$TARGET_JAR" genswift "$PACKAGE_ORDER"
+"$JAVA_HOME/bin/jar" tf "$TARGET_JAR" | egrep "^($FILTER)" | sed "s@\\.class\$@@" | "$JAVA_HOME/bin/java" -cp "$TARGET_JAR:bin" genswift "$PACKAGE_ORDER"
diff --git a/gentests.rb b/gentests.rb
index f84fc4b..b36fa43 100755
--- a/gentests.rb
+++ b/gentests.rb
@@ -1,6 +1,13 @@
-#!/usr/bin/env ruby -w
+#!/usr/bin/env ruby
+#
+# Generates bindings and implementions for test cde.
+#
+# This file is a bit of a mess frankly and you may need
+# to alternate between running this and genhello.sh
+# a few times to get new types to compile cleanly.
+#
 
-types = ["boolean", "byte", "char", "short", "int", "long", "float", "double", "String"];
+types = ["boolean", "byte", "char", "short", "int", "long", "float", "double", "String", "TestListener"];
 
 swiftTypes = {
     'boolean' => 'Bool',
@@ -11,7 +18,8 @@
     'long' => 'Int64',
     'float' => 'Float',
     'double' => 'Double',
-    'String' => 'String'
+    'String' => 'String',
+    'TestListener' => 'SwiftHelloTest_TestListener'
 }
 
 arrayException = {
@@ -20,23 +28,70 @@
 
 referenceException = {
     'boolean' => 'true',
-    'String' => '"123"'
+    'String' => '"123"',
+    'TestListener' => 'SwiftTestListener()'
 }
 
-java = File.open( "src/org/genie/SwiftTest.java", "w" )
+referenceExceptionJava = {
+    'boolean' => 'true',
+    'String' => '"123"',
+    'TestListener' => 'new SwiftTestListener()'
+}
+
+java = File.open( "src/org/swiftjava/SwiftTest.java", "w" )
+java2 = File.open( "src/com/johnholdsworth/swiftbindings/SwiftHelloTest.java", "w" )
 
 java.puts( <<JAVA )
 
-package org.genie;
+package org.swiftjava;
+
+// auto generated by ../../../gentests.rb
+
+import com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener;
 
 public class SwiftTest {
 
+    public TestListener loopback;
+
     public SwiftTest() {
     }
 
 JAVA
+    
+java2.puts( <<JAVA )
+
+// auto generated by ../../../../gentests.rb
+
+package com.johnholdsworth.swiftbindings;
+
+import com.johnholdsworth.swiftbindings.SwiftHelloTypes.TextListener;
+import com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap;
+import com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList;
+
+public interface SwiftHelloTest {
+
+    public interface TestListener {
+
+        public void setLoopback( TestListener loopback );
+
+JAVA
+        
+
+swift = File.open( "org_swiftjava/test_body.swift", "w" )
+swift2 = File.open( "com_johnholdsworth/Sources/SwiftHelloTestImpl.swift", "w" )
+
+swift2.puts( <<SWIFT )
+
+// auto generated by ../../gentests.rb
+
+import java_swift
+import Foundation
 
-swift = File.open( "org_genie/test_body.swift", "w" )
+public class SwiftTestListener: SwiftHelloTest_TestListenerBase {
+
+    var loopback: SwiftHelloTest_TestListener?
+
+SWIFT
 
 for type in types
 
@@ -49,7 +104,7 @@
     }
 
     public #{type} #{type}Method( #{type} arg ) {
-        return arg;
+        return loopback != null ? loopback.#{type}Method( arg ) : arg;
     }
 
     public static #{type} #{type}ArrayFieldStatic[];
@@ -60,7 +115,7 @@
     }
 
     public #{type}[] #{type}ArrayMethod( #{type} arg[] ) {
-        return arg;
+        return loopback != null ? loopback.#{type}ArrayMethod( arg ) : arg;
     }
 
     public static #{type} #{type}2dArrayFieldStatic[][];
@@ -71,9 +126,16 @@
     }
 
     public #{type}[][] #{type}2dArrayMethod( #{type} arg[][] ) {
-        return arg;
+        return loopback != null ? loopback.#{type}2dArrayMethod( arg ) : arg;
     }
 
+JAVA
+
+    java2.puts( <<JAVA )
+        public #{type} #{type}Method( #{type} arg );
+        public #{type}[] #{type}ArrayMethod( #{type} arg[] );
+        public #{type}[][] #{type}2dArrayMethod( #{type} arg[][] );
+
 JAVA
 
     swift.puts( <<SWIFT )
@@ -85,31 +147,181 @@
 
             SwiftTest.#{type}FieldStatic = reference
             XCTAssertEqual( SwiftTest.#{type}FieldStatic, reference )
-            instance.#{type}Field = reference
-            XCTAssertEqual( instance.#{type}Field, reference )
+//            instance.#{type}Field = reference
+//            XCTAssertEqual( instance.#{type}Field, reference )
 
             SwiftTest.#{type}ArrayFieldStatic = referenceArray
             XCTAssertEqual( SwiftTest.#{type}ArrayFieldStatic, referenceArray )
-            instance.#{type}ArrayField = referenceArray
-            XCTAssertEqual( instance.#{type}ArrayField, referenceArray )
+//            instance.#{type}ArrayField = referenceArray
+//            XCTAssertEqual( instance.#{type}ArrayField, referenceArray )
 
             SwiftTest.#{type}2dArrayFieldStatic = reference2dArray
             XCTAssertEqual( SwiftTest.#{type}2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.#{type}2dArrayField = reference2dArray
-            XCTAssertEqual( instance.#{type}2dArrayField[0], reference2dArray[0] )
+//            instance.#{type}2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.#{type}2dArrayField[0], reference2dArray[0] )
 
-            XCTAssertEqual( SwiftTest.#{type}MethodStatic( reference ), reference )
+//            XCTAssertEqual( SwiftTest.#{type}MethodStatic( reference ), reference )
             XCTAssertEqual( instance.#{type}Method( reference ), reference )
 
-            XCTAssertEqual( SwiftTest.#{type}ArrayMethodStatic( referenceArray ), referenceArray )
+//            XCTAssertEqual( SwiftTest.#{type}ArrayMethodStatic( referenceArray ), referenceArray )
             XCTAssertEqual( instance.#{type}ArrayMethod( referenceArray ), referenceArray )
 
-            XCTAssertEqual( SwiftTest.#{type}2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+//            XCTAssertEqual( SwiftTest.#{type}2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
             XCTAssertEqual( instance.#{type}2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
         }
+SWIFT
+
+    opt = type == "String" || type == "TestListener" ? "?" : ""
+    atype = arrayException[type] || swiftTypes[type]
+    swift2.puts( <<SWIFT )
+    override public func #{type}Method( arg: #{swiftTypes[type]}#{opt} ) -> #{swiftTypes[type]}#{opt} {
+        return loopback?.#{type}Method( arg: arg ) ?? arg
+    }
+
+    override public func #{type}ArrayMethod( arg: [#{atype}]? ) -> [#{atype}]? {
+        return loopback?.#{type}ArrayMethod( arg: arg ) ?? arg
+    }
+
+    override public func #{type}2dArrayMethod( arg: [[#{atype}]]? ) -> [[#{atype}]]? {
+        return loopback?.#{type}2dArrayMethod( arg: arg ) ?? arg
+    }
+
 SWIFT
 end
 
+java2.puts( <<JAVA )
+        public ListenerMap testMap( ListenerMap arg );
+        public ListenerMapList testMapList( ListenerMapList arg );
+
+    }
+
+    public static class TestResponderAdapter implements TestListener {
+
+        public TestListener loopback;
+
+        public void setLoopback( TestListener loopback ) {
+            this.loopback = loopback;
+        }
+
+JAVA
+
+swift2.puts( <<SWIFT )
+}
+
+public class SwiftTestResponder {
+
+    static var tcount = 0
+
+    public func respond( to responder: SwiftHelloTest_TestListener ) {
+        SwiftTestResponder.tcount += 1
+        NSLog("Swift -> Java \\(SwiftTestResponder.tcount)...")
+SWIFT
+
+for type in types
+    java2.puts( <<JAVA )
+        public #{type} #{type}Method( #{type} arg ) {
+            return loopback != null ? loopback.#{type}Method( arg ) : arg;
+        }
+
+        public #{type}[] #{type}ArrayMethod( #{type} arg[] ) {
+            return loopback != null ? loopback.#{type}ArrayMethod( arg ) : arg;
+        }
+
+        public #{type}[][] #{type}2dArrayMethod( #{type} arg[][] ) {
+            return loopback != null ? loopback.#{type}2dArrayMethod( arg ) : arg;
+        }
+
+JAVA
+
+    swift2.puts( <<SWIFT )
+
+        if true {
+            let reference: #{swiftTypes[type]} = #{referenceException[type] || '123'}
+            let referenceArray = [#{arrayException[type] || ''}(reference)]
+            let reference2dArray = [referenceArray]
+
+            let response = responder.#{type}Method( arg: reference )
+            let responseArray = responder.#{type}ArrayMethod( arg: referenceArray )!
+            _ = responder.#{type}2dArrayMethod( arg: reference2dArray )
+SWIFT
+
+    if swiftTypes[type] != "SwiftHelloTest_TestListener" then
+        swift2.puts( <<SWIFT )
+
+            if response != reference {
+                NSLog("#{swiftTypes[type]}: \\(String(describing: response)) != \\(reference)")
+            }
+            if responseArray != referenceArray {
+                NSLog("#{swiftTypes[type]}: \\(responseArray) != \\(referenceArray)")
+            }
+SWIFT
+    end
+    swift2.puts( <<SWIFT )
+        }
+
+SWIFT
+end
+
+java2.puts( <<JAVA )
+        public ListenerMap testMap( ListenerMap arg ) {
+            return loopback != null ? loopback.testMap( arg ) : arg;
+        }
+
+        public ListenerMapList testMapList( ListenerMapList arg ) {
+            return loopback != null ? loopback.testMapList( arg ) : arg;
+        }
+
+    }
+
+    public static class SwiftTestListener extends TestResponderAdapter {
+
+        static int tcount = 0;
+
+        public void respond( TestListener responder ) {
+            tcount += 1;
+            System.out.println("Java -> Swift "+tcount+"...");
+
+JAVA
+
+for type in types
+    java2.puts( <<SWIFT )
+
+            if ( true ) {
+                #{type} reference = #{referenceExceptionJava[type] || '123'};
+                #{type} referenceArray[] = new #{type} [] {reference};
+                #{type} reference2dArray[][] = new #{type} [][] {referenceArray};
+
+                #{type} response = responder.#{type}Method( reference );
+                #{type} responseArray[] = responder.#{type}ArrayMethod( referenceArray );
+                #{type} response2dArray[][] = responder.#{type}2dArrayMethod( reference2dArray );
+SWIFT
+    if swiftTypes[type] != "SwiftHelloTest_TestListener" && type != "String" then
+        java2.puts( <<SWIFT )
+
+                if ( response != reference ) {
+                    System.out.println("#{swiftTypes[type]}: "+response+" != "+reference);
+                }
+                if ( responseArray[0] != referenceArray[0] ) {
+                    System.out.println("#{swiftTypes[type]}: "+responseArray[0]+" != "+referenceArray[0]);
+                }
+                if ( response2dArray[0][0] != reference2dArray[0][0] ) {
+                    System.out.println("#{swiftTypes[type]}: "+response2dArray[0][0]+" != "+reference2dArray[0][0]);
+                }
+SWIFT
+    end
+    java2.puts( <<SWIFT )
+            }
+SWIFT
+end
+
+swift2.puts( "    }\n\n}\n" )
+swift2.close()
+swift.close()
+
+java2.puts( "       }\n\n    }\n\n}\n" )
+java2.close()
+
 java.puts( "}\n" )
+java.close()
 
-system( "./genjar.sh && ./genswift.sh org/genie/SwiftTest genie.jar" );
+system( "./genjar.sh && ./genswift.sh org/swiftjava/SwiftTest swiftjava.jar" );
diff --git a/java_awt b/java_awt
index e83f00c..f9b52c9 160000
--- a/java_awt
+++ b/java_awt
@@ -1 +1 @@
-Subproject commit e83f00c1aa00553fa50559774aa3065c67eb1589
+Subproject commit f9b52c9422fa0a438492480bbb8c0adf8bef31a8
diff --git a/java_lang b/java_lang
index 4269b30..6db935c 160000
--- a/java_lang
+++ b/java_lang
@@ -1 +1 @@
-Subproject commit 4269b304b151659c362796ca62a81f990294f1e6
+Subproject commit 6db935cf4059165652ed7e8830958db76edd0ec2
diff --git a/java_sql b/java_sql
index 95c04d4..0222816 160000
--- a/java_sql
+++ b/java_sql
@@ -1 +1 @@
-Subproject commit 95c04d4b16c574acd3f24e0006fd364846f5ab10
+Subproject commit 022281686495e5236ada276d66f3847a38852782
diff --git a/java_swift b/java_swift
index 175097a..0d62467 160000
--- a/java_swift
+++ b/java_swift
@@ -1 +1 @@
-Subproject commit 175097a5dcb3705f381907e6f65de089c258f6df
+Subproject commit 0d62467b08ee6f123f1a505ce152ba9ed67be977
diff --git a/java_util b/java_util
index 1b4edad..812eb50 160000
--- a/java_util
+++ b/java_util
@@ -1 +1 @@
-Subproject commit 1b4edad33d6cfdfa9c47eda3124e124126311e91
+Subproject commit 812eb50d52eda0ff78b755b547472c49678491f6
diff --git a/javax_swing b/javax_swing
index 7bfa343..ab7f4e0 160000
--- a/javax_swing
+++ b/javax_swing
@@ -1 +1 @@
-Subproject commit 7bfa3436c6d6764bee0df0a1c4eaa1d62a9e10cb
+Subproject commit ab7f4e099dd6449818ecfa225ff2f9317d114323
diff --git a/org_genie/Sources/SwiftTest.swift b/org_genie/Sources/SwiftTest.swift
deleted file mode 100644
index 4b8207b..0000000
--- a/org_genie/Sources/SwiftTest.swift
+++ /dev/null
@@ -1,1701 +0,0 @@
-
-import java_lang
-
-/// class org.genie.SwiftTest ///
-
-public class SwiftTest: java_lang.JavaObject {
-
-    public convenience init?( casting object: java_lang.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
-        self.init( javaObject: object.javaObject )
-        if !object.validDownCast( toJavaClass: "org.genie.SwiftTest", file, line ) {
-            return nil
-        }
-    }
-
-    private static var SwiftTestJNIClass: jclass?
-
-    /// public static boolean org.genie.SwiftTest.booleanFieldStatic
-
-    private static var booleanFieldStatic_FieldID: jfieldID?
-
-    public static var booleanFieldStatic: Bool {
-        get {
-            let value = JNIField.GetStaticBooleanField( fieldName: "booleanFieldStatic", fieldType: "Z", fieldCache: &booleanFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: Bool(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticBooleanField( fieldName: "booleanFieldStatic", fieldType: "Z", fieldCache: &booleanFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.z )
-        }
-    }
-
-    /// public boolean org.genie.SwiftTest.booleanField
-
-    private static var booleanField_FieldID: jfieldID?
-
-    public var booleanField: Bool {
-        get {
-            let value = JNIField.GetBooleanField( fieldName: "booleanField", fieldType: "Z", fieldCache: &SwiftTest.booleanField_FieldID, object: javaObject )
-            return JNIType.decode( type: Bool(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetBooleanField( fieldName: "booleanField", fieldType: "Z", fieldCache: &SwiftTest.booleanField_FieldID, object: javaObject, value: value.z )
-        }
-    }
-
-    /// public static boolean[] org.genie.SwiftTest.booleanArrayFieldStatic
-
-    private static var booleanArrayFieldStatic_FieldID: jfieldID?
-
-    public static var booleanArrayFieldStatic: [Bool]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "booleanArrayFieldStatic", fieldType: "[Z", fieldCache: &booleanArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [Bool](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "booleanArrayFieldStatic", fieldType: "[Z", fieldCache: &booleanArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public boolean[] org.genie.SwiftTest.booleanArrayField
-
-    private static var booleanArrayField_FieldID: jfieldID?
-
-    public var booleanArrayField: [Bool]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "booleanArrayField", fieldType: "[Z", fieldCache: &SwiftTest.booleanArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [Bool](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "booleanArrayField", fieldType: "[Z", fieldCache: &SwiftTest.booleanArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static boolean[][] org.genie.SwiftTest.boolean2dArrayFieldStatic
-
-    private static var boolean2dArrayFieldStatic_FieldID: jfieldID?
-
-    public static var boolean2dArrayFieldStatic: [[Bool]]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "boolean2dArrayFieldStatic", fieldType: "[[Z", fieldCache: &boolean2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [[Bool]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "boolean2dArrayFieldStatic", fieldType: "[[Z", fieldCache: &boolean2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public boolean[][] org.genie.SwiftTest.boolean2dArrayField
-
-    private static var boolean2dArrayField_FieldID: jfieldID?
-
-    public var boolean2dArrayField: [[Bool]]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "boolean2dArrayField", fieldType: "[[Z", fieldCache: &SwiftTest.boolean2dArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [[Bool]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "boolean2dArrayField", fieldType: "[[Z", fieldCache: &SwiftTest.boolean2dArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static byte org.genie.SwiftTest.byteFieldStatic
-
-    private static var byteFieldStatic_FieldID: jfieldID?
-
-    public static var byteFieldStatic: Int8 {
-        get {
-            let value = JNIField.GetStaticByteField( fieldName: "byteFieldStatic", fieldType: "B", fieldCache: &byteFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: Int8(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticByteField( fieldName: "byteFieldStatic", fieldType: "B", fieldCache: &byteFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.b )
-        }
-    }
-
-    /// public byte org.genie.SwiftTest.byteField
-
-    private static var byteField_FieldID: jfieldID?
-
-    public var byteField: Int8 {
-        get {
-            let value = JNIField.GetByteField( fieldName: "byteField", fieldType: "B", fieldCache: &SwiftTest.byteField_FieldID, object: javaObject )
-            return JNIType.decode( type: Int8(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetByteField( fieldName: "byteField", fieldType: "B", fieldCache: &SwiftTest.byteField_FieldID, object: javaObject, value: value.b )
-        }
-    }
-
-    /// public static byte[] org.genie.SwiftTest.byteArrayFieldStatic
-
-    private static var byteArrayFieldStatic_FieldID: jfieldID?
-
-    public static var byteArrayFieldStatic: [Int8]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "byteArrayFieldStatic", fieldType: "[B", fieldCache: &byteArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [Int8](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "byteArrayFieldStatic", fieldType: "[B", fieldCache: &byteArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public byte[] org.genie.SwiftTest.byteArrayField
-
-    private static var byteArrayField_FieldID: jfieldID?
-
-    public var byteArrayField: [Int8]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "byteArrayField", fieldType: "[B", fieldCache: &SwiftTest.byteArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [Int8](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "byteArrayField", fieldType: "[B", fieldCache: &SwiftTest.byteArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static byte[][] org.genie.SwiftTest.byte2dArrayFieldStatic
-
-    private static var byte2dArrayFieldStatic_FieldID: jfieldID?
-
-    public static var byte2dArrayFieldStatic: [[Int8]]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "byte2dArrayFieldStatic", fieldType: "[[B", fieldCache: &byte2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [[Int8]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "byte2dArrayFieldStatic", fieldType: "[[B", fieldCache: &byte2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public byte[][] org.genie.SwiftTest.byte2dArrayField
-
-    private static var byte2dArrayField_FieldID: jfieldID?
-
-    public var byte2dArrayField: [[Int8]]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "byte2dArrayField", fieldType: "[[B", fieldCache: &SwiftTest.byte2dArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [[Int8]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "byte2dArrayField", fieldType: "[[B", fieldCache: &SwiftTest.byte2dArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static char org.genie.SwiftTest.charFieldStatic
-
-    private static var charFieldStatic_FieldID: jfieldID?
-
-    public static var charFieldStatic: UInt16 {
-        get {
-            let value = JNIField.GetStaticCharField( fieldName: "charFieldStatic", fieldType: "C", fieldCache: &charFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: UInt16(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticCharField( fieldName: "charFieldStatic", fieldType: "C", fieldCache: &charFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.c )
-        }
-    }
-
-    /// public char org.genie.SwiftTest.charField
-
-    private static var charField_FieldID: jfieldID?
-
-    public var charField: UInt16 {
-        get {
-            let value = JNIField.GetCharField( fieldName: "charField", fieldType: "C", fieldCache: &SwiftTest.charField_FieldID, object: javaObject )
-            return JNIType.decode( type: UInt16(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetCharField( fieldName: "charField", fieldType: "C", fieldCache: &SwiftTest.charField_FieldID, object: javaObject, value: value.c )
-        }
-    }
-
-    /// public static char[] org.genie.SwiftTest.charArrayFieldStatic
-
-    private static var charArrayFieldStatic_FieldID: jfieldID?
-
-    public static var charArrayFieldStatic: [UInt16]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "charArrayFieldStatic", fieldType: "[C", fieldCache: &charArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [UInt16](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "charArrayFieldStatic", fieldType: "[C", fieldCache: &charArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public char[] org.genie.SwiftTest.charArrayField
-
-    private static var charArrayField_FieldID: jfieldID?
-
-    public var charArrayField: [UInt16]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "charArrayField", fieldType: "[C", fieldCache: &SwiftTest.charArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [UInt16](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "charArrayField", fieldType: "[C", fieldCache: &SwiftTest.charArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static char[][] org.genie.SwiftTest.char2dArrayFieldStatic
-
-    private static var char2dArrayFieldStatic_FieldID: jfieldID?
-
-    public static var char2dArrayFieldStatic: [[UInt16]]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "char2dArrayFieldStatic", fieldType: "[[C", fieldCache: &char2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [[UInt16]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "char2dArrayFieldStatic", fieldType: "[[C", fieldCache: &char2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public char[][] org.genie.SwiftTest.char2dArrayField
-
-    private static var char2dArrayField_FieldID: jfieldID?
-
-    public var char2dArrayField: [[UInt16]]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "char2dArrayField", fieldType: "[[C", fieldCache: &SwiftTest.char2dArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [[UInt16]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "char2dArrayField", fieldType: "[[C", fieldCache: &SwiftTest.char2dArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static short org.genie.SwiftTest.shortFieldStatic
-
-    private static var shortFieldStatic_FieldID: jfieldID?
-
-    public static var shortFieldStatic: Int16 {
-        get {
-            let value = JNIField.GetStaticShortField( fieldName: "shortFieldStatic", fieldType: "S", fieldCache: &shortFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: Int16(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticShortField( fieldName: "shortFieldStatic", fieldType: "S", fieldCache: &shortFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.s )
-        }
-    }
-
-    /// public short org.genie.SwiftTest.shortField
-
-    private static var shortField_FieldID: jfieldID?
-
-    public var shortField: Int16 {
-        get {
-            let value = JNIField.GetShortField( fieldName: "shortField", fieldType: "S", fieldCache: &SwiftTest.shortField_FieldID, object: javaObject )
-            return JNIType.decode( type: Int16(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetShortField( fieldName: "shortField", fieldType: "S", fieldCache: &SwiftTest.shortField_FieldID, object: javaObject, value: value.s )
-        }
-    }
-
-    /// public static short[] org.genie.SwiftTest.shortArrayFieldStatic
-
-    private static var shortArrayFieldStatic_FieldID: jfieldID?
-
-    public static var shortArrayFieldStatic: [Int16]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "shortArrayFieldStatic", fieldType: "[S", fieldCache: &shortArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [Int16](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "shortArrayFieldStatic", fieldType: "[S", fieldCache: &shortArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public short[] org.genie.SwiftTest.shortArrayField
-
-    private static var shortArrayField_FieldID: jfieldID?
-
-    public var shortArrayField: [Int16]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "shortArrayField", fieldType: "[S", fieldCache: &SwiftTest.shortArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [Int16](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "shortArrayField", fieldType: "[S", fieldCache: &SwiftTest.shortArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static short[][] org.genie.SwiftTest.short2dArrayFieldStatic
-
-    private static var short2dArrayFieldStatic_FieldID: jfieldID?
-
-    public static var short2dArrayFieldStatic: [[Int16]]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "short2dArrayFieldStatic", fieldType: "[[S", fieldCache: &short2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [[Int16]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "short2dArrayFieldStatic", fieldType: "[[S", fieldCache: &short2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public short[][] org.genie.SwiftTest.short2dArrayField
-
-    private static var short2dArrayField_FieldID: jfieldID?
-
-    public var short2dArrayField: [[Int16]]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "short2dArrayField", fieldType: "[[S", fieldCache: &SwiftTest.short2dArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [[Int16]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "short2dArrayField", fieldType: "[[S", fieldCache: &SwiftTest.short2dArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static int org.genie.SwiftTest.intFieldStatic
-
-    private static var intFieldStatic_FieldID: jfieldID?
-
-    public static var intFieldStatic: Int {
-        get {
-            let value = JNIField.GetStaticIntField( fieldName: "intFieldStatic", fieldType: "I", fieldCache: &intFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: Int(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticIntField( fieldName: "intFieldStatic", fieldType: "I", fieldCache: &intFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.i )
-        }
-    }
-
-    /// public int org.genie.SwiftTest.intField
-
-    private static var intField_FieldID: jfieldID?
-
-    public var intField: Int {
-        get {
-            let value = JNIField.GetIntField( fieldName: "intField", fieldType: "I", fieldCache: &SwiftTest.intField_FieldID, object: javaObject )
-            return JNIType.decode( type: Int(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetIntField( fieldName: "intField", fieldType: "I", fieldCache: &SwiftTest.intField_FieldID, object: javaObject, value: value.i )
-        }
-    }
-
-    /// public static int[] org.genie.SwiftTest.intArrayFieldStatic
-
-    private static var intArrayFieldStatic_FieldID: jfieldID?
-
-    public static var intArrayFieldStatic: [Int32]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "intArrayFieldStatic", fieldType: "[I", fieldCache: &intArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [Int32](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "intArrayFieldStatic", fieldType: "[I", fieldCache: &intArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public int[] org.genie.SwiftTest.intArrayField
-
-    private static var intArrayField_FieldID: jfieldID?
-
-    public var intArrayField: [Int32]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "intArrayField", fieldType: "[I", fieldCache: &SwiftTest.intArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [Int32](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "intArrayField", fieldType: "[I", fieldCache: &SwiftTest.intArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static int[][] org.genie.SwiftTest.int2dArrayFieldStatic
-
-    private static var int2dArrayFieldStatic_FieldID: jfieldID?
-
-    public static var int2dArrayFieldStatic: [[Int32]]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "int2dArrayFieldStatic", fieldType: "[[I", fieldCache: &int2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [[Int32]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "int2dArrayFieldStatic", fieldType: "[[I", fieldCache: &int2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public int[][] org.genie.SwiftTest.int2dArrayField
-
-    private static var int2dArrayField_FieldID: jfieldID?
-
-    public var int2dArrayField: [[Int32]]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "int2dArrayField", fieldType: "[[I", fieldCache: &SwiftTest.int2dArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [[Int32]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "int2dArrayField", fieldType: "[[I", fieldCache: &SwiftTest.int2dArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static long org.genie.SwiftTest.longFieldStatic
-
-    private static var longFieldStatic_FieldID: jfieldID?
-
-    public static var longFieldStatic: Int64 {
-        get {
-            let value = JNIField.GetStaticLongField( fieldName: "longFieldStatic", fieldType: "J", fieldCache: &longFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: Int64(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticLongField( fieldName: "longFieldStatic", fieldType: "J", fieldCache: &longFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.j )
-        }
-    }
-
-    /// public long org.genie.SwiftTest.longField
-
-    private static var longField_FieldID: jfieldID?
-
-    public var longField: Int64 {
-        get {
-            let value = JNIField.GetLongField( fieldName: "longField", fieldType: "J", fieldCache: &SwiftTest.longField_FieldID, object: javaObject )
-            return JNIType.decode( type: Int64(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetLongField( fieldName: "longField", fieldType: "J", fieldCache: &SwiftTest.longField_FieldID, object: javaObject, value: value.j )
-        }
-    }
-
-    /// public static long[] org.genie.SwiftTest.longArrayFieldStatic
-
-    private static var longArrayFieldStatic_FieldID: jfieldID?
-
-    public static var longArrayFieldStatic: [Int64]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "longArrayFieldStatic", fieldType: "[J", fieldCache: &longArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [Int64](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "longArrayFieldStatic", fieldType: "[J", fieldCache: &longArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public long[] org.genie.SwiftTest.longArrayField
-
-    private static var longArrayField_FieldID: jfieldID?
-
-    public var longArrayField: [Int64]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "longArrayField", fieldType: "[J", fieldCache: &SwiftTest.longArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [Int64](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "longArrayField", fieldType: "[J", fieldCache: &SwiftTest.longArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static long[][] org.genie.SwiftTest.long2dArrayFieldStatic
-
-    private static var long2dArrayFieldStatic_FieldID: jfieldID?
-
-    public static var long2dArrayFieldStatic: [[Int64]]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "long2dArrayFieldStatic", fieldType: "[[J", fieldCache: &long2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [[Int64]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "long2dArrayFieldStatic", fieldType: "[[J", fieldCache: &long2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public long[][] org.genie.SwiftTest.long2dArrayField
-
-    private static var long2dArrayField_FieldID: jfieldID?
-
-    public var long2dArrayField: [[Int64]]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "long2dArrayField", fieldType: "[[J", fieldCache: &SwiftTest.long2dArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [[Int64]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "long2dArrayField", fieldType: "[[J", fieldCache: &SwiftTest.long2dArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static float org.genie.SwiftTest.floatFieldStatic
-
-    private static var floatFieldStatic_FieldID: jfieldID?
-
-    public static var floatFieldStatic: Float {
-        get {
-            let value = JNIField.GetStaticFloatField( fieldName: "floatFieldStatic", fieldType: "F", fieldCache: &floatFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: Float(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticFloatField( fieldName: "floatFieldStatic", fieldType: "F", fieldCache: &floatFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.f )
-        }
-    }
-
-    /// public float org.genie.SwiftTest.floatField
-
-    private static var floatField_FieldID: jfieldID?
-
-    public var floatField: Float {
-        get {
-            let value = JNIField.GetFloatField( fieldName: "floatField", fieldType: "F", fieldCache: &SwiftTest.floatField_FieldID, object: javaObject )
-            return JNIType.decode( type: Float(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetFloatField( fieldName: "floatField", fieldType: "F", fieldCache: &SwiftTest.floatField_FieldID, object: javaObject, value: value.f )
-        }
-    }
-
-    /// public static float[] org.genie.SwiftTest.floatArrayFieldStatic
-
-    private static var floatArrayFieldStatic_FieldID: jfieldID?
-
-    public static var floatArrayFieldStatic: [Float]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "floatArrayFieldStatic", fieldType: "[F", fieldCache: &floatArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [Float](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "floatArrayFieldStatic", fieldType: "[F", fieldCache: &floatArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public float[] org.genie.SwiftTest.floatArrayField
-
-    private static var floatArrayField_FieldID: jfieldID?
-
-    public var floatArrayField: [Float]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "floatArrayField", fieldType: "[F", fieldCache: &SwiftTest.floatArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [Float](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "floatArrayField", fieldType: "[F", fieldCache: &SwiftTest.floatArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static float[][] org.genie.SwiftTest.float2dArrayFieldStatic
-
-    private static var float2dArrayFieldStatic_FieldID: jfieldID?
-
-    public static var float2dArrayFieldStatic: [[Float]]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "float2dArrayFieldStatic", fieldType: "[[F", fieldCache: &float2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [[Float]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "float2dArrayFieldStatic", fieldType: "[[F", fieldCache: &float2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public float[][] org.genie.SwiftTest.float2dArrayField
-
-    private static var float2dArrayField_FieldID: jfieldID?
-
-    public var float2dArrayField: [[Float]]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "float2dArrayField", fieldType: "[[F", fieldCache: &SwiftTest.float2dArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [[Float]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "float2dArrayField", fieldType: "[[F", fieldCache: &SwiftTest.float2dArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static double org.genie.SwiftTest.doubleFieldStatic
-
-    private static var doubleFieldStatic_FieldID: jfieldID?
-
-    public static var doubleFieldStatic: Double {
-        get {
-            let value = JNIField.GetStaticDoubleField( fieldName: "doubleFieldStatic", fieldType: "D", fieldCache: &doubleFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: Double(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticDoubleField( fieldName: "doubleFieldStatic", fieldType: "D", fieldCache: &doubleFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.d )
-        }
-    }
-
-    /// public double org.genie.SwiftTest.doubleField
-
-    private static var doubleField_FieldID: jfieldID?
-
-    public var doubleField: Double {
-        get {
-            let value = JNIField.GetDoubleField( fieldName: "doubleField", fieldType: "D", fieldCache: &SwiftTest.doubleField_FieldID, object: javaObject )
-            return JNIType.decode( type: Double(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetDoubleField( fieldName: "doubleField", fieldType: "D", fieldCache: &SwiftTest.doubleField_FieldID, object: javaObject, value: value.d )
-        }
-    }
-
-    /// public static double[] org.genie.SwiftTest.doubleArrayFieldStatic
-
-    private static var doubleArrayFieldStatic_FieldID: jfieldID?
-
-    public static var doubleArrayFieldStatic: [Double]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "doubleArrayFieldStatic", fieldType: "[D", fieldCache: &doubleArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [Double](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "doubleArrayFieldStatic", fieldType: "[D", fieldCache: &doubleArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public double[] org.genie.SwiftTest.doubleArrayField
-
-    private static var doubleArrayField_FieldID: jfieldID?
-
-    public var doubleArrayField: [Double]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "doubleArrayField", fieldType: "[D", fieldCache: &SwiftTest.doubleArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [Double](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "doubleArrayField", fieldType: "[D", fieldCache: &SwiftTest.doubleArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static double[][] org.genie.SwiftTest.double2dArrayFieldStatic
-
-    private static var double2dArrayFieldStatic_FieldID: jfieldID?
-
-    public static var double2dArrayFieldStatic: [[Double]]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "double2dArrayFieldStatic", fieldType: "[[D", fieldCache: &double2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [[Double]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "double2dArrayFieldStatic", fieldType: "[[D", fieldCache: &double2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public double[][] org.genie.SwiftTest.double2dArrayField
-
-    private static var double2dArrayField_FieldID: jfieldID?
-
-    public var double2dArrayField: [[Double]]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "double2dArrayField", fieldType: "[[D", fieldCache: &SwiftTest.double2dArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [[Double]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "double2dArrayField", fieldType: "[[D", fieldCache: &SwiftTest.double2dArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static java.lang.String org.genie.SwiftTest.StringFieldStatic
-
-    private static var StringFieldStatic_FieldID: jfieldID?
-
-    public static var StringFieldStatic: String! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "StringFieldStatic", fieldType: "Ljava/lang/String;", fieldCache: &StringFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: String(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "StringFieldStatic", fieldType: "Ljava/lang/String;", fieldCache: &StringFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public java.lang.String org.genie.SwiftTest.StringField
-
-    private static var StringField_FieldID: jfieldID?
-
-    public var StringField: String! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "StringField", fieldType: "Ljava/lang/String;", fieldCache: &SwiftTest.StringField_FieldID, object: javaObject )
-            return JNIType.decode( type: String(), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "StringField", fieldType: "Ljava/lang/String;", fieldCache: &SwiftTest.StringField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static java.lang.String[] org.genie.SwiftTest.StringArrayFieldStatic
-
-    private static var StringArrayFieldStatic_FieldID: jfieldID?
-
-    public static var StringArrayFieldStatic: [String]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "StringArrayFieldStatic", fieldType: "[Ljava/lang/String;", fieldCache: &StringArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [String](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "StringArrayFieldStatic", fieldType: "[Ljava/lang/String;", fieldCache: &StringArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public java.lang.String[] org.genie.SwiftTest.StringArrayField
-
-    private static var StringArrayField_FieldID: jfieldID?
-
-    public var StringArrayField: [String]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "StringArrayField", fieldType: "[Ljava/lang/String;", fieldCache: &SwiftTest.StringArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [String](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "StringArrayField", fieldType: "[Ljava/lang/String;", fieldCache: &SwiftTest.StringArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public static java.lang.String[][] org.genie.SwiftTest.String2dArrayFieldStatic
-
-    private static var String2dArrayFieldStatic_FieldID: jfieldID?
-
-    public static var String2dArrayFieldStatic: [[String]]! {
-        get {
-            let value = JNIField.GetStaticObjectField( fieldName: "String2dArrayFieldStatic", fieldType: "[[Ljava/lang/String;", fieldCache: &String2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass )
-            return JNIType.decode( type: [[String]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetStaticObjectField( fieldName: "String2dArrayFieldStatic", fieldType: "[[Ljava/lang/String;", fieldCache: &String2dArrayFieldStatic_FieldID, className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, value: value.l )
-        }
-    }
-
-    /// public java.lang.String[][] org.genie.SwiftTest.String2dArrayField
-
-    private static var String2dArrayField_FieldID: jfieldID?
-
-    public var String2dArrayField: [[String]]! {
-        get {
-            let value = JNIField.GetObjectField( fieldName: "String2dArrayField", fieldType: "[[Ljava/lang/String;", fieldCache: &SwiftTest.String2dArrayField_FieldID, object: javaObject )
-            return JNIType.decode( type: [[String]](), from: value )
-        }
-        set(newValue) {
-            let value = JNIType.encode( value: newValue, locals: nil )
-            JNIField.SetObjectField( fieldName: "String2dArrayField", fieldType: "[[Ljava/lang/String;", fieldCache: &SwiftTest.String2dArrayField_FieldID, object: javaObject, value: value.l )
-        }
-    }
-
-    /// public org.genie.SwiftTest()
-
-    private static var new_MethodID_1: jmethodID?
-
-    public convenience init() {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        let __object = JNIMethod.NewObject( className: "org/genie/SwiftTest", classCache: &SwiftTest.SwiftTestJNIClass, methodSig: "()V", methodCache: &SwiftTest.new_MethodID_1, args: &__args, locals: nil )
-        self.init( javaObject: __object )
-    }
-
-    /// public static boolean org.genie.SwiftTest.booleanMethodStatic(boolean)
-
-    private static var booleanMethodStatic_MethodID_2: jmethodID?
-
-    public class func booleanMethodStatic( arg0: Bool ) -> Bool {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticBooleanMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "booleanMethodStatic", methodSig: "(Z)Z", methodCache: &booleanMethodStatic_MethodID_2, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Bool(), from: __return )
-    }
-
-    public class func booleanMethodStatic( _ _arg0: Bool ) -> Bool {
-        return booleanMethodStatic( arg0: _arg0 )
-    }
-
-    /// public boolean org.genie.SwiftTest.booleanMethod(boolean)
-
-    private static var booleanMethod_MethodID_3: jmethodID?
-
-    public func booleanMethod( arg0: Bool ) -> Bool {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "booleanMethod", methodSig: "(Z)Z", methodCache: &SwiftTest.booleanMethod_MethodID_3, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Bool(), from: __return )
-    }
-
-    public func booleanMethod( _ _arg0: Bool ) -> Bool {
-        return booleanMethod( arg0: _arg0 )
-    }
-
-    /// public static boolean[] org.genie.SwiftTest.booleanArrayMethodStatic(boolean[])
-
-    private static var booleanArrayMethodStatic_MethodID_4: jmethodID?
-
-    public class func booleanArrayMethodStatic( arg0: [Bool]? ) -> [Bool]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "booleanArrayMethodStatic", methodSig: "([Z)[Z", methodCache: &booleanArrayMethodStatic_MethodID_4, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Bool](), from: __return )
-    }
-
-    public class func booleanArrayMethodStatic( _ _arg0: [Bool]? ) -> [Bool]! {
-        return booleanArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public boolean[] org.genie.SwiftTest.booleanArrayMethod(boolean[])
-
-    private static var booleanArrayMethod_MethodID_5: jmethodID?
-
-    public func booleanArrayMethod( arg0: [Bool]? ) -> [Bool]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "booleanArrayMethod", methodSig: "([Z)[Z", methodCache: &SwiftTest.booleanArrayMethod_MethodID_5, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Bool](), from: __return )
-    }
-
-    public func booleanArrayMethod( _ _arg0: [Bool]? ) -> [Bool]! {
-        return booleanArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static boolean[][] org.genie.SwiftTest.boolean2dArrayMethodStatic(boolean[][])
-
-    private static var boolean2dArrayMethodStatic_MethodID_6: jmethodID?
-
-    public class func boolean2dArrayMethodStatic( arg0: [[Bool]]? ) -> [[Bool]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "boolean2dArrayMethodStatic", methodSig: "([[Z)[[Z", methodCache: &boolean2dArrayMethodStatic_MethodID_6, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Bool]](), from: __return )
-    }
-
-    public class func boolean2dArrayMethodStatic( _ _arg0: [[Bool]]? ) -> [[Bool]]! {
-        return boolean2dArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public boolean[][] org.genie.SwiftTest.boolean2dArrayMethod(boolean[][])
-
-    private static var boolean2dArrayMethod_MethodID_7: jmethodID?
-
-    public func boolean2dArrayMethod( arg0: [[Bool]]? ) -> [[Bool]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "boolean2dArrayMethod", methodSig: "([[Z)[[Z", methodCache: &SwiftTest.boolean2dArrayMethod_MethodID_7, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Bool]](), from: __return )
-    }
-
-    public func boolean2dArrayMethod( _ _arg0: [[Bool]]? ) -> [[Bool]]! {
-        return boolean2dArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static byte org.genie.SwiftTest.byteMethodStatic(byte)
-
-    private static var byteMethodStatic_MethodID_8: jmethodID?
-
-    public class func byteMethodStatic( arg0: Int8 ) -> Int8 {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticByteMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "byteMethodStatic", methodSig: "(B)B", methodCache: &byteMethodStatic_MethodID_8, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Int8(), from: __return )
-    }
-
-    public class func byteMethodStatic( _ _arg0: Int8 ) -> Int8 {
-        return byteMethodStatic( arg0: _arg0 )
-    }
-
-    /// public byte org.genie.SwiftTest.byteMethod(byte)
-
-    private static var byteMethod_MethodID_9: jmethodID?
-
-    public func byteMethod( arg0: Int8 ) -> Int8 {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallByteMethod( object: javaObject, methodName: "byteMethod", methodSig: "(B)B", methodCache: &SwiftTest.byteMethod_MethodID_9, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Int8(), from: __return )
-    }
-
-    public func byteMethod( _ _arg0: Int8 ) -> Int8 {
-        return byteMethod( arg0: _arg0 )
-    }
-
-    /// public static byte[] org.genie.SwiftTest.byteArrayMethodStatic(byte[])
-
-    private static var byteArrayMethodStatic_MethodID_10: jmethodID?
-
-    public class func byteArrayMethodStatic( arg0: [Int8]? ) -> [Int8]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "byteArrayMethodStatic", methodSig: "([B)[B", methodCache: &byteArrayMethodStatic_MethodID_10, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Int8](), from: __return )
-    }
-
-    public class func byteArrayMethodStatic( _ _arg0: [Int8]? ) -> [Int8]! {
-        return byteArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public byte[] org.genie.SwiftTest.byteArrayMethod(byte[])
-
-    private static var byteArrayMethod_MethodID_11: jmethodID?
-
-    public func byteArrayMethod( arg0: [Int8]? ) -> [Int8]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "byteArrayMethod", methodSig: "([B)[B", methodCache: &SwiftTest.byteArrayMethod_MethodID_11, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Int8](), from: __return )
-    }
-
-    public func byteArrayMethod( _ _arg0: [Int8]? ) -> [Int8]! {
-        return byteArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static byte[][] org.genie.SwiftTest.byte2dArrayMethodStatic(byte[][])
-
-    private static var byte2dArrayMethodStatic_MethodID_12: jmethodID?
-
-    public class func byte2dArrayMethodStatic( arg0: [[Int8]]? ) -> [[Int8]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "byte2dArrayMethodStatic", methodSig: "([[B)[[B", methodCache: &byte2dArrayMethodStatic_MethodID_12, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Int8]](), from: __return )
-    }
-
-    public class func byte2dArrayMethodStatic( _ _arg0: [[Int8]]? ) -> [[Int8]]! {
-        return byte2dArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public byte[][] org.genie.SwiftTest.byte2dArrayMethod(byte[][])
-
-    private static var byte2dArrayMethod_MethodID_13: jmethodID?
-
-    public func byte2dArrayMethod( arg0: [[Int8]]? ) -> [[Int8]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "byte2dArrayMethod", methodSig: "([[B)[[B", methodCache: &SwiftTest.byte2dArrayMethod_MethodID_13, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Int8]](), from: __return )
-    }
-
-    public func byte2dArrayMethod( _ _arg0: [[Int8]]? ) -> [[Int8]]! {
-        return byte2dArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static char org.genie.SwiftTest.charMethodStatic(char)
-
-    private static var charMethodStatic_MethodID_14: jmethodID?
-
-    public class func charMethodStatic( arg0: UInt16 ) -> UInt16 {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticCharMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "charMethodStatic", methodSig: "(C)C", methodCache: &charMethodStatic_MethodID_14, args: &__args, locals: &__locals )
-        return JNIType.decode( type: UInt16(), from: __return )
-    }
-
-    public class func charMethodStatic( _ _arg0: UInt16 ) -> UInt16 {
-        return charMethodStatic( arg0: _arg0 )
-    }
-
-    /// public char org.genie.SwiftTest.charMethod(char)
-
-    private static var charMethod_MethodID_15: jmethodID?
-
-    public func charMethod( arg0: UInt16 ) -> UInt16 {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallCharMethod( object: javaObject, methodName: "charMethod", methodSig: "(C)C", methodCache: &SwiftTest.charMethod_MethodID_15, args: &__args, locals: &__locals )
-        return JNIType.decode( type: UInt16(), from: __return )
-    }
-
-    public func charMethod( _ _arg0: UInt16 ) -> UInt16 {
-        return charMethod( arg0: _arg0 )
-    }
-
-    /// public static char[] org.genie.SwiftTest.charArrayMethodStatic(char[])
-
-    private static var charArrayMethodStatic_MethodID_16: jmethodID?
-
-    public class func charArrayMethodStatic( arg0: [UInt16]? ) -> [UInt16]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "charArrayMethodStatic", methodSig: "([C)[C", methodCache: &charArrayMethodStatic_MethodID_16, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [UInt16](), from: __return )
-    }
-
-    public class func charArrayMethodStatic( _ _arg0: [UInt16]? ) -> [UInt16]! {
-        return charArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public char[] org.genie.SwiftTest.charArrayMethod(char[])
-
-    private static var charArrayMethod_MethodID_17: jmethodID?
-
-    public func charArrayMethod( arg0: [UInt16]? ) -> [UInt16]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "charArrayMethod", methodSig: "([C)[C", methodCache: &SwiftTest.charArrayMethod_MethodID_17, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [UInt16](), from: __return )
-    }
-
-    public func charArrayMethod( _ _arg0: [UInt16]? ) -> [UInt16]! {
-        return charArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static char[][] org.genie.SwiftTest.char2dArrayMethodStatic(char[][])
-
-    private static var char2dArrayMethodStatic_MethodID_18: jmethodID?
-
-    public class func char2dArrayMethodStatic( arg0: [[UInt16]]? ) -> [[UInt16]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "char2dArrayMethodStatic", methodSig: "([[C)[[C", methodCache: &char2dArrayMethodStatic_MethodID_18, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[UInt16]](), from: __return )
-    }
-
-    public class func char2dArrayMethodStatic( _ _arg0: [[UInt16]]? ) -> [[UInt16]]! {
-        return char2dArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public char[][] org.genie.SwiftTest.char2dArrayMethod(char[][])
-
-    private static var char2dArrayMethod_MethodID_19: jmethodID?
-
-    public func char2dArrayMethod( arg0: [[UInt16]]? ) -> [[UInt16]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "char2dArrayMethod", methodSig: "([[C)[[C", methodCache: &SwiftTest.char2dArrayMethod_MethodID_19, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[UInt16]](), from: __return )
-    }
-
-    public func char2dArrayMethod( _ _arg0: [[UInt16]]? ) -> [[UInt16]]! {
-        return char2dArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static short org.genie.SwiftTest.shortMethodStatic(short)
-
-    private static var shortMethodStatic_MethodID_20: jmethodID?
-
-    public class func shortMethodStatic( arg0: Int16 ) -> Int16 {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticShortMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "shortMethodStatic", methodSig: "(S)S", methodCache: &shortMethodStatic_MethodID_20, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Int16(), from: __return )
-    }
-
-    public class func shortMethodStatic( _ _arg0: Int16 ) -> Int16 {
-        return shortMethodStatic( arg0: _arg0 )
-    }
-
-    /// public short org.genie.SwiftTest.shortMethod(short)
-
-    private static var shortMethod_MethodID_21: jmethodID?
-
-    public func shortMethod( arg0: Int16 ) -> Int16 {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallShortMethod( object: javaObject, methodName: "shortMethod", methodSig: "(S)S", methodCache: &SwiftTest.shortMethod_MethodID_21, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Int16(), from: __return )
-    }
-
-    public func shortMethod( _ _arg0: Int16 ) -> Int16 {
-        return shortMethod( arg0: _arg0 )
-    }
-
-    /// public static short[] org.genie.SwiftTest.shortArrayMethodStatic(short[])
-
-    private static var shortArrayMethodStatic_MethodID_22: jmethodID?
-
-    public class func shortArrayMethodStatic( arg0: [Int16]? ) -> [Int16]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "shortArrayMethodStatic", methodSig: "([S)[S", methodCache: &shortArrayMethodStatic_MethodID_22, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Int16](), from: __return )
-    }
-
-    public class func shortArrayMethodStatic( _ _arg0: [Int16]? ) -> [Int16]! {
-        return shortArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public short[] org.genie.SwiftTest.shortArrayMethod(short[])
-
-    private static var shortArrayMethod_MethodID_23: jmethodID?
-
-    public func shortArrayMethod( arg0: [Int16]? ) -> [Int16]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "shortArrayMethod", methodSig: "([S)[S", methodCache: &SwiftTest.shortArrayMethod_MethodID_23, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Int16](), from: __return )
-    }
-
-    public func shortArrayMethod( _ _arg0: [Int16]? ) -> [Int16]! {
-        return shortArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static short[][] org.genie.SwiftTest.short2dArrayMethodStatic(short[][])
-
-    private static var short2dArrayMethodStatic_MethodID_24: jmethodID?
-
-    public class func short2dArrayMethodStatic( arg0: [[Int16]]? ) -> [[Int16]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "short2dArrayMethodStatic", methodSig: "([[S)[[S", methodCache: &short2dArrayMethodStatic_MethodID_24, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Int16]](), from: __return )
-    }
-
-    public class func short2dArrayMethodStatic( _ _arg0: [[Int16]]? ) -> [[Int16]]! {
-        return short2dArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public short[][] org.genie.SwiftTest.short2dArrayMethod(short[][])
-
-    private static var short2dArrayMethod_MethodID_25: jmethodID?
-
-    public func short2dArrayMethod( arg0: [[Int16]]? ) -> [[Int16]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "short2dArrayMethod", methodSig: "([[S)[[S", methodCache: &SwiftTest.short2dArrayMethod_MethodID_25, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Int16]](), from: __return )
-    }
-
-    public func short2dArrayMethod( _ _arg0: [[Int16]]? ) -> [[Int16]]! {
-        return short2dArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static int org.genie.SwiftTest.intMethodStatic(int)
-
-    private static var intMethodStatic_MethodID_26: jmethodID?
-
-    public class func intMethodStatic( arg0: Int ) -> Int {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticIntMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "intMethodStatic", methodSig: "(I)I", methodCache: &intMethodStatic_MethodID_26, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Int(), from: __return )
-    }
-
-    public class func intMethodStatic( _ _arg0: Int ) -> Int {
-        return intMethodStatic( arg0: _arg0 )
-    }
-
-    /// public int org.genie.SwiftTest.intMethod(int)
-
-    private static var intMethod_MethodID_27: jmethodID?
-
-    public func intMethod( arg0: Int ) -> Int {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallIntMethod( object: javaObject, methodName: "intMethod", methodSig: "(I)I", methodCache: &SwiftTest.intMethod_MethodID_27, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Int(), from: __return )
-    }
-
-    public func intMethod( _ _arg0: Int ) -> Int {
-        return intMethod( arg0: _arg0 )
-    }
-
-    /// public static int[] org.genie.SwiftTest.intArrayMethodStatic(int[])
-
-    private static var intArrayMethodStatic_MethodID_28: jmethodID?
-
-    public class func intArrayMethodStatic( arg0: [Int32]? ) -> [Int32]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "intArrayMethodStatic", methodSig: "([I)[I", methodCache: &intArrayMethodStatic_MethodID_28, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Int32](), from: __return )
-    }
-
-    public class func intArrayMethodStatic( _ _arg0: [Int32]? ) -> [Int32]! {
-        return intArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public int[] org.genie.SwiftTest.intArrayMethod(int[])
-
-    private static var intArrayMethod_MethodID_29: jmethodID?
-
-    public func intArrayMethod( arg0: [Int32]? ) -> [Int32]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "intArrayMethod", methodSig: "([I)[I", methodCache: &SwiftTest.intArrayMethod_MethodID_29, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Int32](), from: __return )
-    }
-
-    public func intArrayMethod( _ _arg0: [Int32]? ) -> [Int32]! {
-        return intArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static int[][] org.genie.SwiftTest.int2dArrayMethodStatic(int[][])
-
-    private static var int2dArrayMethodStatic_MethodID_30: jmethodID?
-
-    public class func int2dArrayMethodStatic( arg0: [[Int32]]? ) -> [[Int32]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "int2dArrayMethodStatic", methodSig: "([[I)[[I", methodCache: &int2dArrayMethodStatic_MethodID_30, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Int32]](), from: __return )
-    }
-
-    public class func int2dArrayMethodStatic( _ _arg0: [[Int32]]? ) -> [[Int32]]! {
-        return int2dArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public int[][] org.genie.SwiftTest.int2dArrayMethod(int[][])
-
-    private static var int2dArrayMethod_MethodID_31: jmethodID?
-
-    public func int2dArrayMethod( arg0: [[Int32]]? ) -> [[Int32]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "int2dArrayMethod", methodSig: "([[I)[[I", methodCache: &SwiftTest.int2dArrayMethod_MethodID_31, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Int32]](), from: __return )
-    }
-
-    public func int2dArrayMethod( _ _arg0: [[Int32]]? ) -> [[Int32]]! {
-        return int2dArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static long org.genie.SwiftTest.longMethodStatic(long)
-
-    private static var longMethodStatic_MethodID_32: jmethodID?
-
-    public class func longMethodStatic( arg0: Int64 ) -> Int64 {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticLongMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "longMethodStatic", methodSig: "(J)J", methodCache: &longMethodStatic_MethodID_32, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Int64(), from: __return )
-    }
-
-    public class func longMethodStatic( _ _arg0: Int64 ) -> Int64 {
-        return longMethodStatic( arg0: _arg0 )
-    }
-
-    /// public long org.genie.SwiftTest.longMethod(long)
-
-    private static var longMethod_MethodID_33: jmethodID?
-
-    public func longMethod( arg0: Int64 ) -> Int64 {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallLongMethod( object: javaObject, methodName: "longMethod", methodSig: "(J)J", methodCache: &SwiftTest.longMethod_MethodID_33, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Int64(), from: __return )
-    }
-
-    public func longMethod( _ _arg0: Int64 ) -> Int64 {
-        return longMethod( arg0: _arg0 )
-    }
-
-    /// public static long[] org.genie.SwiftTest.longArrayMethodStatic(long[])
-
-    private static var longArrayMethodStatic_MethodID_34: jmethodID?
-
-    public class func longArrayMethodStatic( arg0: [Int64]? ) -> [Int64]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "longArrayMethodStatic", methodSig: "([J)[J", methodCache: &longArrayMethodStatic_MethodID_34, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Int64](), from: __return )
-    }
-
-    public class func longArrayMethodStatic( _ _arg0: [Int64]? ) -> [Int64]! {
-        return longArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public long[] org.genie.SwiftTest.longArrayMethod(long[])
-
-    private static var longArrayMethod_MethodID_35: jmethodID?
-
-    public func longArrayMethod( arg0: [Int64]? ) -> [Int64]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "longArrayMethod", methodSig: "([J)[J", methodCache: &SwiftTest.longArrayMethod_MethodID_35, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Int64](), from: __return )
-    }
-
-    public func longArrayMethod( _ _arg0: [Int64]? ) -> [Int64]! {
-        return longArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static long[][] org.genie.SwiftTest.long2dArrayMethodStatic(long[][])
-
-    private static var long2dArrayMethodStatic_MethodID_36: jmethodID?
-
-    public class func long2dArrayMethodStatic( arg0: [[Int64]]? ) -> [[Int64]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "long2dArrayMethodStatic", methodSig: "([[J)[[J", methodCache: &long2dArrayMethodStatic_MethodID_36, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Int64]](), from: __return )
-    }
-
-    public class func long2dArrayMethodStatic( _ _arg0: [[Int64]]? ) -> [[Int64]]! {
-        return long2dArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public long[][] org.genie.SwiftTest.long2dArrayMethod(long[][])
-
-    private static var long2dArrayMethod_MethodID_37: jmethodID?
-
-    public func long2dArrayMethod( arg0: [[Int64]]? ) -> [[Int64]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "long2dArrayMethod", methodSig: "([[J)[[J", methodCache: &SwiftTest.long2dArrayMethod_MethodID_37, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Int64]](), from: __return )
-    }
-
-    public func long2dArrayMethod( _ _arg0: [[Int64]]? ) -> [[Int64]]! {
-        return long2dArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static float org.genie.SwiftTest.floatMethodStatic(float)
-
-    private static var floatMethodStatic_MethodID_38: jmethodID?
-
-    public class func floatMethodStatic( arg0: Float ) -> Float {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticFloatMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "floatMethodStatic", methodSig: "(F)F", methodCache: &floatMethodStatic_MethodID_38, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Float(), from: __return )
-    }
-
-    public class func floatMethodStatic( _ _arg0: Float ) -> Float {
-        return floatMethodStatic( arg0: _arg0 )
-    }
-
-    /// public float org.genie.SwiftTest.floatMethod(float)
-
-    private static var floatMethod_MethodID_39: jmethodID?
-
-    public func floatMethod( arg0: Float ) -> Float {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallFloatMethod( object: javaObject, methodName: "floatMethod", methodSig: "(F)F", methodCache: &SwiftTest.floatMethod_MethodID_39, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Float(), from: __return )
-    }
-
-    public func floatMethod( _ _arg0: Float ) -> Float {
-        return floatMethod( arg0: _arg0 )
-    }
-
-    /// public static float[] org.genie.SwiftTest.floatArrayMethodStatic(float[])
-
-    private static var floatArrayMethodStatic_MethodID_40: jmethodID?
-
-    public class func floatArrayMethodStatic( arg0: [Float]? ) -> [Float]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "floatArrayMethodStatic", methodSig: "([F)[F", methodCache: &floatArrayMethodStatic_MethodID_40, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Float](), from: __return )
-    }
-
-    public class func floatArrayMethodStatic( _ _arg0: [Float]? ) -> [Float]! {
-        return floatArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public float[] org.genie.SwiftTest.floatArrayMethod(float[])
-
-    private static var floatArrayMethod_MethodID_41: jmethodID?
-
-    public func floatArrayMethod( arg0: [Float]? ) -> [Float]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "floatArrayMethod", methodSig: "([F)[F", methodCache: &SwiftTest.floatArrayMethod_MethodID_41, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Float](), from: __return )
-    }
-
-    public func floatArrayMethod( _ _arg0: [Float]? ) -> [Float]! {
-        return floatArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static float[][] org.genie.SwiftTest.float2dArrayMethodStatic(float[][])
-
-    private static var float2dArrayMethodStatic_MethodID_42: jmethodID?
-
-    public class func float2dArrayMethodStatic( arg0: [[Float]]? ) -> [[Float]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "float2dArrayMethodStatic", methodSig: "([[F)[[F", methodCache: &float2dArrayMethodStatic_MethodID_42, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Float]](), from: __return )
-    }
-
-    public class func float2dArrayMethodStatic( _ _arg0: [[Float]]? ) -> [[Float]]! {
-        return float2dArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public float[][] org.genie.SwiftTest.float2dArrayMethod(float[][])
-
-    private static var float2dArrayMethod_MethodID_43: jmethodID?
-
-    public func float2dArrayMethod( arg0: [[Float]]? ) -> [[Float]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "float2dArrayMethod", methodSig: "([[F)[[F", methodCache: &SwiftTest.float2dArrayMethod_MethodID_43, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Float]](), from: __return )
-    }
-
-    public func float2dArrayMethod( _ _arg0: [[Float]]? ) -> [[Float]]! {
-        return float2dArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static double org.genie.SwiftTest.doubleMethodStatic(double)
-
-    private static var doubleMethodStatic_MethodID_44: jmethodID?
-
-    public class func doubleMethodStatic( arg0: Double ) -> Double {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticDoubleMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "doubleMethodStatic", methodSig: "(D)D", methodCache: &doubleMethodStatic_MethodID_44, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Double(), from: __return )
-    }
-
-    public class func doubleMethodStatic( _ _arg0: Double ) -> Double {
-        return doubleMethodStatic( arg0: _arg0 )
-    }
-
-    /// public double org.genie.SwiftTest.doubleMethod(double)
-
-    private static var doubleMethod_MethodID_45: jmethodID?
-
-    public func doubleMethod( arg0: Double ) -> Double {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallDoubleMethod( object: javaObject, methodName: "doubleMethod", methodSig: "(D)D", methodCache: &SwiftTest.doubleMethod_MethodID_45, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Double(), from: __return )
-    }
-
-    public func doubleMethod( _ _arg0: Double ) -> Double {
-        return doubleMethod( arg0: _arg0 )
-    }
-
-    /// public static double[] org.genie.SwiftTest.doubleArrayMethodStatic(double[])
-
-    private static var doubleArrayMethodStatic_MethodID_46: jmethodID?
-
-    public class func doubleArrayMethodStatic( arg0: [Double]? ) -> [Double]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "doubleArrayMethodStatic", methodSig: "([D)[D", methodCache: &doubleArrayMethodStatic_MethodID_46, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Double](), from: __return )
-    }
-
-    public class func doubleArrayMethodStatic( _ _arg0: [Double]? ) -> [Double]! {
-        return doubleArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public double[] org.genie.SwiftTest.doubleArrayMethod(double[])
-
-    private static var doubleArrayMethod_MethodID_47: jmethodID?
-
-    public func doubleArrayMethod( arg0: [Double]? ) -> [Double]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "doubleArrayMethod", methodSig: "([D)[D", methodCache: &SwiftTest.doubleArrayMethod_MethodID_47, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [Double](), from: __return )
-    }
-
-    public func doubleArrayMethod( _ _arg0: [Double]? ) -> [Double]! {
-        return doubleArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static double[][] org.genie.SwiftTest.double2dArrayMethodStatic(double[][])
-
-    private static var double2dArrayMethodStatic_MethodID_48: jmethodID?
-
-    public class func double2dArrayMethodStatic( arg0: [[Double]]? ) -> [[Double]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "double2dArrayMethodStatic", methodSig: "([[D)[[D", methodCache: &double2dArrayMethodStatic_MethodID_48, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Double]](), from: __return )
-    }
-
-    public class func double2dArrayMethodStatic( _ _arg0: [[Double]]? ) -> [[Double]]! {
-        return double2dArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public double[][] org.genie.SwiftTest.double2dArrayMethod(double[][])
-
-    private static var double2dArrayMethod_MethodID_49: jmethodID?
-
-    public func double2dArrayMethod( arg0: [[Double]]? ) -> [[Double]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "double2dArrayMethod", methodSig: "([[D)[[D", methodCache: &SwiftTest.double2dArrayMethod_MethodID_49, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[Double]](), from: __return )
-    }
-
-    public func double2dArrayMethod( _ _arg0: [[Double]]? ) -> [[Double]]! {
-        return double2dArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static java.lang.String org.genie.SwiftTest.StringMethodStatic(java.lang.String)
-
-    private static var StringMethodStatic_MethodID_50: jmethodID?
-
-    public class func StringMethodStatic( arg0: String? ) -> String! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "StringMethodStatic", methodSig: "(Ljava/lang/String;)Ljava/lang/String;", methodCache: &StringMethodStatic_MethodID_50, args: &__args, locals: &__locals )
-        return JNIType.decode( type: String(), from: __return )
-    }
-
-    public class func StringMethodStatic( _ _arg0: String? ) -> String! {
-        return StringMethodStatic( arg0: _arg0 )
-    }
-
-    /// public java.lang.String org.genie.SwiftTest.StringMethod(java.lang.String)
-
-    private static var StringMethod_MethodID_51: jmethodID?
-
-    public func StringMethod( arg0: String? ) -> String! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "StringMethod", methodSig: "(Ljava/lang/String;)Ljava/lang/String;", methodCache: &SwiftTest.StringMethod_MethodID_51, args: &__args, locals: &__locals )
-        return JNIType.decode( type: String(), from: __return )
-    }
-
-    public func StringMethod( _ _arg0: String? ) -> String! {
-        return StringMethod( arg0: _arg0 )
-    }
-
-    /// public static java.lang.String[] org.genie.SwiftTest.StringArrayMethodStatic(java.lang.String[])
-
-    private static var StringArrayMethodStatic_MethodID_52: jmethodID?
-
-    public class func StringArrayMethodStatic( arg0: [String]? ) -> [String]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "StringArrayMethodStatic", methodSig: "([Ljava/lang/String;)[Ljava/lang/String;", methodCache: &StringArrayMethodStatic_MethodID_52, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [String](), from: __return )
-    }
-
-    public class func StringArrayMethodStatic( _ _arg0: [String]? ) -> [String]! {
-        return StringArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public java.lang.String[] org.genie.SwiftTest.StringArrayMethod(java.lang.String[])
-
-    private static var StringArrayMethod_MethodID_53: jmethodID?
-
-    public func StringArrayMethod( arg0: [String]? ) -> [String]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "StringArrayMethod", methodSig: "([Ljava/lang/String;)[Ljava/lang/String;", methodCache: &SwiftTest.StringArrayMethod_MethodID_53, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [String](), from: __return )
-    }
-
-    public func StringArrayMethod( _ _arg0: [String]? ) -> [String]! {
-        return StringArrayMethod( arg0: _arg0 )
-    }
-
-    /// public static java.lang.String[][] org.genie.SwiftTest.String2dArrayMethodStatic(java.lang.String[][])
-
-    private static var String2dArrayMethodStatic_MethodID_54: jmethodID?
-
-    public class func String2dArrayMethodStatic( arg0: [[String]]? ) -> [[String]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallStaticObjectMethod( className: "org/genie/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "String2dArrayMethodStatic", methodSig: "([[Ljava/lang/String;)[[Ljava/lang/String;", methodCache: &String2dArrayMethodStatic_MethodID_54, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[String]](), from: __return )
-    }
-
-    public class func String2dArrayMethodStatic( _ _arg0: [[String]]? ) -> [[String]]! {
-        return String2dArrayMethodStatic( arg0: _arg0 )
-    }
-
-    /// public java.lang.String[][] org.genie.SwiftTest.String2dArrayMethod(java.lang.String[][])
-
-    private static var String2dArrayMethod_MethodID_55: jmethodID?
-
-    public func String2dArrayMethod( arg0: [[String]]? ) -> [[String]]! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "String2dArrayMethod", methodSig: "([[Ljava/lang/String;)[[Ljava/lang/String;", methodCache: &SwiftTest.String2dArrayMethod_MethodID_55, args: &__args, locals: &__locals )
-        return JNIType.decode( type: [[String]](), from: __return )
-    }
-
-    public func String2dArrayMethod( _ _arg0: [[String]]? ) -> [[String]]! {
-        return String2dArrayMethod( arg0: _arg0 )
-    }
-
-}
diff --git a/org_genie/test_body.swift b/org_genie/test_body.swift
deleted file mode 100644
index 71f9be7..0000000
--- a/org_genie/test_body.swift
+++ /dev/null
@@ -1,270 +0,0 @@
-
-        if true {
-            let reference: Bool = true
-            let referenceArray = [(reference)]
-            let reference2dArray = [referenceArray]
-
-            SwiftTest.booleanFieldStatic = reference
-            XCTAssertEqual( SwiftTest.booleanFieldStatic, reference )
-            instance.booleanField = reference
-            XCTAssertEqual( instance.booleanField, reference )
-
-            SwiftTest.booleanArrayFieldStatic = referenceArray
-            XCTAssertEqual( SwiftTest.booleanArrayFieldStatic, referenceArray )
-            instance.booleanArrayField = referenceArray
-            XCTAssertEqual( instance.booleanArrayField, referenceArray )
-
-            SwiftTest.boolean2dArrayFieldStatic = reference2dArray
-            XCTAssertEqual( SwiftTest.boolean2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.boolean2dArrayField = reference2dArray
-            XCTAssertEqual( instance.boolean2dArrayField[0], reference2dArray[0] )
-
-            XCTAssertEqual( SwiftTest.booleanMethodStatic( reference ), reference )
-            XCTAssertEqual( instance.booleanMethod( reference ), reference )
-
-            XCTAssertEqual( SwiftTest.booleanArrayMethodStatic( referenceArray ), referenceArray )
-            XCTAssertEqual( instance.booleanArrayMethod( referenceArray ), referenceArray )
-
-            XCTAssertEqual( SwiftTest.boolean2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
-            XCTAssertEqual( instance.boolean2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
-        }
-
-        if true {
-            let reference: Int8 = 123
-            let referenceArray = [(reference)]
-            let reference2dArray = [referenceArray]
-
-            SwiftTest.byteFieldStatic = reference
-            XCTAssertEqual( SwiftTest.byteFieldStatic, reference )
-            instance.byteField = reference
-            XCTAssertEqual( instance.byteField, reference )
-
-            SwiftTest.byteArrayFieldStatic = referenceArray
-            XCTAssertEqual( SwiftTest.byteArrayFieldStatic, referenceArray )
-            instance.byteArrayField = referenceArray
-            XCTAssertEqual( instance.byteArrayField, referenceArray )
-
-            SwiftTest.byte2dArrayFieldStatic = reference2dArray
-            XCTAssertEqual( SwiftTest.byte2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.byte2dArrayField = reference2dArray
-            XCTAssertEqual( instance.byte2dArrayField[0], reference2dArray[0] )
-
-            XCTAssertEqual( SwiftTest.byteMethodStatic( reference ), reference )
-            XCTAssertEqual( instance.byteMethod( reference ), reference )
-
-            XCTAssertEqual( SwiftTest.byteArrayMethodStatic( referenceArray ), referenceArray )
-            XCTAssertEqual( instance.byteArrayMethod( referenceArray ), referenceArray )
-
-            XCTAssertEqual( SwiftTest.byte2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
-            XCTAssertEqual( instance.byte2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
-        }
-
-        if true {
-            let reference: UInt16 = 123
-            let referenceArray = [(reference)]
-            let reference2dArray = [referenceArray]
-
-            SwiftTest.charFieldStatic = reference
-            XCTAssertEqual( SwiftTest.charFieldStatic, reference )
-            instance.charField = reference
-            XCTAssertEqual( instance.charField, reference )
-
-            SwiftTest.charArrayFieldStatic = referenceArray
-            XCTAssertEqual( SwiftTest.charArrayFieldStatic, referenceArray )
-            instance.charArrayField = referenceArray
-            XCTAssertEqual( instance.charArrayField, referenceArray )
-
-            SwiftTest.char2dArrayFieldStatic = reference2dArray
-            XCTAssertEqual( SwiftTest.char2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.char2dArrayField = reference2dArray
-            XCTAssertEqual( instance.char2dArrayField[0], reference2dArray[0] )
-
-            XCTAssertEqual( SwiftTest.charMethodStatic( reference ), reference )
-            XCTAssertEqual( instance.charMethod( reference ), reference )
-
-            XCTAssertEqual( SwiftTest.charArrayMethodStatic( referenceArray ), referenceArray )
-            XCTAssertEqual( instance.charArrayMethod( referenceArray ), referenceArray )
-
-            XCTAssertEqual( SwiftTest.char2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
-            XCTAssertEqual( instance.char2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
-        }
-
-        if true {
-            let reference: Int16 = 123
-            let referenceArray = [(reference)]
-            let reference2dArray = [referenceArray]
-
-            SwiftTest.shortFieldStatic = reference
-            XCTAssertEqual( SwiftTest.shortFieldStatic, reference )
-            instance.shortField = reference
-            XCTAssertEqual( instance.shortField, reference )
-
-            SwiftTest.shortArrayFieldStatic = referenceArray
-            XCTAssertEqual( SwiftTest.shortArrayFieldStatic, referenceArray )
-            instance.shortArrayField = referenceArray
-            XCTAssertEqual( instance.shortArrayField, referenceArray )
-
-            SwiftTest.short2dArrayFieldStatic = reference2dArray
-            XCTAssertEqual( SwiftTest.short2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.short2dArrayField = reference2dArray
-            XCTAssertEqual( instance.short2dArrayField[0], reference2dArray[0] )
-
-            XCTAssertEqual( SwiftTest.shortMethodStatic( reference ), reference )
-            XCTAssertEqual( instance.shortMethod( reference ), reference )
-
-            XCTAssertEqual( SwiftTest.shortArrayMethodStatic( referenceArray ), referenceArray )
-            XCTAssertEqual( instance.shortArrayMethod( referenceArray ), referenceArray )
-
-            XCTAssertEqual( SwiftTest.short2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
-            XCTAssertEqual( instance.short2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
-        }
-
-        if true {
-            let reference: Int = 123
-            let referenceArray = [Int32(reference)]
-            let reference2dArray = [referenceArray]
-
-            SwiftTest.intFieldStatic = reference
-            XCTAssertEqual( SwiftTest.intFieldStatic, reference )
-            instance.intField = reference
-            XCTAssertEqual( instance.intField, reference )
-
-            SwiftTest.intArrayFieldStatic = referenceArray
-            XCTAssertEqual( SwiftTest.intArrayFieldStatic, referenceArray )
-            instance.intArrayField = referenceArray
-            XCTAssertEqual( instance.intArrayField, referenceArray )
-
-            SwiftTest.int2dArrayFieldStatic = reference2dArray
-            XCTAssertEqual( SwiftTest.int2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.int2dArrayField = reference2dArray
-            XCTAssertEqual( instance.int2dArrayField[0], reference2dArray[0] )
-
-            XCTAssertEqual( SwiftTest.intMethodStatic( reference ), reference )
-            XCTAssertEqual( instance.intMethod( reference ), reference )
-
-            XCTAssertEqual( SwiftTest.intArrayMethodStatic( referenceArray ), referenceArray )
-            XCTAssertEqual( instance.intArrayMethod( referenceArray ), referenceArray )
-
-            XCTAssertEqual( SwiftTest.int2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
-            XCTAssertEqual( instance.int2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
-        }
-
-        if true {
-            let reference: Int64 = 123
-            let referenceArray = [(reference)]
-            let reference2dArray = [referenceArray]
-
-            SwiftTest.longFieldStatic = reference
-            XCTAssertEqual( SwiftTest.longFieldStatic, reference )
-            instance.longField = reference
-            XCTAssertEqual( instance.longField, reference )
-
-            SwiftTest.longArrayFieldStatic = referenceArray
-            XCTAssertEqual( SwiftTest.longArrayFieldStatic, referenceArray )
-            instance.longArrayField = referenceArray
-            XCTAssertEqual( instance.longArrayField, referenceArray )
-
-            SwiftTest.long2dArrayFieldStatic = reference2dArray
-            XCTAssertEqual( SwiftTest.long2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.long2dArrayField = reference2dArray
-            XCTAssertEqual( instance.long2dArrayField[0], reference2dArray[0] )
-
-            XCTAssertEqual( SwiftTest.longMethodStatic( reference ), reference )
-            XCTAssertEqual( instance.longMethod( reference ), reference )
-
-            XCTAssertEqual( SwiftTest.longArrayMethodStatic( referenceArray ), referenceArray )
-            XCTAssertEqual( instance.longArrayMethod( referenceArray ), referenceArray )
-
-            XCTAssertEqual( SwiftTest.long2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
-            XCTAssertEqual( instance.long2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
-        }
-
-        if true {
-            let reference: Float = 123
-            let referenceArray = [(reference)]
-            let reference2dArray = [referenceArray]
-
-            SwiftTest.floatFieldStatic = reference
-            XCTAssertEqual( SwiftTest.floatFieldStatic, reference )
-            instance.floatField = reference
-            XCTAssertEqual( instance.floatField, reference )
-
-            SwiftTest.floatArrayFieldStatic = referenceArray
-            XCTAssertEqual( SwiftTest.floatArrayFieldStatic, referenceArray )
-            instance.floatArrayField = referenceArray
-            XCTAssertEqual( instance.floatArrayField, referenceArray )
-
-            SwiftTest.float2dArrayFieldStatic = reference2dArray
-            XCTAssertEqual( SwiftTest.float2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.float2dArrayField = reference2dArray
-            XCTAssertEqual( instance.float2dArrayField[0], reference2dArray[0] )
-
-            XCTAssertEqual( SwiftTest.floatMethodStatic( reference ), reference )
-            XCTAssertEqual( instance.floatMethod( reference ), reference )
-
-            XCTAssertEqual( SwiftTest.floatArrayMethodStatic( referenceArray ), referenceArray )
-            XCTAssertEqual( instance.floatArrayMethod( referenceArray ), referenceArray )
-
-            XCTAssertEqual( SwiftTest.float2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
-            XCTAssertEqual( instance.float2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
-        }
-
-        if true {
-            let reference: Double = 123
-            let referenceArray = [(reference)]
-            let reference2dArray = [referenceArray]
-
-            SwiftTest.doubleFieldStatic = reference
-            XCTAssertEqual( SwiftTest.doubleFieldStatic, reference )
-            instance.doubleField = reference
-            XCTAssertEqual( instance.doubleField, reference )
-
-            SwiftTest.doubleArrayFieldStatic = referenceArray
-            XCTAssertEqual( SwiftTest.doubleArrayFieldStatic, referenceArray )
-            instance.doubleArrayField = referenceArray
-            XCTAssertEqual( instance.doubleArrayField, referenceArray )
-
-            SwiftTest.double2dArrayFieldStatic = reference2dArray
-            XCTAssertEqual( SwiftTest.double2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.double2dArrayField = reference2dArray
-            XCTAssertEqual( instance.double2dArrayField[0], reference2dArray[0] )
-
-            XCTAssertEqual( SwiftTest.doubleMethodStatic( reference ), reference )
-            XCTAssertEqual( instance.doubleMethod( reference ), reference )
-
-            XCTAssertEqual( SwiftTest.doubleArrayMethodStatic( referenceArray ), referenceArray )
-            XCTAssertEqual( instance.doubleArrayMethod( referenceArray ), referenceArray )
-
-            XCTAssertEqual( SwiftTest.double2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
-            XCTAssertEqual( instance.double2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
-        }
-
-        if true {
-            let reference: String = "123"
-            let referenceArray = [(reference)]
-            let reference2dArray = [referenceArray]
-
-            SwiftTest.StringFieldStatic = reference
-            XCTAssertEqual( SwiftTest.StringFieldStatic, reference )
-            instance.StringField = reference
-            XCTAssertEqual( instance.StringField, reference )
-
-            SwiftTest.StringArrayFieldStatic = referenceArray
-            XCTAssertEqual( SwiftTest.StringArrayFieldStatic, referenceArray )
-            instance.StringArrayField = referenceArray
-            XCTAssertEqual( instance.StringArrayField, referenceArray )
-
-            SwiftTest.String2dArrayFieldStatic = reference2dArray
-            XCTAssertEqual( SwiftTest.String2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.String2dArrayField = reference2dArray
-            XCTAssertEqual( instance.String2dArrayField[0], reference2dArray[0] )
-
-            XCTAssertEqual( SwiftTest.StringMethodStatic( reference ), reference )
-            XCTAssertEqual( instance.StringMethod( reference ), reference )
-
-            XCTAssertEqual( SwiftTest.StringArrayMethodStatic( referenceArray ), referenceArray )
-            XCTAssertEqual( instance.StringArrayMethod( referenceArray ), referenceArray )
-
-            XCTAssertEqual( SwiftTest.String2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
-            XCTAssertEqual( instance.String2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
-        }
diff --git a/org_swiftjava/Fortify.swift b/org_swiftjava/Fortify.swift
new file mode 100644
index 0000000..61d3cf3
--- /dev/null
+++ b/org_swiftjava/Fortify.swift
@@ -0,0 +1,144 @@
+//
+//  Fortify.swift
+//  Fortify
+//
+//  Created by John Holdsworth on 19/09/2017.
+//  Copyright © 2017 John Holdsworth. All rights reserved.
+//
+//  Currently requires patched Swift toolchain from here:
+//  http://johnholdsworth.com/swift-LOCAL-2017-09-20-a-osx.tar.gz
+//
+
+import Foundation
+
+open class ThreadLocal {
+    public required init() {
+    }
+
+    public class func getThreadLocal<T: ThreadLocal>(ofClass: T.Type,
+                         keyVar: UnsafeMutablePointer<pthread_key_t>) -> T {
+        let needsKey = keyVar.pointee == 0
+        if needsKey {
+            let ret = pthread_key_create(keyVar, {
+                #if os(Linux)
+                Unmanaged<ThreadLocal>.fromOpaque($0!).release()
+                #else
+                Unmanaged<ThreadLocal>.fromOpaque($0).release()
+                #endif
+            })
+            if ret != 0 {
+                NSLog("Could not pthread_key_create: %s", strerror(ret))
+            }
+        }
+        if let existing = pthread_getspecific(keyVar.pointee) {
+            return Unmanaged<T>.fromOpaque(existing).takeUnretainedValue()
+        }
+        else {
+            let unmanaged = Unmanaged.passRetained(T())
+            let ret = pthread_setspecific(keyVar.pointee, unmanaged.toOpaque())
+            if ret != 0 {
+                NSLog("Could not pthread_setspecific: %s", strerror(ret))
+            }
+            return unmanaged.takeUnretainedValue()
+        }
+    }
+}
+
+@_silgen_name ("setjmp")
+public func setjump(_: UnsafeMutablePointer<jmp_buf>!) -> Int32
+
+@_silgen_name ("longjmp")
+public func longjump(_: UnsafeMutablePointer<jmp_buf>!, _: Int32) -> Never
+
+private let empty_buf = [UInt8](repeating: 0, count: MemoryLayout<jmp_buf>.size)
+
+open class Fortify: ThreadLocal {
+
+    static private var pthreadKey: pthread_key_t = 0
+
+    open class var threadLocal: Fortify {
+        return getThreadLocal(ofClass: Fortify.self, keyVar: &pthreadKey)
+    }
+
+    private var stack = [jmp_buf]()
+    public var error: Error?
+
+    // Required as Swift assumes it has control of the stack
+    open class func disableExclusivityChecking() {
+        #if os(Android)
+        let libName = "libswiftCore.so"
+        #else
+        let libName: String? = nil
+        #endif
+        if let stdlibHandle = dlopen(libName, Int32(RTLD_LAZY | RTLD_NOLOAD)),
+            let disableExclusivity = dlsym(stdlibHandle, "_swift_disableExclusivityChecking") {
+            disableExclusivity.assumingMemoryBound(to: Bool.self).pointee = true
+        }
+        else {
+            NSLog("Could not disable exclusivity, failure likely...")
+        }
+    }
+
+    public static let installHandlerOnce: Void = {
+//        _swift_stdlib_errorHandler = {
+//            (prefix: StaticString, msg: String, file: StaticString,
+//            line: UInt, flags: UInt32, config: Int32) in
+//            escape(msg: msg, file: file, line: line)
+//        }
+
+        disableExclusivityChecking()
+    }()
+
+    open class func exec<T>( block: () throws -> T ) throws -> T {
+        _ = installHandlerOnce
+        let local = threadLocal
+
+        empty_buf.withUnsafeBytes {
+            let buf_ptr = $0.baseAddress!.assumingMemoryBound(to: jmp_buf.self)
+            local.stack.append(buf_ptr.pointee)
+        }
+
+        defer {
+            local.stack.removeLast()
+        }
+
+        if setjump(&local.stack[local.stack.count-1]) != 0 {
+            throw local.error ?? NSError(domain: "Error not available", code: -1, userInfo: nil)
+        }
+
+        return try block()
+    }
+
+    open class func escape(msg: String, file: StaticString = #file, line: UInt = #line) -> Never {
+        escape(withError: NSError(domain: msg, code: -1, userInfo: [
+            NSLocalizedDescriptionKey: "\(msg): \(file):\(line)",
+            "msg": msg, "file": file, "line": line
+        ]))
+    }
+
+    open class func escape(withError error: Error) -> Never {
+        let local = threadLocal
+        local.error = error
+
+        if local.stack.count == 0 {
+            NSLog("escape without matching exec call: \(error)")
+            #if !os(Linux)
+            // pthread_exit(nil) just crashes
+            var oldState: Int32 = 0
+            pthread_setcancelstate(Int32(PTHREAD_CANCEL_ENABLE), &oldState)
+            pthread_setcanceltype(Int32(PTHREAD_CANCEL_DEFERRED), &oldState)
+            // pthread_cancel() never seems to be implemented
+            let cancelled = pthread_cancel(pthread_self())
+            if cancelled != 0 {
+                NSLog("pthread_cancel() failed: %s", strerror(cancelled))
+            }
+            sleep(1)
+            #endif
+            NSLog("cancel/exit not available/implemented or crashes, parking thread")
+            Thread.sleep(until: Date.distantFuture)
+        }
+
+        longjump(&local.stack[local.stack.count-1], 1)
+        NSLog("longjmp() failed, should not get here")
+    }
+}
diff --git a/org_genie/Info.plist b/org_swiftjava/Info.plist
similarity index 100%
rename from org_genie/Info.plist
rename to org_swiftjava/Info.plist
diff --git a/org_swiftjava/Sources/SwiftTest.swift b/org_swiftjava/Sources/SwiftTest.swift
new file mode 100644
index 0000000..44a3eec
--- /dev/null
+++ b/org_swiftjava/Sources/SwiftTest.swift
@@ -0,0 +1,1977 @@
+
+import java_swift
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class org.swiftjava.SwiftTest ///
+
+open class SwiftTest: java_swift.JavaObject {
+
+    public convenience init?( casting object: java_swift.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
+        self.init( javaObject: nil )
+        object.withJavaObject {
+            self.javaObject = $0
+        }
+    }
+
+    private static var SwiftTestJNIClass: jclass?
+
+    /// public static java.lang.String[][] org.swiftjava.SwiftTest.String2dArrayFieldStatic
+
+    private static var String2dArrayFieldStatic_FieldID: jfieldID?
+
+    public static var String2dArrayFieldStatic: [[String]]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "String2dArrayFieldStatic", fieldType: "[[Ljava/lang/String;", fieldCache: &String2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [[String]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "String2dArrayFieldStatic", fieldType: "[[Ljava/lang/String;", fieldCache: &String2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static java.lang.String[] org.swiftjava.SwiftTest.StringArrayFieldStatic
+
+    private static var StringArrayFieldStatic_FieldID: jfieldID?
+
+    public static var StringArrayFieldStatic: [String]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "StringArrayFieldStatic", fieldType: "[Ljava/lang/String;", fieldCache: &StringArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [String].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "StringArrayFieldStatic", fieldType: "[Ljava/lang/String;", fieldCache: &StringArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static java.lang.String org.swiftjava.SwiftTest.StringFieldStatic
+
+    private static var StringFieldStatic_FieldID: jfieldID?
+
+    public static var StringFieldStatic: String! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "StringFieldStatic", fieldType: "Ljava/lang/String;", fieldCache: &StringFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? String( javaObject: __value ) : nil
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "StringFieldStatic", fieldType: "Ljava/lang/String;", fieldCache: &StringFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][] org.swiftjava.SwiftTest.TestListener2dArrayFieldStatic
+
+    private static var TestListener2dArrayFieldStatic_FieldID: jfieldID?
+
+    public static var TestListener2dArrayFieldStatic: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "TestListener2dArrayFieldStatic", fieldType: "[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &TestListener2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "TestListener2dArrayFieldStatic", fieldType: "[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &TestListener2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[] org.swiftjava.SwiftTest.TestListenerArrayFieldStatic
+
+    private static var TestListenerArrayFieldStatic_FieldID: jfieldID?
+
+    public static var TestListenerArrayFieldStatic: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "TestListenerArrayFieldStatic", fieldType: "[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &TestListenerArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "TestListenerArrayFieldStatic", fieldType: "[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &TestListenerArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener org.swiftjava.SwiftTest.TestListenerFieldStatic
+
+    private static var TestListenerFieldStatic_FieldID: jfieldID?
+
+    public static var TestListenerFieldStatic: /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "TestListenerFieldStatic", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &TestListenerFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward( javaObject: __value ) : nil
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "TestListenerFieldStatic", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &TestListenerFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static boolean[][] org.swiftjava.SwiftTest.boolean2dArrayFieldStatic
+
+    private static var boolean2dArrayFieldStatic_FieldID: jfieldID?
+
+    public static var boolean2dArrayFieldStatic: [[Bool]]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "boolean2dArrayFieldStatic", fieldType: "[[Z", fieldCache: &boolean2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [[Bool]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "boolean2dArrayFieldStatic", fieldType: "[[Z", fieldCache: &boolean2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static boolean[] org.swiftjava.SwiftTest.booleanArrayFieldStatic
+
+    private static var booleanArrayFieldStatic_FieldID: jfieldID?
+
+    public static var booleanArrayFieldStatic: [Bool]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "booleanArrayFieldStatic", fieldType: "[Z", fieldCache: &booleanArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [Bool].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "booleanArrayFieldStatic", fieldType: "[Z", fieldCache: &booleanArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static boolean org.swiftjava.SwiftTest.booleanFieldStatic
+
+    private static var booleanFieldStatic_FieldID: jfieldID?
+
+    public static var booleanFieldStatic: Bool {
+        get {
+            let __value = JNIField.GetStaticBooleanField( fieldName: "booleanFieldStatic", fieldType: "Z", fieldCache: &booleanFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return __value != jboolean(JNI_FALSE)
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( z: jboolean(newValue ? JNI_TRUE : JNI_FALSE) )
+            JNIField.SetStaticBooleanField( fieldName: "booleanFieldStatic", fieldType: "Z", fieldCache: &booleanFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.z, locals: &__locals )
+        }
+    }
+
+    /// public static byte[][] org.swiftjava.SwiftTest.byte2dArrayFieldStatic
+
+    private static var byte2dArrayFieldStatic_FieldID: jfieldID?
+
+    public static var byte2dArrayFieldStatic: [[Int8]]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "byte2dArrayFieldStatic", fieldType: "[[B", fieldCache: &byte2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [[Int8]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "byte2dArrayFieldStatic", fieldType: "[[B", fieldCache: &byte2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static byte[] org.swiftjava.SwiftTest.byteArrayFieldStatic
+
+    private static var byteArrayFieldStatic_FieldID: jfieldID?
+
+    public static var byteArrayFieldStatic: [Int8]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "byteArrayFieldStatic", fieldType: "[B", fieldCache: &byteArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [Int8].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "byteArrayFieldStatic", fieldType: "[B", fieldCache: &byteArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static byte org.swiftjava.SwiftTest.byteFieldStatic
+
+    private static var byteFieldStatic_FieldID: jfieldID?
+
+    public static var byteFieldStatic: Int8 {
+        get {
+            let __value = JNIField.GetStaticByteField( fieldName: "byteFieldStatic", fieldType: "B", fieldCache: &byteFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( b: newValue )
+            JNIField.SetStaticByteField( fieldName: "byteFieldStatic", fieldType: "B", fieldCache: &byteFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.b, locals: &__locals )
+        }
+    }
+
+    /// public static char[][] org.swiftjava.SwiftTest.char2dArrayFieldStatic
+
+    private static var char2dArrayFieldStatic_FieldID: jfieldID?
+
+    public static var char2dArrayFieldStatic: [[UInt16]]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "char2dArrayFieldStatic", fieldType: "[[C", fieldCache: &char2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [[UInt16]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "char2dArrayFieldStatic", fieldType: "[[C", fieldCache: &char2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static char[] org.swiftjava.SwiftTest.charArrayFieldStatic
+
+    private static var charArrayFieldStatic_FieldID: jfieldID?
+
+    public static var charArrayFieldStatic: [UInt16]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "charArrayFieldStatic", fieldType: "[C", fieldCache: &charArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [UInt16].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "charArrayFieldStatic", fieldType: "[C", fieldCache: &charArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static char org.swiftjava.SwiftTest.charFieldStatic
+
+    private static var charFieldStatic_FieldID: jfieldID?
+
+    public static var charFieldStatic: UInt16 {
+        get {
+            let __value = JNIField.GetStaticCharField( fieldName: "charFieldStatic", fieldType: "C", fieldCache: &charFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( c: newValue )
+            JNIField.SetStaticCharField( fieldName: "charFieldStatic", fieldType: "C", fieldCache: &charFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.c, locals: &__locals )
+        }
+    }
+
+    /// public static double[][] org.swiftjava.SwiftTest.double2dArrayFieldStatic
+
+    private static var double2dArrayFieldStatic_FieldID: jfieldID?
+
+    public static var double2dArrayFieldStatic: [[Double]]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "double2dArrayFieldStatic", fieldType: "[[D", fieldCache: &double2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [[Double]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "double2dArrayFieldStatic", fieldType: "[[D", fieldCache: &double2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static double[] org.swiftjava.SwiftTest.doubleArrayFieldStatic
+
+    private static var doubleArrayFieldStatic_FieldID: jfieldID?
+
+    public static var doubleArrayFieldStatic: [Double]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "doubleArrayFieldStatic", fieldType: "[D", fieldCache: &doubleArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [Double].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "doubleArrayFieldStatic", fieldType: "[D", fieldCache: &doubleArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static double org.swiftjava.SwiftTest.doubleFieldStatic
+
+    private static var doubleFieldStatic_FieldID: jfieldID?
+
+    public static var doubleFieldStatic: Double {
+        get {
+            let __value = JNIField.GetStaticDoubleField( fieldName: "doubleFieldStatic", fieldType: "D", fieldCache: &doubleFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( d: newValue )
+            JNIField.SetStaticDoubleField( fieldName: "doubleFieldStatic", fieldType: "D", fieldCache: &doubleFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.d, locals: &__locals )
+        }
+    }
+
+    /// public static float[][] org.swiftjava.SwiftTest.float2dArrayFieldStatic
+
+    private static var float2dArrayFieldStatic_FieldID: jfieldID?
+
+    public static var float2dArrayFieldStatic: [[Float]]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "float2dArrayFieldStatic", fieldType: "[[F", fieldCache: &float2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [[Float]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "float2dArrayFieldStatic", fieldType: "[[F", fieldCache: &float2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static float[] org.swiftjava.SwiftTest.floatArrayFieldStatic
+
+    private static var floatArrayFieldStatic_FieldID: jfieldID?
+
+    public static var floatArrayFieldStatic: [Float]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "floatArrayFieldStatic", fieldType: "[F", fieldCache: &floatArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [Float].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "floatArrayFieldStatic", fieldType: "[F", fieldCache: &floatArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static float org.swiftjava.SwiftTest.floatFieldStatic
+
+    private static var floatFieldStatic_FieldID: jfieldID?
+
+    public static var floatFieldStatic: Float {
+        get {
+            let __value = JNIField.GetStaticFloatField( fieldName: "floatFieldStatic", fieldType: "F", fieldCache: &floatFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( f: newValue )
+            JNIField.SetStaticFloatField( fieldName: "floatFieldStatic", fieldType: "F", fieldCache: &floatFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.f, locals: &__locals )
+        }
+    }
+
+    /// public static int[][] org.swiftjava.SwiftTest.int2dArrayFieldStatic
+
+    private static var int2dArrayFieldStatic_FieldID: jfieldID?
+
+    public static var int2dArrayFieldStatic: [[Int32]]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "int2dArrayFieldStatic", fieldType: "[[I", fieldCache: &int2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [[Int32]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "int2dArrayFieldStatic", fieldType: "[[I", fieldCache: &int2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static int[] org.swiftjava.SwiftTest.intArrayFieldStatic
+
+    private static var intArrayFieldStatic_FieldID: jfieldID?
+
+    public static var intArrayFieldStatic: [Int32]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "intArrayFieldStatic", fieldType: "[I", fieldCache: &intArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [Int32].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "intArrayFieldStatic", fieldType: "[I", fieldCache: &intArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static int org.swiftjava.SwiftTest.intFieldStatic
+
+    private static var intFieldStatic_FieldID: jfieldID?
+
+    public static var intFieldStatic: Int {
+        get {
+            let __value = JNIField.GetStaticIntField( fieldName: "intFieldStatic", fieldType: "I", fieldCache: &intFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return Int(__value)
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( i: jint(newValue) )
+            JNIField.SetStaticIntField( fieldName: "intFieldStatic", fieldType: "I", fieldCache: &intFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.i, locals: &__locals )
+        }
+    }
+
+    /// public static long[][] org.swiftjava.SwiftTest.long2dArrayFieldStatic
+
+    private static var long2dArrayFieldStatic_FieldID: jfieldID?
+
+    public static var long2dArrayFieldStatic: [[Int64]]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "long2dArrayFieldStatic", fieldType: "[[J", fieldCache: &long2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [[Int64]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "long2dArrayFieldStatic", fieldType: "[[J", fieldCache: &long2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static long[] org.swiftjava.SwiftTest.longArrayFieldStatic
+
+    private static var longArrayFieldStatic_FieldID: jfieldID?
+
+    public static var longArrayFieldStatic: [Int64]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "longArrayFieldStatic", fieldType: "[J", fieldCache: &longArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [Int64].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "longArrayFieldStatic", fieldType: "[J", fieldCache: &longArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static long org.swiftjava.SwiftTest.longFieldStatic
+
+    private static var longFieldStatic_FieldID: jfieldID?
+
+    public static var longFieldStatic: Int64 {
+        get {
+            let __value = JNIField.GetStaticLongField( fieldName: "longFieldStatic", fieldType: "J", fieldCache: &longFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( j: newValue )
+            JNIField.SetStaticLongField( fieldName: "longFieldStatic", fieldType: "J", fieldCache: &longFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.j, locals: &__locals )
+        }
+    }
+
+    /// public static short[][] org.swiftjava.SwiftTest.short2dArrayFieldStatic
+
+    private static var short2dArrayFieldStatic_FieldID: jfieldID?
+
+    public static var short2dArrayFieldStatic: [[Int16]]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "short2dArrayFieldStatic", fieldType: "[[S", fieldCache: &short2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [[Int16]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "short2dArrayFieldStatic", fieldType: "[[S", fieldCache: &short2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static short[] org.swiftjava.SwiftTest.shortArrayFieldStatic
+
+    private static var shortArrayFieldStatic_FieldID: jfieldID?
+
+    public static var shortArrayFieldStatic: [Int16]! {
+        get {
+            let __value = JNIField.GetStaticObjectField( fieldName: "shortArrayFieldStatic", fieldType: "[S", fieldCache: &shortArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return JNIType.toSwift( type: [Int16].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetStaticObjectField( fieldName: "shortArrayFieldStatic", fieldType: "[S", fieldCache: &shortArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public static short org.swiftjava.SwiftTest.shortFieldStatic
+
+    private static var shortFieldStatic_FieldID: jfieldID?
+
+    public static var shortFieldStatic: Int16 {
+        get {
+            let __value = JNIField.GetStaticShortField( fieldName: "shortFieldStatic", fieldType: "S", fieldCache: &shortFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( s: newValue )
+            JNIField.SetStaticShortField( fieldName: "shortFieldStatic", fieldType: "S", fieldCache: &shortFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, value: __value.s, locals: &__locals )
+        }
+    }
+
+    /// public java.lang.String[][] org.swiftjava.SwiftTest.String2dArrayField
+
+    private static var String2dArrayField_FieldID: jfieldID?
+
+    open var String2dArrayField: [[String]]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "String2dArrayField", fieldType: "[[Ljava/lang/String;", fieldCache: &SwiftTest.String2dArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [[String]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "String2dArrayField", fieldType: "[[Ljava/lang/String;", fieldCache: &SwiftTest.String2dArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public java.lang.String[] org.swiftjava.SwiftTest.StringArrayField
+
+    private static var StringArrayField_FieldID: jfieldID?
+
+    open var StringArrayField: [String]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "StringArrayField", fieldType: "[Ljava/lang/String;", fieldCache: &SwiftTest.StringArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [String].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "StringArrayField", fieldType: "[Ljava/lang/String;", fieldCache: &SwiftTest.StringArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public java.lang.String org.swiftjava.SwiftTest.StringField
+
+    private static var StringField_FieldID: jfieldID?
+
+    open var StringField: String! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "StringField", fieldType: "Ljava/lang/String;", fieldCache: &SwiftTest.StringField_FieldID, object: javaObject )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? String( javaObject: __value ) : nil
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "StringField", fieldType: "Ljava/lang/String;", fieldCache: &SwiftTest.StringField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][] org.swiftjava.SwiftTest.TestListener2dArrayField
+
+    private static var TestListener2dArrayField_FieldID: jfieldID?
+
+    open var TestListener2dArrayField: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "TestListener2dArrayField", fieldType: "[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftTest.TestListener2dArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "TestListener2dArrayField", fieldType: "[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftTest.TestListener2dArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[] org.swiftjava.SwiftTest.TestListenerArrayField
+
+    private static var TestListenerArrayField_FieldID: jfieldID?
+
+    open var TestListenerArrayField: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "TestListenerArrayField", fieldType: "[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftTest.TestListenerArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "TestListenerArrayField", fieldType: "[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftTest.TestListenerArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener org.swiftjava.SwiftTest.TestListenerField
+
+    private static var TestListenerField_FieldID: jfieldID?
+
+    open var TestListenerField: /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "TestListenerField", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftTest.TestListenerField_FieldID, object: javaObject )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward( javaObject: __value ) : nil
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "TestListenerField", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftTest.TestListenerField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public boolean[][] org.swiftjava.SwiftTest.boolean2dArrayField
+
+    private static var boolean2dArrayField_FieldID: jfieldID?
+
+    open var boolean2dArrayField: [[Bool]]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "boolean2dArrayField", fieldType: "[[Z", fieldCache: &SwiftTest.boolean2dArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [[Bool]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "boolean2dArrayField", fieldType: "[[Z", fieldCache: &SwiftTest.boolean2dArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public boolean[] org.swiftjava.SwiftTest.booleanArrayField
+
+    private static var booleanArrayField_FieldID: jfieldID?
+
+    open var booleanArrayField: [Bool]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "booleanArrayField", fieldType: "[Z", fieldCache: &SwiftTest.booleanArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [Bool].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "booleanArrayField", fieldType: "[Z", fieldCache: &SwiftTest.booleanArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public boolean org.swiftjava.SwiftTest.booleanField
+
+    private static var booleanField_FieldID: jfieldID?
+
+    open var booleanField: Bool {
+        get {
+            let __value = JNIField.GetBooleanField( fieldName: "booleanField", fieldType: "Z", fieldCache: &SwiftTest.booleanField_FieldID, object: javaObject )
+            return __value != jboolean(JNI_FALSE)
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( z: jboolean(newValue ? JNI_TRUE : JNI_FALSE) )
+            JNIField.SetBooleanField( fieldName: "booleanField", fieldType: "Z", fieldCache: &SwiftTest.booleanField_FieldID, object: javaObject, value: __value.z, locals: &__locals )
+        }
+    }
+
+    /// public byte[][] org.swiftjava.SwiftTest.byte2dArrayField
+
+    private static var byte2dArrayField_FieldID: jfieldID?
+
+    open var byte2dArrayField: [[Int8]]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "byte2dArrayField", fieldType: "[[B", fieldCache: &SwiftTest.byte2dArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [[Int8]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "byte2dArrayField", fieldType: "[[B", fieldCache: &SwiftTest.byte2dArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public byte[] org.swiftjava.SwiftTest.byteArrayField
+
+    private static var byteArrayField_FieldID: jfieldID?
+
+    open var byteArrayField: [Int8]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "byteArrayField", fieldType: "[B", fieldCache: &SwiftTest.byteArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [Int8].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "byteArrayField", fieldType: "[B", fieldCache: &SwiftTest.byteArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public byte org.swiftjava.SwiftTest.byteField
+
+    private static var byteField_FieldID: jfieldID?
+
+    open var byteField: Int8 {
+        get {
+            let __value = JNIField.GetByteField( fieldName: "byteField", fieldType: "B", fieldCache: &SwiftTest.byteField_FieldID, object: javaObject )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( b: newValue )
+            JNIField.SetByteField( fieldName: "byteField", fieldType: "B", fieldCache: &SwiftTest.byteField_FieldID, object: javaObject, value: __value.b, locals: &__locals )
+        }
+    }
+
+    /// public char[][] org.swiftjava.SwiftTest.char2dArrayField
+
+    private static var char2dArrayField_FieldID: jfieldID?
+
+    open var char2dArrayField: [[UInt16]]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "char2dArrayField", fieldType: "[[C", fieldCache: &SwiftTest.char2dArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [[UInt16]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "char2dArrayField", fieldType: "[[C", fieldCache: &SwiftTest.char2dArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public char[] org.swiftjava.SwiftTest.charArrayField
+
+    private static var charArrayField_FieldID: jfieldID?
+
+    open var charArrayField: [UInt16]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "charArrayField", fieldType: "[C", fieldCache: &SwiftTest.charArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [UInt16].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "charArrayField", fieldType: "[C", fieldCache: &SwiftTest.charArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public char org.swiftjava.SwiftTest.charField
+
+    private static var charField_FieldID: jfieldID?
+
+    open var charField: UInt16 {
+        get {
+            let __value = JNIField.GetCharField( fieldName: "charField", fieldType: "C", fieldCache: &SwiftTest.charField_FieldID, object: javaObject )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( c: newValue )
+            JNIField.SetCharField( fieldName: "charField", fieldType: "C", fieldCache: &SwiftTest.charField_FieldID, object: javaObject, value: __value.c, locals: &__locals )
+        }
+    }
+
+    /// public double[][] org.swiftjava.SwiftTest.double2dArrayField
+
+    private static var double2dArrayField_FieldID: jfieldID?
+
+    open var double2dArrayField: [[Double]]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "double2dArrayField", fieldType: "[[D", fieldCache: &SwiftTest.double2dArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [[Double]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "double2dArrayField", fieldType: "[[D", fieldCache: &SwiftTest.double2dArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public double[] org.swiftjava.SwiftTest.doubleArrayField
+
+    private static var doubleArrayField_FieldID: jfieldID?
+
+    open var doubleArrayField: [Double]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "doubleArrayField", fieldType: "[D", fieldCache: &SwiftTest.doubleArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [Double].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "doubleArrayField", fieldType: "[D", fieldCache: &SwiftTest.doubleArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public double org.swiftjava.SwiftTest.doubleField
+
+    private static var doubleField_FieldID: jfieldID?
+
+    open var doubleField: Double {
+        get {
+            let __value = JNIField.GetDoubleField( fieldName: "doubleField", fieldType: "D", fieldCache: &SwiftTest.doubleField_FieldID, object: javaObject )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( d: newValue )
+            JNIField.SetDoubleField( fieldName: "doubleField", fieldType: "D", fieldCache: &SwiftTest.doubleField_FieldID, object: javaObject, value: __value.d, locals: &__locals )
+        }
+    }
+
+    /// public float[][] org.swiftjava.SwiftTest.float2dArrayField
+
+    private static var float2dArrayField_FieldID: jfieldID?
+
+    open var float2dArrayField: [[Float]]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "float2dArrayField", fieldType: "[[F", fieldCache: &SwiftTest.float2dArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [[Float]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "float2dArrayField", fieldType: "[[F", fieldCache: &SwiftTest.float2dArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public float[] org.swiftjava.SwiftTest.floatArrayField
+
+    private static var floatArrayField_FieldID: jfieldID?
+
+    open var floatArrayField: [Float]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "floatArrayField", fieldType: "[F", fieldCache: &SwiftTest.floatArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [Float].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "floatArrayField", fieldType: "[F", fieldCache: &SwiftTest.floatArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public float org.swiftjava.SwiftTest.floatField
+
+    private static var floatField_FieldID: jfieldID?
+
+    open var floatField: Float {
+        get {
+            let __value = JNIField.GetFloatField( fieldName: "floatField", fieldType: "F", fieldCache: &SwiftTest.floatField_FieldID, object: javaObject )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( f: newValue )
+            JNIField.SetFloatField( fieldName: "floatField", fieldType: "F", fieldCache: &SwiftTest.floatField_FieldID, object: javaObject, value: __value.f, locals: &__locals )
+        }
+    }
+
+    /// public int[][] org.swiftjava.SwiftTest.int2dArrayField
+
+    private static var int2dArrayField_FieldID: jfieldID?
+
+    open var int2dArrayField: [[Int32]]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "int2dArrayField", fieldType: "[[I", fieldCache: &SwiftTest.int2dArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [[Int32]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "int2dArrayField", fieldType: "[[I", fieldCache: &SwiftTest.int2dArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public int[] org.swiftjava.SwiftTest.intArrayField
+
+    private static var intArrayField_FieldID: jfieldID?
+
+    open var intArrayField: [Int32]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "intArrayField", fieldType: "[I", fieldCache: &SwiftTest.intArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [Int32].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "intArrayField", fieldType: "[I", fieldCache: &SwiftTest.intArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public int org.swiftjava.SwiftTest.intField
+
+    private static var intField_FieldID: jfieldID?
+
+    open var intField: Int {
+        get {
+            let __value = JNIField.GetIntField( fieldName: "intField", fieldType: "I", fieldCache: &SwiftTest.intField_FieldID, object: javaObject )
+            return Int(__value)
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( i: jint(newValue) )
+            JNIField.SetIntField( fieldName: "intField", fieldType: "I", fieldCache: &SwiftTest.intField_FieldID, object: javaObject, value: __value.i, locals: &__locals )
+        }
+    }
+
+    /// public long[][] org.swiftjava.SwiftTest.long2dArrayField
+
+    private static var long2dArrayField_FieldID: jfieldID?
+
+    open var long2dArrayField: [[Int64]]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "long2dArrayField", fieldType: "[[J", fieldCache: &SwiftTest.long2dArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [[Int64]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "long2dArrayField", fieldType: "[[J", fieldCache: &SwiftTest.long2dArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public long[] org.swiftjava.SwiftTest.longArrayField
+
+    private static var longArrayField_FieldID: jfieldID?
+
+    open var longArrayField: [Int64]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "longArrayField", fieldType: "[J", fieldCache: &SwiftTest.longArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [Int64].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "longArrayField", fieldType: "[J", fieldCache: &SwiftTest.longArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public long org.swiftjava.SwiftTest.longField
+
+    private static var longField_FieldID: jfieldID?
+
+    open var longField: Int64 {
+        get {
+            let __value = JNIField.GetLongField( fieldName: "longField", fieldType: "J", fieldCache: &SwiftTest.longField_FieldID, object: javaObject )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( j: newValue )
+            JNIField.SetLongField( fieldName: "longField", fieldType: "J", fieldCache: &SwiftTest.longField_FieldID, object: javaObject, value: __value.j, locals: &__locals )
+        }
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener org.swiftjava.SwiftTest.loopback
+
+    private static var loopback_FieldID: jfieldID?
+
+    open var loopback: /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "loopback", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftTest.loopback_FieldID, object: javaObject )
+            defer { JNI.DeleteLocalRef( __value ) }
+            return __value != nil ? /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward( javaObject: __value ) : nil
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "loopback", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &SwiftTest.loopback_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public short[][] org.swiftjava.SwiftTest.short2dArrayField
+
+    private static var short2dArrayField_FieldID: jfieldID?
+
+    open var short2dArrayField: [[Int16]]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "short2dArrayField", fieldType: "[[S", fieldCache: &SwiftTest.short2dArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [[Int16]].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "short2dArrayField", fieldType: "[[S", fieldCache: &SwiftTest.short2dArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public short[] org.swiftjava.SwiftTest.shortArrayField
+
+    private static var shortArrayField_FieldID: jfieldID?
+
+    open var shortArrayField: [Int16]! {
+        get {
+            let __value = JNIField.GetObjectField( fieldName: "shortArrayField", fieldType: "[S", fieldCache: &SwiftTest.shortArrayField_FieldID, object: javaObject )
+            return JNIType.toSwift( type: [Int16].self, from: __value )
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = JNIType.toJava( value: newValue, locals: &__locals )
+            JNIField.SetObjectField( fieldName: "shortArrayField", fieldType: "[S", fieldCache: &SwiftTest.shortArrayField_FieldID, object: javaObject, value: __value.l, locals: &__locals )
+        }
+    }
+
+    /// public short org.swiftjava.SwiftTest.shortField
+
+    private static var shortField_FieldID: jfieldID?
+
+    open var shortField: Int16 {
+        get {
+            let __value = JNIField.GetShortField( fieldName: "shortField", fieldType: "S", fieldCache: &SwiftTest.shortField_FieldID, object: javaObject )
+            return __value
+        }
+        set(newValue) {
+            var __locals = [jobject]()
+            let __value = jvalue( s: newValue )
+            JNIField.SetShortField( fieldName: "shortField", fieldType: "S", fieldCache: &SwiftTest.shortField_FieldID, object: javaObject, value: __value.s, locals: &__locals )
+        }
+    }
+
+    /// public org.swiftjava.SwiftTest()
+
+    private static var new_MethodID_1: jmethodID?
+
+    public convenience init() {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        let __object = JNIMethod.NewObject( className: "org/swiftjava/SwiftTest", classCache: &SwiftTest.SwiftTestJNIClass, methodSig: "()V", methodCache: &SwiftTest.new_MethodID_1, args: &__args, locals: &__locals )
+        self.init( javaObject: __object )
+        JNI.DeleteLocalRef( __object )
+    }
+
+    /// public static java.lang.String[][] org.swiftjava.SwiftTest.String2dArrayMethodStatic(java.lang.String[][])
+
+    private static var String2dArrayMethodStatic_MethodID_2: jmethodID?
+
+    open class func String2dArrayMethodStatic( arg0: [[String]]? ) -> [[String]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "String2dArrayMethodStatic", methodSig: "([[Ljava/lang/String;)[[Ljava/lang/String;", methodCache: &String2dArrayMethodStatic_MethodID_2, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[String]].self, from: __return )
+    }
+
+    open class func String2dArrayMethodStatic( _ _arg0: [[String]]? ) -> [[String]]! {
+        return String2dArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static java.lang.String[] org.swiftjava.SwiftTest.StringArrayMethodStatic(java.lang.String[])
+
+    private static var StringArrayMethodStatic_MethodID_3: jmethodID?
+
+    open class func StringArrayMethodStatic( arg0: [String]? ) -> [String]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "StringArrayMethodStatic", methodSig: "([Ljava/lang/String;)[Ljava/lang/String;", methodCache: &StringArrayMethodStatic_MethodID_3, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [String].self, from: __return )
+    }
+
+    open class func StringArrayMethodStatic( _ _arg0: [String]? ) -> [String]! {
+        return StringArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static java.lang.String org.swiftjava.SwiftTest.StringMethodStatic(java.lang.String)
+
+    private static var StringMethodStatic_MethodID_4: jmethodID?
+
+    open class func StringMethodStatic( arg0: String? ) -> String! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "StringMethodStatic", methodSig: "(Ljava/lang/String;)Ljava/lang/String;", methodCache: &StringMethodStatic_MethodID_4, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? String( javaObject: __return ) : nil
+    }
+
+    open class func StringMethodStatic( _ _arg0: String? ) -> String! {
+        return StringMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][] org.swiftjava.SwiftTest.TestListener2dArrayMethodStatic(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][])
+
+    private static var TestListener2dArrayMethodStatic_MethodID_5: jmethodID?
+
+    open class func TestListener2dArrayMethodStatic( arg0: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]? ) -> [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "TestListener2dArrayMethodStatic", methodSig: "([[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &TestListener2dArrayMethodStatic_MethodID_5, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward]].self, from: __return )
+    }
+
+    open class func TestListener2dArrayMethodStatic( _ _arg0: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]? ) -> [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]! {
+        return TestListener2dArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[] org.swiftjava.SwiftTest.TestListenerArrayMethodStatic(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[])
+
+    private static var TestListenerArrayMethodStatic_MethodID_6: jmethodID?
+
+    open class func TestListenerArrayMethodStatic( arg0: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]? ) -> [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "TestListenerArrayMethodStatic", methodSig: "([Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &TestListenerArrayMethodStatic_MethodID_6, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward].self, from: __return )
+    }
+
+    open class func TestListenerArrayMethodStatic( _ _arg0: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]? ) -> [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]! {
+        return TestListenerArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener org.swiftjava.SwiftTest.TestListenerMethodStatic(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    private static var TestListenerMethodStatic_MethodID_7: jmethodID?
+
+    open class func TestListenerMethodStatic( arg0: /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol? ) -> /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "TestListenerMethodStatic", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &TestListenerMethodStatic_MethodID_7, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward( javaObject: __return ) : nil
+    }
+
+    open class func TestListenerMethodStatic( _ _arg0: /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol? ) -> /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol! {
+        return TestListenerMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static boolean[][] org.swiftjava.SwiftTest.boolean2dArrayMethodStatic(boolean[][])
+
+    private static var boolean2dArrayMethodStatic_MethodID_8: jmethodID?
+
+    open class func boolean2dArrayMethodStatic( arg0: [[Bool]]? ) -> [[Bool]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "boolean2dArrayMethodStatic", methodSig: "([[Z)[[Z", methodCache: &boolean2dArrayMethodStatic_MethodID_8, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Bool]].self, from: __return )
+    }
+
+    open class func boolean2dArrayMethodStatic( _ _arg0: [[Bool]]? ) -> [[Bool]]! {
+        return boolean2dArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static boolean[] org.swiftjava.SwiftTest.booleanArrayMethodStatic(boolean[])
+
+    private static var booleanArrayMethodStatic_MethodID_9: jmethodID?
+
+    open class func booleanArrayMethodStatic( arg0: [Bool]? ) -> [Bool]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "booleanArrayMethodStatic", methodSig: "([Z)[Z", methodCache: &booleanArrayMethodStatic_MethodID_9, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Bool].self, from: __return )
+    }
+
+    open class func booleanArrayMethodStatic( _ _arg0: [Bool]? ) -> [Bool]! {
+        return booleanArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static boolean org.swiftjava.SwiftTest.booleanMethodStatic(boolean)
+
+    private static var booleanMethodStatic_MethodID_10: jmethodID?
+
+    open class func booleanMethodStatic( arg0: Bool ) -> Bool {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( z: jboolean(arg0 ? JNI_TRUE : JNI_FALSE) )
+        let __return = JNIMethod.CallStaticBooleanMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "booleanMethodStatic", methodSig: "(Z)Z", methodCache: &booleanMethodStatic_MethodID_10, args: &__args, locals: &__locals )
+        return __return != jboolean(JNI_FALSE)
+    }
+
+    open class func booleanMethodStatic( _ _arg0: Bool ) -> Bool {
+        return booleanMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static byte[][] org.swiftjava.SwiftTest.byte2dArrayMethodStatic(byte[][])
+
+    private static var byte2dArrayMethodStatic_MethodID_11: jmethodID?
+
+    open class func byte2dArrayMethodStatic( arg0: [[Int8]]? ) -> [[Int8]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "byte2dArrayMethodStatic", methodSig: "([[B)[[B", methodCache: &byte2dArrayMethodStatic_MethodID_11, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int8]].self, from: __return )
+    }
+
+    open class func byte2dArrayMethodStatic( _ _arg0: [[Int8]]? ) -> [[Int8]]! {
+        return byte2dArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static byte[] org.swiftjava.SwiftTest.byteArrayMethodStatic(byte[])
+
+    private static var byteArrayMethodStatic_MethodID_12: jmethodID?
+
+    open class func byteArrayMethodStatic( arg0: [Int8]? ) -> [Int8]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "byteArrayMethodStatic", methodSig: "([B)[B", methodCache: &byteArrayMethodStatic_MethodID_12, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int8].self, from: __return )
+    }
+
+    open class func byteArrayMethodStatic( _ _arg0: [Int8]? ) -> [Int8]! {
+        return byteArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static byte org.swiftjava.SwiftTest.byteMethodStatic(byte)
+
+    private static var byteMethodStatic_MethodID_13: jmethodID?
+
+    open class func byteMethodStatic( arg0: Int8 ) -> Int8 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( b: arg0 )
+        let __return = JNIMethod.CallStaticByteMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "byteMethodStatic", methodSig: "(B)B", methodCache: &byteMethodStatic_MethodID_13, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open class func byteMethodStatic( _ _arg0: Int8 ) -> Int8 {
+        return byteMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static char[][] org.swiftjava.SwiftTest.char2dArrayMethodStatic(char[][])
+
+    private static var char2dArrayMethodStatic_MethodID_14: jmethodID?
+
+    open class func char2dArrayMethodStatic( arg0: [[UInt16]]? ) -> [[UInt16]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "char2dArrayMethodStatic", methodSig: "([[C)[[C", methodCache: &char2dArrayMethodStatic_MethodID_14, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[UInt16]].self, from: __return )
+    }
+
+    open class func char2dArrayMethodStatic( _ _arg0: [[UInt16]]? ) -> [[UInt16]]! {
+        return char2dArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static char[] org.swiftjava.SwiftTest.charArrayMethodStatic(char[])
+
+    private static var charArrayMethodStatic_MethodID_15: jmethodID?
+
+    open class func charArrayMethodStatic( arg0: [UInt16]? ) -> [UInt16]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "charArrayMethodStatic", methodSig: "([C)[C", methodCache: &charArrayMethodStatic_MethodID_15, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [UInt16].self, from: __return )
+    }
+
+    open class func charArrayMethodStatic( _ _arg0: [UInt16]? ) -> [UInt16]! {
+        return charArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static char org.swiftjava.SwiftTest.charMethodStatic(char)
+
+    private static var charMethodStatic_MethodID_16: jmethodID?
+
+    open class func charMethodStatic( arg0: UInt16 ) -> UInt16 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( c: arg0 )
+        let __return = JNIMethod.CallStaticCharMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "charMethodStatic", methodSig: "(C)C", methodCache: &charMethodStatic_MethodID_16, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open class func charMethodStatic( _ _arg0: UInt16 ) -> UInt16 {
+        return charMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static double[][] org.swiftjava.SwiftTest.double2dArrayMethodStatic(double[][])
+
+    private static var double2dArrayMethodStatic_MethodID_17: jmethodID?
+
+    open class func double2dArrayMethodStatic( arg0: [[Double]]? ) -> [[Double]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "double2dArrayMethodStatic", methodSig: "([[D)[[D", methodCache: &double2dArrayMethodStatic_MethodID_17, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Double]].self, from: __return )
+    }
+
+    open class func double2dArrayMethodStatic( _ _arg0: [[Double]]? ) -> [[Double]]! {
+        return double2dArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static double[] org.swiftjava.SwiftTest.doubleArrayMethodStatic(double[])
+
+    private static var doubleArrayMethodStatic_MethodID_18: jmethodID?
+
+    open class func doubleArrayMethodStatic( arg0: [Double]? ) -> [Double]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "doubleArrayMethodStatic", methodSig: "([D)[D", methodCache: &doubleArrayMethodStatic_MethodID_18, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Double].self, from: __return )
+    }
+
+    open class func doubleArrayMethodStatic( _ _arg0: [Double]? ) -> [Double]! {
+        return doubleArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static double org.swiftjava.SwiftTest.doubleMethodStatic(double)
+
+    private static var doubleMethodStatic_MethodID_19: jmethodID?
+
+    open class func doubleMethodStatic( arg0: Double ) -> Double {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( d: arg0 )
+        let __return = JNIMethod.CallStaticDoubleMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "doubleMethodStatic", methodSig: "(D)D", methodCache: &doubleMethodStatic_MethodID_19, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open class func doubleMethodStatic( _ _arg0: Double ) -> Double {
+        return doubleMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static float[][] org.swiftjava.SwiftTest.float2dArrayMethodStatic(float[][])
+
+    private static var float2dArrayMethodStatic_MethodID_20: jmethodID?
+
+    open class func float2dArrayMethodStatic( arg0: [[Float]]? ) -> [[Float]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "float2dArrayMethodStatic", methodSig: "([[F)[[F", methodCache: &float2dArrayMethodStatic_MethodID_20, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Float]].self, from: __return )
+    }
+
+    open class func float2dArrayMethodStatic( _ _arg0: [[Float]]? ) -> [[Float]]! {
+        return float2dArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static float[] org.swiftjava.SwiftTest.floatArrayMethodStatic(float[])
+
+    private static var floatArrayMethodStatic_MethodID_21: jmethodID?
+
+    open class func floatArrayMethodStatic( arg0: [Float]? ) -> [Float]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "floatArrayMethodStatic", methodSig: "([F)[F", methodCache: &floatArrayMethodStatic_MethodID_21, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Float].self, from: __return )
+    }
+
+    open class func floatArrayMethodStatic( _ _arg0: [Float]? ) -> [Float]! {
+        return floatArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static float org.swiftjava.SwiftTest.floatMethodStatic(float)
+
+    private static var floatMethodStatic_MethodID_22: jmethodID?
+
+    open class func floatMethodStatic( arg0: Float ) -> Float {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( f: arg0 )
+        let __return = JNIMethod.CallStaticFloatMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "floatMethodStatic", methodSig: "(F)F", methodCache: &floatMethodStatic_MethodID_22, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open class func floatMethodStatic( _ _arg0: Float ) -> Float {
+        return floatMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static int[][] org.swiftjava.SwiftTest.int2dArrayMethodStatic(int[][])
+
+    private static var int2dArrayMethodStatic_MethodID_23: jmethodID?
+
+    open class func int2dArrayMethodStatic( arg0: [[Int32]]? ) -> [[Int32]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "int2dArrayMethodStatic", methodSig: "([[I)[[I", methodCache: &int2dArrayMethodStatic_MethodID_23, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int32]].self, from: __return )
+    }
+
+    open class func int2dArrayMethodStatic( _ _arg0: [[Int32]]? ) -> [[Int32]]! {
+        return int2dArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static int[] org.swiftjava.SwiftTest.intArrayMethodStatic(int[])
+
+    private static var intArrayMethodStatic_MethodID_24: jmethodID?
+
+    open class func intArrayMethodStatic( arg0: [Int32]? ) -> [Int32]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "intArrayMethodStatic", methodSig: "([I)[I", methodCache: &intArrayMethodStatic_MethodID_24, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int32].self, from: __return )
+    }
+
+    open class func intArrayMethodStatic( _ _arg0: [Int32]? ) -> [Int32]! {
+        return intArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static int org.swiftjava.SwiftTest.intMethodStatic(int)
+
+    private static var intMethodStatic_MethodID_25: jmethodID?
+
+    open class func intMethodStatic( arg0: Int ) -> Int {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( i: jint(arg0) )
+        let __return = JNIMethod.CallStaticIntMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "intMethodStatic", methodSig: "(I)I", methodCache: &intMethodStatic_MethodID_25, args: &__args, locals: &__locals )
+        return Int(__return)
+    }
+
+    open class func intMethodStatic( _ _arg0: Int ) -> Int {
+        return intMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static long[][] org.swiftjava.SwiftTest.long2dArrayMethodStatic(long[][])
+
+    private static var long2dArrayMethodStatic_MethodID_26: jmethodID?
+
+    open class func long2dArrayMethodStatic( arg0: [[Int64]]? ) -> [[Int64]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "long2dArrayMethodStatic", methodSig: "([[J)[[J", methodCache: &long2dArrayMethodStatic_MethodID_26, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int64]].self, from: __return )
+    }
+
+    open class func long2dArrayMethodStatic( _ _arg0: [[Int64]]? ) -> [[Int64]]! {
+        return long2dArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static long[] org.swiftjava.SwiftTest.longArrayMethodStatic(long[])
+
+    private static var longArrayMethodStatic_MethodID_27: jmethodID?
+
+    open class func longArrayMethodStatic( arg0: [Int64]? ) -> [Int64]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "longArrayMethodStatic", methodSig: "([J)[J", methodCache: &longArrayMethodStatic_MethodID_27, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int64].self, from: __return )
+    }
+
+    open class func longArrayMethodStatic( _ _arg0: [Int64]? ) -> [Int64]! {
+        return longArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static long org.swiftjava.SwiftTest.longMethodStatic(long)
+
+    private static var longMethodStatic_MethodID_28: jmethodID?
+
+    open class func longMethodStatic( arg0: Int64 ) -> Int64 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( j: arg0 )
+        let __return = JNIMethod.CallStaticLongMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "longMethodStatic", methodSig: "(J)J", methodCache: &longMethodStatic_MethodID_28, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open class func longMethodStatic( _ _arg0: Int64 ) -> Int64 {
+        return longMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static short[][] org.swiftjava.SwiftTest.short2dArrayMethodStatic(short[][])
+
+    private static var short2dArrayMethodStatic_MethodID_29: jmethodID?
+
+    open class func short2dArrayMethodStatic( arg0: [[Int16]]? ) -> [[Int16]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "short2dArrayMethodStatic", methodSig: "([[S)[[S", methodCache: &short2dArrayMethodStatic_MethodID_29, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int16]].self, from: __return )
+    }
+
+    open class func short2dArrayMethodStatic( _ _arg0: [[Int16]]? ) -> [[Int16]]! {
+        return short2dArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static short[] org.swiftjava.SwiftTest.shortArrayMethodStatic(short[])
+
+    private static var shortArrayMethodStatic_MethodID_30: jmethodID?
+
+    open class func shortArrayMethodStatic( arg0: [Int16]? ) -> [Int16]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallStaticObjectMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "shortArrayMethodStatic", methodSig: "([S)[S", methodCache: &shortArrayMethodStatic_MethodID_30, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int16].self, from: __return )
+    }
+
+    open class func shortArrayMethodStatic( _ _arg0: [Int16]? ) -> [Int16]! {
+        return shortArrayMethodStatic( arg0: _arg0 )
+    }
+
+    /// public static short org.swiftjava.SwiftTest.shortMethodStatic(short)
+
+    private static var shortMethodStatic_MethodID_31: jmethodID?
+
+    open class func shortMethodStatic( arg0: Int16 ) -> Int16 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( s: arg0 )
+        let __return = JNIMethod.CallStaticShortMethod( className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass, methodName: "shortMethodStatic", methodSig: "(S)S", methodCache: &shortMethodStatic_MethodID_31, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open class func shortMethodStatic( _ _arg0: Int16 ) -> Int16 {
+        return shortMethodStatic( arg0: _arg0 )
+    }
+
+    /// public java.lang.String[][] org.swiftjava.SwiftTest.String2dArrayMethod(java.lang.String[][])
+
+    private static var String2dArrayMethod_MethodID_32: jmethodID?
+
+    open func String2dArrayMethod( arg0: [[String]]? ) -> [[String]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "String2dArrayMethod", methodSig: "([[Ljava/lang/String;)[[Ljava/lang/String;", methodCache: &SwiftTest.String2dArrayMethod_MethodID_32, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[String]].self, from: __return )
+    }
+
+    open func String2dArrayMethod( _ _arg0: [[String]]? ) -> [[String]]! {
+        return String2dArrayMethod( arg0: _arg0 )
+    }
+
+    /// public java.lang.String[] org.swiftjava.SwiftTest.StringArrayMethod(java.lang.String[])
+
+    private static var StringArrayMethod_MethodID_33: jmethodID?
+
+    open func StringArrayMethod( arg0: [String]? ) -> [String]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "StringArrayMethod", methodSig: "([Ljava/lang/String;)[Ljava/lang/String;", methodCache: &SwiftTest.StringArrayMethod_MethodID_33, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [String].self, from: __return )
+    }
+
+    open func StringArrayMethod( _ _arg0: [String]? ) -> [String]! {
+        return StringArrayMethod( arg0: _arg0 )
+    }
+
+    /// public java.lang.String org.swiftjava.SwiftTest.StringMethod(java.lang.String)
+
+    private static var StringMethod_MethodID_34: jmethodID?
+
+    open func StringMethod( arg0: String? ) -> String! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "StringMethod", methodSig: "(Ljava/lang/String;)Ljava/lang/String;", methodCache: &SwiftTest.StringMethod_MethodID_34, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? String( javaObject: __return ) : nil
+    }
+
+    open func StringMethod( _ _arg0: String? ) -> String! {
+        return StringMethod( arg0: _arg0 )
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][] org.swiftjava.SwiftTest.TestListener2dArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][])
+
+    private static var TestListener2dArrayMethod_MethodID_35: jmethodID?
+
+    open func TestListener2dArrayMethod( arg0: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]? ) -> [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "TestListener2dArrayMethod", methodSig: "([[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &SwiftTest.TestListener2dArrayMethod_MethodID_35, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward]].self, from: __return )
+    }
+
+    open func TestListener2dArrayMethod( _ _arg0: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]? ) -> [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]! {
+        return TestListener2dArrayMethod( arg0: _arg0 )
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[] org.swiftjava.SwiftTest.TestListenerArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[])
+
+    private static var TestListenerArrayMethod_MethodID_36: jmethodID?
+
+    open func TestListenerArrayMethod( arg0: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]? ) -> [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "TestListenerArrayMethod", methodSig: "([Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &SwiftTest.TestListenerArrayMethod_MethodID_36, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward].self, from: __return )
+    }
+
+    open func TestListenerArrayMethod( _ _arg0: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]? ) -> [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]! {
+        return TestListenerArrayMethod( arg0: _arg0 )
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener org.swiftjava.SwiftTest.TestListenerMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    private static var TestListenerMethod_MethodID_37: jmethodID?
+
+    open func TestListenerMethod( arg0: /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol? ) -> /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "TestListenerMethod", methodSig: "(Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;)Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", methodCache: &SwiftTest.TestListenerMethod_MethodID_37, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward( javaObject: __return ) : nil
+    }
+
+    open func TestListenerMethod( _ _arg0: /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol? ) -> /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol! {
+        return TestListenerMethod( arg0: _arg0 )
+    }
+
+    /// public boolean[][] org.swiftjava.SwiftTest.boolean2dArrayMethod(boolean[][])
+
+    private static var boolean2dArrayMethod_MethodID_38: jmethodID?
+
+    open func boolean2dArrayMethod( arg0: [[Bool]]? ) -> [[Bool]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "boolean2dArrayMethod", methodSig: "([[Z)[[Z", methodCache: &SwiftTest.boolean2dArrayMethod_MethodID_38, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Bool]].self, from: __return )
+    }
+
+    open func boolean2dArrayMethod( _ _arg0: [[Bool]]? ) -> [[Bool]]! {
+        return boolean2dArrayMethod( arg0: _arg0 )
+    }
+
+    /// public boolean[] org.swiftjava.SwiftTest.booleanArrayMethod(boolean[])
+
+    private static var booleanArrayMethod_MethodID_39: jmethodID?
+
+    open func booleanArrayMethod( arg0: [Bool]? ) -> [Bool]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "booleanArrayMethod", methodSig: "([Z)[Z", methodCache: &SwiftTest.booleanArrayMethod_MethodID_39, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Bool].self, from: __return )
+    }
+
+    open func booleanArrayMethod( _ _arg0: [Bool]? ) -> [Bool]! {
+        return booleanArrayMethod( arg0: _arg0 )
+    }
+
+    /// public boolean org.swiftjava.SwiftTest.booleanMethod(boolean)
+
+    private static var booleanMethod_MethodID_40: jmethodID?
+
+    open func booleanMethod( arg0: Bool ) -> Bool {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( z: jboolean(arg0 ? JNI_TRUE : JNI_FALSE) )
+        let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "booleanMethod", methodSig: "(Z)Z", methodCache: &SwiftTest.booleanMethod_MethodID_40, args: &__args, locals: &__locals )
+        return __return != jboolean(JNI_FALSE)
+    }
+
+    open func booleanMethod( _ _arg0: Bool ) -> Bool {
+        return booleanMethod( arg0: _arg0 )
+    }
+
+    /// public byte[][] org.swiftjava.SwiftTest.byte2dArrayMethod(byte[][])
+
+    private static var byte2dArrayMethod_MethodID_41: jmethodID?
+
+    open func byte2dArrayMethod( arg0: [[Int8]]? ) -> [[Int8]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "byte2dArrayMethod", methodSig: "([[B)[[B", methodCache: &SwiftTest.byte2dArrayMethod_MethodID_41, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int8]].self, from: __return )
+    }
+
+    open func byte2dArrayMethod( _ _arg0: [[Int8]]? ) -> [[Int8]]! {
+        return byte2dArrayMethod( arg0: _arg0 )
+    }
+
+    /// public byte[] org.swiftjava.SwiftTest.byteArrayMethod(byte[])
+
+    private static var byteArrayMethod_MethodID_42: jmethodID?
+
+    open func byteArrayMethod( arg0: [Int8]? ) -> [Int8]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "byteArrayMethod", methodSig: "([B)[B", methodCache: &SwiftTest.byteArrayMethod_MethodID_42, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int8].self, from: __return )
+    }
+
+    open func byteArrayMethod( _ _arg0: [Int8]? ) -> [Int8]! {
+        return byteArrayMethod( arg0: _arg0 )
+    }
+
+    /// public byte org.swiftjava.SwiftTest.byteMethod(byte)
+
+    private static var byteMethod_MethodID_43: jmethodID?
+
+    open func byteMethod( arg0: Int8 ) -> Int8 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( b: arg0 )
+        let __return = JNIMethod.CallByteMethod( object: javaObject, methodName: "byteMethod", methodSig: "(B)B", methodCache: &SwiftTest.byteMethod_MethodID_43, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func byteMethod( _ _arg0: Int8 ) -> Int8 {
+        return byteMethod( arg0: _arg0 )
+    }
+
+    /// public char[][] org.swiftjava.SwiftTest.char2dArrayMethod(char[][])
+
+    private static var char2dArrayMethod_MethodID_44: jmethodID?
+
+    open func char2dArrayMethod( arg0: [[UInt16]]? ) -> [[UInt16]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "char2dArrayMethod", methodSig: "([[C)[[C", methodCache: &SwiftTest.char2dArrayMethod_MethodID_44, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[UInt16]].self, from: __return )
+    }
+
+    open func char2dArrayMethod( _ _arg0: [[UInt16]]? ) -> [[UInt16]]! {
+        return char2dArrayMethod( arg0: _arg0 )
+    }
+
+    /// public char[] org.swiftjava.SwiftTest.charArrayMethod(char[])
+
+    private static var charArrayMethod_MethodID_45: jmethodID?
+
+    open func charArrayMethod( arg0: [UInt16]? ) -> [UInt16]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "charArrayMethod", methodSig: "([C)[C", methodCache: &SwiftTest.charArrayMethod_MethodID_45, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [UInt16].self, from: __return )
+    }
+
+    open func charArrayMethod( _ _arg0: [UInt16]? ) -> [UInt16]! {
+        return charArrayMethod( arg0: _arg0 )
+    }
+
+    /// public char org.swiftjava.SwiftTest.charMethod(char)
+
+    private static var charMethod_MethodID_46: jmethodID?
+
+    open func charMethod( arg0: UInt16 ) -> UInt16 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( c: arg0 )
+        let __return = JNIMethod.CallCharMethod( object: javaObject, methodName: "charMethod", methodSig: "(C)C", methodCache: &SwiftTest.charMethod_MethodID_46, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func charMethod( _ _arg0: UInt16 ) -> UInt16 {
+        return charMethod( arg0: _arg0 )
+    }
+
+    /// public double[][] org.swiftjava.SwiftTest.double2dArrayMethod(double[][])
+
+    private static var double2dArrayMethod_MethodID_47: jmethodID?
+
+    open func double2dArrayMethod( arg0: [[Double]]? ) -> [[Double]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "double2dArrayMethod", methodSig: "([[D)[[D", methodCache: &SwiftTest.double2dArrayMethod_MethodID_47, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Double]].self, from: __return )
+    }
+
+    open func double2dArrayMethod( _ _arg0: [[Double]]? ) -> [[Double]]! {
+        return double2dArrayMethod( arg0: _arg0 )
+    }
+
+    /// public double[] org.swiftjava.SwiftTest.doubleArrayMethod(double[])
+
+    private static var doubleArrayMethod_MethodID_48: jmethodID?
+
+    open func doubleArrayMethod( arg0: [Double]? ) -> [Double]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "doubleArrayMethod", methodSig: "([D)[D", methodCache: &SwiftTest.doubleArrayMethod_MethodID_48, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Double].self, from: __return )
+    }
+
+    open func doubleArrayMethod( _ _arg0: [Double]? ) -> [Double]! {
+        return doubleArrayMethod( arg0: _arg0 )
+    }
+
+    /// public double org.swiftjava.SwiftTest.doubleMethod(double)
+
+    private static var doubleMethod_MethodID_49: jmethodID?
+
+    open func doubleMethod( arg0: Double ) -> Double {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( d: arg0 )
+        let __return = JNIMethod.CallDoubleMethod( object: javaObject, methodName: "doubleMethod", methodSig: "(D)D", methodCache: &SwiftTest.doubleMethod_MethodID_49, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func doubleMethod( _ _arg0: Double ) -> Double {
+        return doubleMethod( arg0: _arg0 )
+    }
+
+    /// public float[][] org.swiftjava.SwiftTest.float2dArrayMethod(float[][])
+
+    private static var float2dArrayMethod_MethodID_50: jmethodID?
+
+    open func float2dArrayMethod( arg0: [[Float]]? ) -> [[Float]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "float2dArrayMethod", methodSig: "([[F)[[F", methodCache: &SwiftTest.float2dArrayMethod_MethodID_50, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Float]].self, from: __return )
+    }
+
+    open func float2dArrayMethod( _ _arg0: [[Float]]? ) -> [[Float]]! {
+        return float2dArrayMethod( arg0: _arg0 )
+    }
+
+    /// public float[] org.swiftjava.SwiftTest.floatArrayMethod(float[])
+
+    private static var floatArrayMethod_MethodID_51: jmethodID?
+
+    open func floatArrayMethod( arg0: [Float]? ) -> [Float]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "floatArrayMethod", methodSig: "([F)[F", methodCache: &SwiftTest.floatArrayMethod_MethodID_51, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Float].self, from: __return )
+    }
+
+    open func floatArrayMethod( _ _arg0: [Float]? ) -> [Float]! {
+        return floatArrayMethod( arg0: _arg0 )
+    }
+
+    /// public float org.swiftjava.SwiftTest.floatMethod(float)
+
+    private static var floatMethod_MethodID_52: jmethodID?
+
+    open func floatMethod( arg0: Float ) -> Float {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( f: arg0 )
+        let __return = JNIMethod.CallFloatMethod( object: javaObject, methodName: "floatMethod", methodSig: "(F)F", methodCache: &SwiftTest.floatMethod_MethodID_52, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func floatMethod( _ _arg0: Float ) -> Float {
+        return floatMethod( arg0: _arg0 )
+    }
+
+    /// public int[][] org.swiftjava.SwiftTest.int2dArrayMethod(int[][])
+
+    private static var int2dArrayMethod_MethodID_53: jmethodID?
+
+    open func int2dArrayMethod( arg0: [[Int32]]? ) -> [[Int32]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "int2dArrayMethod", methodSig: "([[I)[[I", methodCache: &SwiftTest.int2dArrayMethod_MethodID_53, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int32]].self, from: __return )
+    }
+
+    open func int2dArrayMethod( _ _arg0: [[Int32]]? ) -> [[Int32]]! {
+        return int2dArrayMethod( arg0: _arg0 )
+    }
+
+    /// public int[] org.swiftjava.SwiftTest.intArrayMethod(int[])
+
+    private static var intArrayMethod_MethodID_54: jmethodID?
+
+    open func intArrayMethod( arg0: [Int32]? ) -> [Int32]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "intArrayMethod", methodSig: "([I)[I", methodCache: &SwiftTest.intArrayMethod_MethodID_54, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int32].self, from: __return )
+    }
+
+    open func intArrayMethod( _ _arg0: [Int32]? ) -> [Int32]! {
+        return intArrayMethod( arg0: _arg0 )
+    }
+
+    /// public int org.swiftjava.SwiftTest.intMethod(int)
+
+    private static var intMethod_MethodID_55: jmethodID?
+
+    open func intMethod( arg0: Int ) -> Int {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( i: jint(arg0) )
+        let __return = JNIMethod.CallIntMethod( object: javaObject, methodName: "intMethod", methodSig: "(I)I", methodCache: &SwiftTest.intMethod_MethodID_55, args: &__args, locals: &__locals )
+        return Int(__return)
+    }
+
+    open func intMethod( _ _arg0: Int ) -> Int {
+        return intMethod( arg0: _arg0 )
+    }
+
+    /// public long[][] org.swiftjava.SwiftTest.long2dArrayMethod(long[][])
+
+    private static var long2dArrayMethod_MethodID_56: jmethodID?
+
+    open func long2dArrayMethod( arg0: [[Int64]]? ) -> [[Int64]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "long2dArrayMethod", methodSig: "([[J)[[J", methodCache: &SwiftTest.long2dArrayMethod_MethodID_56, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int64]].self, from: __return )
+    }
+
+    open func long2dArrayMethod( _ _arg0: [[Int64]]? ) -> [[Int64]]! {
+        return long2dArrayMethod( arg0: _arg0 )
+    }
+
+    /// public long[] org.swiftjava.SwiftTest.longArrayMethod(long[])
+
+    private static var longArrayMethod_MethodID_57: jmethodID?
+
+    open func longArrayMethod( arg0: [Int64]? ) -> [Int64]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "longArrayMethod", methodSig: "([J)[J", methodCache: &SwiftTest.longArrayMethod_MethodID_57, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int64].self, from: __return )
+    }
+
+    open func longArrayMethod( _ _arg0: [Int64]? ) -> [Int64]! {
+        return longArrayMethod( arg0: _arg0 )
+    }
+
+    /// public long org.swiftjava.SwiftTest.longMethod(long)
+
+    private static var longMethod_MethodID_58: jmethodID?
+
+    open func longMethod( arg0: Int64 ) -> Int64 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( j: arg0 )
+        let __return = JNIMethod.CallLongMethod( object: javaObject, methodName: "longMethod", methodSig: "(J)J", methodCache: &SwiftTest.longMethod_MethodID_58, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func longMethod( _ _arg0: Int64 ) -> Int64 {
+        return longMethod( arg0: _arg0 )
+    }
+
+    /// public short[][] org.swiftjava.SwiftTest.short2dArrayMethod(short[][])
+
+    private static var short2dArrayMethod_MethodID_59: jmethodID?
+
+    open func short2dArrayMethod( arg0: [[Int16]]? ) -> [[Int16]]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "short2dArrayMethod", methodSig: "([[S)[[S", methodCache: &SwiftTest.short2dArrayMethod_MethodID_59, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [[Int16]].self, from: __return )
+    }
+
+    open func short2dArrayMethod( _ _arg0: [[Int16]]? ) -> [[Int16]]! {
+        return short2dArrayMethod( arg0: _arg0 )
+    }
+
+    /// public short[] org.swiftjava.SwiftTest.shortArrayMethod(short[])
+
+    private static var shortArrayMethod_MethodID_60: jmethodID?
+
+    open func shortArrayMethod( arg0: [Int16]? ) -> [Int16]! {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = JNIType.toJava( value: arg0, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "shortArrayMethod", methodSig: "([S)[S", methodCache: &SwiftTest.shortArrayMethod_MethodID_60, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: [Int16].self, from: __return )
+    }
+
+    open func shortArrayMethod( _ _arg0: [Int16]? ) -> [Int16]! {
+        return shortArrayMethod( arg0: _arg0 )
+    }
+
+    /// public short org.swiftjava.SwiftTest.shortMethod(short)
+
+    private static var shortMethod_MethodID_61: jmethodID?
+
+    open func shortMethod( arg0: Int16 ) -> Int16 {
+        var __locals = [jobject]()
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        __args[0] = jvalue( s: arg0 )
+        let __return = JNIMethod.CallShortMethod( object: javaObject, methodName: "shortMethod", methodSig: "(S)S", methodCache: &SwiftTest.shortMethod_MethodID_61, args: &__args, locals: &__locals )
+        return __return
+    }
+
+    open func shortMethod( _ _arg0: Int16 ) -> Int16 {
+        return shortMethod( arg0: _arg0 )
+    }
+
+}
+
diff --git a/org_swiftjava/org_swiftjava.swift b/org_swiftjava/org_swiftjava.swift
new file mode 100644
index 0000000..8328b20
--- /dev/null
+++ b/org_swiftjava/org_swiftjava.swift
@@ -0,0 +1,355 @@
+//
+//  org_swiftjava.swift
+//  org_swiftjava
+//
+//  Created by John Holdsworth on 27/07/2016.
+//  Copyright © 2016 John Holdsworth. All rights reserved.
+//
+
+import XCTest
+
+class org_swiftjava: XCTestCase {
+
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+
+    func testExample() {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+
+//        SwiftHelloTest_TestListenerLocal_.proxyClass()
+
+        // You'll get an assertion failure if
+        // you comment the following line out.
+        Fortify.disableExclusivityChecking()
+
+        let dest = SwiftTestListener()
+
+        let bounce2 = SwiftHelloTest_TestResponderAdapter()
+        bounce2.setLoopback(loopback: dest)
+
+        let bounce1 = SwiftTestListener()
+        bounce1.loopback = bounce2
+
+        let instance = SwiftHelloTest_TestResponderAdapter()
+        instance.setLoopback(loopback: bounce1)
+
+        if true {
+            let reference: Bool = true
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            SwiftTest.booleanFieldStatic = reference
+            XCTAssertEqual( SwiftTest.booleanFieldStatic, reference )
+//            instance.booleanField = reference
+//            XCTAssertEqual( instance.booleanField, reference )
+
+            SwiftTest.booleanArrayFieldStatic = referenceArray
+            XCTAssertEqual( SwiftTest.booleanArrayFieldStatic, referenceArray )
+//            instance.booleanArrayField = referenceArray
+//            XCTAssertEqual( instance.booleanArrayField, referenceArray )
+
+            SwiftTest.boolean2dArrayFieldStatic = reference2dArray
+            XCTAssertEqual( SwiftTest.boolean2dArrayFieldStatic[0], reference2dArray[0] )
+//            instance.boolean2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.boolean2dArrayField[0], reference2dArray[0] )
+
+//            XCTAssertEqual( SwiftTest.booleanMethodStatic( reference ), reference )
+            XCTAssertEqual( instance.booleanMethod( reference ), reference )
+
+//            XCTAssertEqual( SwiftTest.booleanArrayMethodStatic( referenceArray ), referenceArray )
+            XCTAssertEqual( instance.booleanArrayMethod( referenceArray ), referenceArray )
+
+//            XCTAssertEqual( SwiftTest.boolean2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+            XCTAssertEqual( instance.boolean2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
+        }
+
+        if true {
+            let reference: Int8 = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            SwiftTest.byteFieldStatic = reference
+            XCTAssertEqual( SwiftTest.byteFieldStatic, reference )
+//            instance.byteField = reference
+//            XCTAssertEqual( instance.byteField, reference )
+
+            SwiftTest.byteArrayFieldStatic = referenceArray
+            XCTAssertEqual( SwiftTest.byteArrayFieldStatic, referenceArray )
+//            instance.byteArrayField = referenceArray
+//            XCTAssertEqual( instance.byteArrayField, referenceArray )
+
+            SwiftTest.byte2dArrayFieldStatic = reference2dArray
+            XCTAssertEqual( SwiftTest.byte2dArrayFieldStatic[0], reference2dArray[0] )
+//            instance.byte2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.byte2dArrayField[0], reference2dArray[0] )
+
+//            XCTAssertEqual( SwiftTest.byteMethodStatic( reference ), reference )
+            XCTAssertEqual( instance.byteMethod( reference ), reference )
+
+//            XCTAssertEqual( SwiftTest.byteArrayMethodStatic( referenceArray ), referenceArray )
+            XCTAssertEqual( instance.byteArrayMethod( referenceArray ), referenceArray )
+
+//            XCTAssertEqual( SwiftTest.byte2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+            XCTAssertEqual( instance.byte2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
+        }
+
+        if true {
+            let reference: UInt16 = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            SwiftTest.charFieldStatic = reference
+            XCTAssertEqual( SwiftTest.charFieldStatic, reference )
+//            instance.charField = reference
+//            XCTAssertEqual( instance.charField, reference )
+
+            SwiftTest.charArrayFieldStatic = referenceArray
+            XCTAssertEqual( SwiftTest.charArrayFieldStatic, referenceArray )
+//            instance.charArrayField = referenceArray
+//            XCTAssertEqual( instance.charArrayField, referenceArray )
+
+            SwiftTest.char2dArrayFieldStatic = reference2dArray
+            XCTAssertEqual( SwiftTest.char2dArrayFieldStatic[0], reference2dArray[0] )
+//            instance.char2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.char2dArrayField[0], reference2dArray[0] )
+
+//            XCTAssertEqual( SwiftTest.charMethodStatic( reference ), reference )
+            XCTAssertEqual( instance.charMethod( reference ), reference )
+
+//            XCTAssertEqual( SwiftTest.charArrayMethodStatic( referenceArray ), referenceArray )
+            XCTAssertEqual( instance.charArrayMethod( referenceArray ), referenceArray )
+
+//            XCTAssertEqual( SwiftTest.char2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+            XCTAssertEqual( instance.char2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
+        }
+
+        if true {
+            let reference: Int16 = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            SwiftTest.shortFieldStatic = reference
+            XCTAssertEqual( SwiftTest.shortFieldStatic, reference )
+//            instance.shortField = reference
+//            XCTAssertEqual( instance.shortField, reference )
+
+            SwiftTest.shortArrayFieldStatic = referenceArray
+            XCTAssertEqual( SwiftTest.shortArrayFieldStatic, referenceArray )
+//            instance.shortArrayField = referenceArray
+//            XCTAssertEqual( instance.shortArrayField, referenceArray )
+
+            SwiftTest.short2dArrayFieldStatic = reference2dArray
+            XCTAssertEqual( SwiftTest.short2dArrayFieldStatic[0], reference2dArray[0] )
+//            instance.short2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.short2dArrayField[0], reference2dArray[0] )
+
+//            XCTAssertEqual( SwiftTest.shortMethodStatic( reference ), reference )
+            XCTAssertEqual( instance.shortMethod( reference ), reference )
+
+//            XCTAssertEqual( SwiftTest.shortArrayMethodStatic( referenceArray ), referenceArray )
+            XCTAssertEqual( instance.shortArrayMethod( referenceArray ), referenceArray )
+
+//            XCTAssertEqual( SwiftTest.short2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+            XCTAssertEqual( instance.short2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
+        }
+
+        if true {
+            let reference: Int = 123
+            let referenceArray = [Int32(reference)]
+            let reference2dArray = [referenceArray]
+
+            SwiftTest.intFieldStatic = reference
+            XCTAssertEqual( SwiftTest.intFieldStatic, reference )
+//            instance.intField = reference
+//            XCTAssertEqual( instance.intField, reference )
+
+            SwiftTest.intArrayFieldStatic = referenceArray
+            XCTAssertEqual( SwiftTest.intArrayFieldStatic, referenceArray )
+//            instance.intArrayField = referenceArray
+//            XCTAssertEqual( instance.intArrayField, referenceArray )
+
+            SwiftTest.int2dArrayFieldStatic = reference2dArray
+            XCTAssertEqual( SwiftTest.int2dArrayFieldStatic[0], reference2dArray[0] )
+//            instance.int2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.int2dArrayField[0], reference2dArray[0] )
+
+//            XCTAssertEqual( SwiftTest.intMethodStatic( reference ), reference )
+            XCTAssertEqual( instance.intMethod( reference ), reference )
+
+//            XCTAssertEqual( SwiftTest.intArrayMethodStatic( referenceArray ), referenceArray )
+            XCTAssertEqual( instance.intArrayMethod( referenceArray ), referenceArray )
+
+//            XCTAssertEqual( SwiftTest.int2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+            XCTAssertEqual( instance.int2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
+        }
+
+        if true {
+            let reference: Int64 = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            SwiftTest.longFieldStatic = reference
+            XCTAssertEqual( SwiftTest.longFieldStatic, reference )
+//            instance.longField = reference
+//            XCTAssertEqual( instance.longField, reference )
+
+            SwiftTest.longArrayFieldStatic = referenceArray
+            XCTAssertEqual( SwiftTest.longArrayFieldStatic, referenceArray )
+//            instance.longArrayField = referenceArray
+//            XCTAssertEqual( instance.longArrayField, referenceArray )
+
+            SwiftTest.long2dArrayFieldStatic = reference2dArray
+            XCTAssertEqual( SwiftTest.long2dArrayFieldStatic[0], reference2dArray[0] )
+//            instance.long2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.long2dArrayField[0], reference2dArray[0] )
+
+//            XCTAssertEqual( SwiftTest.longMethodStatic( reference ), reference )
+            XCTAssertEqual( instance.longMethod( reference ), reference )
+
+//            XCTAssertEqual( SwiftTest.longArrayMethodStatic( referenceArray ), referenceArray )
+            XCTAssertEqual( instance.longArrayMethod( referenceArray ), referenceArray )
+
+//            XCTAssertEqual( SwiftTest.long2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+            XCTAssertEqual( instance.long2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
+        }
+
+        if true {
+            let reference: Float = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            SwiftTest.floatFieldStatic = reference
+            XCTAssertEqual( SwiftTest.floatFieldStatic, reference )
+//            instance.floatField = reference
+//            XCTAssertEqual( instance.floatField, reference )
+
+            SwiftTest.floatArrayFieldStatic = referenceArray
+            XCTAssertEqual( SwiftTest.floatArrayFieldStatic, referenceArray )
+//            instance.floatArrayField = referenceArray
+//            XCTAssertEqual( instance.floatArrayField, referenceArray )
+
+            SwiftTest.float2dArrayFieldStatic = reference2dArray
+            XCTAssertEqual( SwiftTest.float2dArrayFieldStatic[0], reference2dArray[0] )
+//            instance.float2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.float2dArrayField[0], reference2dArray[0] )
+
+//            XCTAssertEqual( SwiftTest.floatMethodStatic( reference ), reference )
+            XCTAssertEqual( instance.floatMethod( reference ), reference )
+
+//            XCTAssertEqual( SwiftTest.floatArrayMethodStatic( referenceArray ), referenceArray )
+            XCTAssertEqual( instance.floatArrayMethod( referenceArray ), referenceArray )
+
+//            XCTAssertEqual( SwiftTest.float2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+            XCTAssertEqual( instance.float2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
+        }
+
+        if true {
+            let reference: Double = 123
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            SwiftTest.doubleFieldStatic = reference
+            XCTAssertEqual( SwiftTest.doubleFieldStatic, reference )
+//            instance.doubleField = reference
+//            XCTAssertEqual( instance.doubleField, reference )
+
+            SwiftTest.doubleArrayFieldStatic = referenceArray
+            XCTAssertEqual( SwiftTest.doubleArrayFieldStatic, referenceArray )
+//            instance.doubleArrayField = referenceArray
+//            XCTAssertEqual( instance.doubleArrayField, referenceArray )
+
+            SwiftTest.double2dArrayFieldStatic = reference2dArray
+            XCTAssertEqual( SwiftTest.double2dArrayFieldStatic[0], reference2dArray[0] )
+//            instance.double2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.double2dArrayField[0], reference2dArray[0] )
+
+//            XCTAssertEqual( SwiftTest.doubleMethodStatic( reference ), reference )
+            XCTAssertEqual( instance.doubleMethod( reference ), reference )
+
+//            XCTAssertEqual( SwiftTest.doubleArrayMethodStatic( referenceArray ), referenceArray )
+            XCTAssertEqual( instance.doubleArrayMethod( referenceArray ), referenceArray )
+
+//            XCTAssertEqual( SwiftTest.double2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+            XCTAssertEqual( instance.double2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
+        }
+
+        if true {
+            let reference: String = "123"
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            SwiftTest.StringFieldStatic = reference
+            XCTAssertEqual( SwiftTest.StringFieldStatic, reference )
+//            instance.StringField = reference
+//            XCTAssertEqual( instance.StringField, reference )
+
+            SwiftTest.StringArrayFieldStatic = referenceArray
+            XCTAssertEqual( SwiftTest.StringArrayFieldStatic, referenceArray )
+//            instance.StringArrayField = referenceArray
+//            XCTAssertEqual( instance.StringArrayField, referenceArray )
+
+            SwiftTest.String2dArrayFieldStatic = reference2dArray
+            XCTAssertEqual( SwiftTest.String2dArrayFieldStatic[0], reference2dArray[0] )
+//            instance.String2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.String2dArrayField[0], reference2dArray[0] )
+
+//            XCTAssertEqual( SwiftTest.StringMethodStatic( reference ), reference )
+            XCTAssertEqual( instance.StringMethod( reference ), reference )
+
+//            XCTAssertEqual( SwiftTest.StringArrayMethodStatic( referenceArray ), referenceArray )
+            XCTAssertEqual( instance.StringArrayMethod( referenceArray ), referenceArray )
+
+//            XCTAssertEqual( SwiftTest.String2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+            XCTAssertEqual( instance.String2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
+        }
+
+        if true {
+            let reference: SwiftHelloTest_TestListener = SwiftTestListener()
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+//            SwiftTest.TestListenerFieldStatic = reference
+//            XCTAssertEqual( SwiftTest.TestListenerFieldStatic, reference )
+////            instance.TestListenerField = reference
+////            XCTAssertEqual( instance.TestListenerField, reference )
+//
+//            SwiftTest.TestListenerArrayFieldStatic = referenceArray
+//            XCTAssertEqual( SwiftTest.TestListenerArrayFieldStatic, referenceArray )
+////            instance.TestListenerArrayField = referenceArray
+////            XCTAssertEqual( instance.TestListenerArrayField, referenceArray )
+//
+//            SwiftTest.TestListener2dArrayFieldStatic = reference2dArray
+//            XCTAssertEqual( SwiftTest.TestListener2dArrayFieldStatic[0], reference2dArray[0] )
+////            instance.TestListener2dArrayField = reference2dArray
+////            XCTAssertEqual( instance.TestListener2dArrayField[0], reference2dArray[0] )
+//
+////            XCTAssertEqual( SwiftTest.TestListenerMethodStatic( reference ), reference )
+//            XCTAssertEqual( instance.TestListenerMethod( reference ), reference )
+//
+////            XCTAssertEqual( SwiftTest.TestListenerArrayMethodStatic( referenceArray ), referenceArray )
+//            XCTAssertEqual( instance.TestListenerArrayMethod( referenceArray ), referenceArray )
+//
+////            XCTAssertEqual( SwiftTest.TestListener2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+//            XCTAssertEqual( instance.TestListener2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
+        }
+    }
+
+    func testPerformanceExample() {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+            for _ in 0..<100 {
+                self.testExample()
+            }
+        }
+    }
+
+}
diff --git a/org_genie/org_genie.swift b/org_swiftjava/test_body.swift
similarity index 54%
rename from org_genie/org_genie.swift
rename to org_swiftjava/test_body.swift
index 9705da1..c8564c4 100644
--- a/org_genie/org_genie.swift
+++ b/org_swiftjava/test_body.swift
@@ -1,30 +1,3 @@
-//
-//  org_genie.swift
-//  org_genie
-//
-//  Created by John Holdsworth on 27/07/2016.
-//  Copyright © 2016 John Holdsworth. All rights reserved.
-//
-
-import XCTest
-
-class org_genie: XCTestCase {
-
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-
-        let instance = SwiftTest()
 
         if true {
             let reference: Bool = true
@@ -33,26 +6,26 @@ class org_genie: XCTestCase {
 
             SwiftTest.booleanFieldStatic = reference
             XCTAssertEqual( SwiftTest.booleanFieldStatic, reference )
-            instance.booleanField = reference
-            XCTAssertEqual( instance.booleanField, reference )
+//            instance.booleanField = reference
+//            XCTAssertEqual( instance.booleanField, reference )
 
             SwiftTest.booleanArrayFieldStatic = referenceArray
             XCTAssertEqual( SwiftTest.booleanArrayFieldStatic, referenceArray )
-            instance.booleanArrayField = referenceArray
-            XCTAssertEqual( instance.booleanArrayField, referenceArray )
+//            instance.booleanArrayField = referenceArray
+//            XCTAssertEqual( instance.booleanArrayField, referenceArray )
 
             SwiftTest.boolean2dArrayFieldStatic = reference2dArray
             XCTAssertEqual( SwiftTest.boolean2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.boolean2dArrayField = reference2dArray
-            XCTAssertEqual( instance.boolean2dArrayField[0], reference2dArray[0] )
+//            instance.boolean2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.boolean2dArrayField[0], reference2dArray[0] )
 
-            XCTAssertEqual( SwiftTest.booleanMethodStatic( reference ), reference )
+//            XCTAssertEqual( SwiftTest.booleanMethodStatic( reference ), reference )
             XCTAssertEqual( instance.booleanMethod( reference ), reference )
 
-            XCTAssertEqual( SwiftTest.booleanArrayMethodStatic( referenceArray ), referenceArray )
+//            XCTAssertEqual( SwiftTest.booleanArrayMethodStatic( referenceArray ), referenceArray )
             XCTAssertEqual( instance.booleanArrayMethod( referenceArray ), referenceArray )
 
-            XCTAssertEqual( SwiftTest.boolean2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+//            XCTAssertEqual( SwiftTest.boolean2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
             XCTAssertEqual( instance.boolean2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
         }
 
@@ -63,26 +36,26 @@ class org_genie: XCTestCase {
 
             SwiftTest.byteFieldStatic = reference
             XCTAssertEqual( SwiftTest.byteFieldStatic, reference )
-            instance.byteField = reference
-            XCTAssertEqual( instance.byteField, reference )
+//            instance.byteField = reference
+//            XCTAssertEqual( instance.byteField, reference )
 
             SwiftTest.byteArrayFieldStatic = referenceArray
             XCTAssertEqual( SwiftTest.byteArrayFieldStatic, referenceArray )
-            instance.byteArrayField = referenceArray
-            XCTAssertEqual( instance.byteArrayField, referenceArray )
+//            instance.byteArrayField = referenceArray
+//            XCTAssertEqual( instance.byteArrayField, referenceArray )
 
             SwiftTest.byte2dArrayFieldStatic = reference2dArray
             XCTAssertEqual( SwiftTest.byte2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.byte2dArrayField = reference2dArray
-            XCTAssertEqual( instance.byte2dArrayField[0], reference2dArray[0] )
+//            instance.byte2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.byte2dArrayField[0], reference2dArray[0] )
 
-            XCTAssertEqual( SwiftTest.byteMethodStatic( reference ), reference )
+//            XCTAssertEqual( SwiftTest.byteMethodStatic( reference ), reference )
             XCTAssertEqual( instance.byteMethod( reference ), reference )
 
-            XCTAssertEqual( SwiftTest.byteArrayMethodStatic( referenceArray ), referenceArray )
+//            XCTAssertEqual( SwiftTest.byteArrayMethodStatic( referenceArray ), referenceArray )
             XCTAssertEqual( instance.byteArrayMethod( referenceArray ), referenceArray )
 
-            XCTAssertEqual( SwiftTest.byte2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+//            XCTAssertEqual( SwiftTest.byte2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
             XCTAssertEqual( instance.byte2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
         }
 
@@ -93,26 +66,26 @@ class org_genie: XCTestCase {
 
             SwiftTest.charFieldStatic = reference
             XCTAssertEqual( SwiftTest.charFieldStatic, reference )
-            instance.charField = reference
-            XCTAssertEqual( instance.charField, reference )
+//            instance.charField = reference
+//            XCTAssertEqual( instance.charField, reference )
 
             SwiftTest.charArrayFieldStatic = referenceArray
             XCTAssertEqual( SwiftTest.charArrayFieldStatic, referenceArray )
-            instance.charArrayField = referenceArray
-            XCTAssertEqual( instance.charArrayField, referenceArray )
+//            instance.charArrayField = referenceArray
+//            XCTAssertEqual( instance.charArrayField, referenceArray )
 
             SwiftTest.char2dArrayFieldStatic = reference2dArray
             XCTAssertEqual( SwiftTest.char2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.char2dArrayField = reference2dArray
-            XCTAssertEqual( instance.char2dArrayField[0], reference2dArray[0] )
+//            instance.char2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.char2dArrayField[0], reference2dArray[0] )
 
-            XCTAssertEqual( SwiftTest.charMethodStatic( reference ), reference )
+//            XCTAssertEqual( SwiftTest.charMethodStatic( reference ), reference )
             XCTAssertEqual( instance.charMethod( reference ), reference )
 
-            XCTAssertEqual( SwiftTest.charArrayMethodStatic( referenceArray ), referenceArray )
+//            XCTAssertEqual( SwiftTest.charArrayMethodStatic( referenceArray ), referenceArray )
             XCTAssertEqual( instance.charArrayMethod( referenceArray ), referenceArray )
 
-            XCTAssertEqual( SwiftTest.char2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+//            XCTAssertEqual( SwiftTest.char2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
             XCTAssertEqual( instance.char2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
         }
 
@@ -123,26 +96,26 @@ class org_genie: XCTestCase {
 
             SwiftTest.shortFieldStatic = reference
             XCTAssertEqual( SwiftTest.shortFieldStatic, reference )
-            instance.shortField = reference
-            XCTAssertEqual( instance.shortField, reference )
+//            instance.shortField = reference
+//            XCTAssertEqual( instance.shortField, reference )
 
             SwiftTest.shortArrayFieldStatic = referenceArray
             XCTAssertEqual( SwiftTest.shortArrayFieldStatic, referenceArray )
-            instance.shortArrayField = referenceArray
-            XCTAssertEqual( instance.shortArrayField, referenceArray )
+//            instance.shortArrayField = referenceArray
+//            XCTAssertEqual( instance.shortArrayField, referenceArray )
 
             SwiftTest.short2dArrayFieldStatic = reference2dArray
             XCTAssertEqual( SwiftTest.short2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.short2dArrayField = reference2dArray
-            XCTAssertEqual( instance.short2dArrayField[0], reference2dArray[0] )
+//            instance.short2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.short2dArrayField[0], reference2dArray[0] )
 
-            XCTAssertEqual( SwiftTest.shortMethodStatic( reference ), reference )
+//            XCTAssertEqual( SwiftTest.shortMethodStatic( reference ), reference )
             XCTAssertEqual( instance.shortMethod( reference ), reference )
 
-            XCTAssertEqual( SwiftTest.shortArrayMethodStatic( referenceArray ), referenceArray )
+//            XCTAssertEqual( SwiftTest.shortArrayMethodStatic( referenceArray ), referenceArray )
             XCTAssertEqual( instance.shortArrayMethod( referenceArray ), referenceArray )
 
-            XCTAssertEqual( SwiftTest.short2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+//            XCTAssertEqual( SwiftTest.short2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
             XCTAssertEqual( instance.short2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
         }
 
@@ -153,26 +126,26 @@ class org_genie: XCTestCase {
 
             SwiftTest.intFieldStatic = reference
             XCTAssertEqual( SwiftTest.intFieldStatic, reference )
-            instance.intField = reference
-            XCTAssertEqual( instance.intField, reference )
+//            instance.intField = reference
+//            XCTAssertEqual( instance.intField, reference )
 
             SwiftTest.intArrayFieldStatic = referenceArray
             XCTAssertEqual( SwiftTest.intArrayFieldStatic, referenceArray )
-            instance.intArrayField = referenceArray
-            XCTAssertEqual( instance.intArrayField, referenceArray )
+//            instance.intArrayField = referenceArray
+//            XCTAssertEqual( instance.intArrayField, referenceArray )
 
             SwiftTest.int2dArrayFieldStatic = reference2dArray
             XCTAssertEqual( SwiftTest.int2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.int2dArrayField = reference2dArray
-            XCTAssertEqual( instance.int2dArrayField[0], reference2dArray[0] )
+//            instance.int2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.int2dArrayField[0], reference2dArray[0] )
 
-            XCTAssertEqual( SwiftTest.intMethodStatic( reference ), reference )
+//            XCTAssertEqual( SwiftTest.intMethodStatic( reference ), reference )
             XCTAssertEqual( instance.intMethod( reference ), reference )
 
-            XCTAssertEqual( SwiftTest.intArrayMethodStatic( referenceArray ), referenceArray )
+//            XCTAssertEqual( SwiftTest.intArrayMethodStatic( referenceArray ), referenceArray )
             XCTAssertEqual( instance.intArrayMethod( referenceArray ), referenceArray )
 
-            XCTAssertEqual( SwiftTest.int2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+//            XCTAssertEqual( SwiftTest.int2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
             XCTAssertEqual( instance.int2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
         }
 
@@ -183,26 +156,26 @@ class org_genie: XCTestCase {
 
             SwiftTest.longFieldStatic = reference
             XCTAssertEqual( SwiftTest.longFieldStatic, reference )
-            instance.longField = reference
-            XCTAssertEqual( instance.longField, reference )
+//            instance.longField = reference
+//            XCTAssertEqual( instance.longField, reference )
 
             SwiftTest.longArrayFieldStatic = referenceArray
             XCTAssertEqual( SwiftTest.longArrayFieldStatic, referenceArray )
-            instance.longArrayField = referenceArray
-            XCTAssertEqual( instance.longArrayField, referenceArray )
+//            instance.longArrayField = referenceArray
+//            XCTAssertEqual( instance.longArrayField, referenceArray )
 
             SwiftTest.long2dArrayFieldStatic = reference2dArray
             XCTAssertEqual( SwiftTest.long2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.long2dArrayField = reference2dArray
-            XCTAssertEqual( instance.long2dArrayField[0], reference2dArray[0] )
+//            instance.long2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.long2dArrayField[0], reference2dArray[0] )
 
-            XCTAssertEqual( SwiftTest.longMethodStatic( reference ), reference )
+//            XCTAssertEqual( SwiftTest.longMethodStatic( reference ), reference )
             XCTAssertEqual( instance.longMethod( reference ), reference )
 
-            XCTAssertEqual( SwiftTest.longArrayMethodStatic( referenceArray ), referenceArray )
+//            XCTAssertEqual( SwiftTest.longArrayMethodStatic( referenceArray ), referenceArray )
             XCTAssertEqual( instance.longArrayMethod( referenceArray ), referenceArray )
 
-            XCTAssertEqual( SwiftTest.long2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+//            XCTAssertEqual( SwiftTest.long2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
             XCTAssertEqual( instance.long2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
         }
 
@@ -213,26 +186,26 @@ class org_genie: XCTestCase {
 
             SwiftTest.floatFieldStatic = reference
             XCTAssertEqual( SwiftTest.floatFieldStatic, reference )
-            instance.floatField = reference
-            XCTAssertEqual( instance.floatField, reference )
+//            instance.floatField = reference
+//            XCTAssertEqual( instance.floatField, reference )
 
             SwiftTest.floatArrayFieldStatic = referenceArray
             XCTAssertEqual( SwiftTest.floatArrayFieldStatic, referenceArray )
-            instance.floatArrayField = referenceArray
-            XCTAssertEqual( instance.floatArrayField, referenceArray )
+//            instance.floatArrayField = referenceArray
+//            XCTAssertEqual( instance.floatArrayField, referenceArray )
 
             SwiftTest.float2dArrayFieldStatic = reference2dArray
             XCTAssertEqual( SwiftTest.float2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.float2dArrayField = reference2dArray
-            XCTAssertEqual( instance.float2dArrayField[0], reference2dArray[0] )
+//            instance.float2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.float2dArrayField[0], reference2dArray[0] )
 
-            XCTAssertEqual( SwiftTest.floatMethodStatic( reference ), reference )
+//            XCTAssertEqual( SwiftTest.floatMethodStatic( reference ), reference )
             XCTAssertEqual( instance.floatMethod( reference ), reference )
 
-            XCTAssertEqual( SwiftTest.floatArrayMethodStatic( referenceArray ), referenceArray )
+//            XCTAssertEqual( SwiftTest.floatArrayMethodStatic( referenceArray ), referenceArray )
             XCTAssertEqual( instance.floatArrayMethod( referenceArray ), referenceArray )
 
-            XCTAssertEqual( SwiftTest.float2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+//            XCTAssertEqual( SwiftTest.float2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
             XCTAssertEqual( instance.float2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
         }
 
@@ -243,26 +216,26 @@ class org_genie: XCTestCase {
 
             SwiftTest.doubleFieldStatic = reference
             XCTAssertEqual( SwiftTest.doubleFieldStatic, reference )
-            instance.doubleField = reference
-            XCTAssertEqual( instance.doubleField, reference )
+//            instance.doubleField = reference
+//            XCTAssertEqual( instance.doubleField, reference )
 
             SwiftTest.doubleArrayFieldStatic = referenceArray
             XCTAssertEqual( SwiftTest.doubleArrayFieldStatic, referenceArray )
-            instance.doubleArrayField = referenceArray
-            XCTAssertEqual( instance.doubleArrayField, referenceArray )
+//            instance.doubleArrayField = referenceArray
+//            XCTAssertEqual( instance.doubleArrayField, referenceArray )
 
             SwiftTest.double2dArrayFieldStatic = reference2dArray
             XCTAssertEqual( SwiftTest.double2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.double2dArrayField = reference2dArray
-            XCTAssertEqual( instance.double2dArrayField[0], reference2dArray[0] )
+//            instance.double2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.double2dArrayField[0], reference2dArray[0] )
 
-            XCTAssertEqual( SwiftTest.doubleMethodStatic( reference ), reference )
+//            XCTAssertEqual( SwiftTest.doubleMethodStatic( reference ), reference )
             XCTAssertEqual( instance.doubleMethod( reference ), reference )
 
-            XCTAssertEqual( SwiftTest.doubleArrayMethodStatic( referenceArray ), referenceArray )
+//            XCTAssertEqual( SwiftTest.doubleArrayMethodStatic( referenceArray ), referenceArray )
             XCTAssertEqual( instance.doubleArrayMethod( referenceArray ), referenceArray )
 
-            XCTAssertEqual( SwiftTest.double2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+//            XCTAssertEqual( SwiftTest.double2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
             XCTAssertEqual( instance.double2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
         }
 
@@ -273,35 +246,55 @@ class org_genie: XCTestCase {
 
             SwiftTest.StringFieldStatic = reference
             XCTAssertEqual( SwiftTest.StringFieldStatic, reference )
-            instance.StringField = reference
-            XCTAssertEqual( instance.StringField, reference )
+//            instance.StringField = reference
+//            XCTAssertEqual( instance.StringField, reference )
 
             SwiftTest.StringArrayFieldStatic = referenceArray
             XCTAssertEqual( SwiftTest.StringArrayFieldStatic, referenceArray )
-            instance.StringArrayField = referenceArray
-            XCTAssertEqual( instance.StringArrayField, referenceArray )
+//            instance.StringArrayField = referenceArray
+//            XCTAssertEqual( instance.StringArrayField, referenceArray )
 
             SwiftTest.String2dArrayFieldStatic = reference2dArray
             XCTAssertEqual( SwiftTest.String2dArrayFieldStatic[0], reference2dArray[0] )
-            instance.String2dArrayField = reference2dArray
-            XCTAssertEqual( instance.String2dArrayField[0], reference2dArray[0] )
+//            instance.String2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.String2dArrayField[0], reference2dArray[0] )
 
-            XCTAssertEqual( SwiftTest.StringMethodStatic( reference ), reference )
+//            XCTAssertEqual( SwiftTest.StringMethodStatic( reference ), reference )
             XCTAssertEqual( instance.StringMethod( reference ), reference )
 
-            XCTAssertEqual( SwiftTest.StringArrayMethodStatic( referenceArray ), referenceArray )
+//            XCTAssertEqual( SwiftTest.StringArrayMethodStatic( referenceArray ), referenceArray )
             XCTAssertEqual( instance.StringArrayMethod( referenceArray ), referenceArray )
 
-            XCTAssertEqual( SwiftTest.String2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+//            XCTAssertEqual( SwiftTest.String2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
             XCTAssertEqual( instance.String2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
         }
-    }
 
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
+        if true {
+            let reference: SwiftHelloTest_TestListener = SwiftTestListener()
+            let referenceArray = [(reference)]
+            let reference2dArray = [referenceArray]
+
+            SwiftTest.TestListenerFieldStatic = reference
+            XCTAssertEqual( SwiftTest.TestListenerFieldStatic, reference )
+//            instance.TestListenerField = reference
+//            XCTAssertEqual( instance.TestListenerField, reference )
+
+            SwiftTest.TestListenerArrayFieldStatic = referenceArray
+            XCTAssertEqual( SwiftTest.TestListenerArrayFieldStatic, referenceArray )
+//            instance.TestListenerArrayField = referenceArray
+//            XCTAssertEqual( instance.TestListenerArrayField, referenceArray )
 
-}
+            SwiftTest.TestListener2dArrayFieldStatic = reference2dArray
+            XCTAssertEqual( SwiftTest.TestListener2dArrayFieldStatic[0], reference2dArray[0] )
+//            instance.TestListener2dArrayField = reference2dArray
+//            XCTAssertEqual( instance.TestListener2dArrayField[0], reference2dArray[0] )
+
+//            XCTAssertEqual( SwiftTest.TestListenerMethodStatic( reference ), reference )
+            XCTAssertEqual( instance.TestListenerMethod( reference ), reference )
+
+//            XCTAssertEqual( SwiftTest.TestListenerArrayMethodStatic( referenceArray ), referenceArray )
+            XCTAssertEqual( instance.TestListenerArrayMethod( referenceArray ), referenceArray )
+
+//            XCTAssertEqual( SwiftTest.TestListener2dArrayMethodStatic( reference2dArray )[0], reference2dArray[0] )
+            XCTAssertEqual( instance.TestListener2dArrayMethod( reference2dArray )[0], reference2dArray[0] )
+        }
diff --git a/overrides.pl b/overrides.pl
index a5a0f43..76799ef 100755
--- a/overrides.pl
+++ b/overrides.pl
@@ -23,12 +23,11 @@
     while ( $text =~ /([^\n:]+):.*? error: overriding declaration requires an 'override' keyword\n    ([^{]*\{)/gm ) {
         my ($source, $key) = ($1, $2);
 
-        warn ">>$1<<\n";
-        warn ">>$2<<\n";
+        warn ">>$1 $2<<\n";
 
         next if !-f $source;
         my $code = join '', IO::File->new( "< $source" )->getlines();
-        if ( $code =~ s/(?<!override )\Q$key\E/override $key/ or warn "missed" and 0 ) {
+        if ( $code =~ s/(?<!override )\Q$key\E/override $key/ ) {
             IO::File->new( "> $source" )->print( $code );
         }
     }
diff --git a/parameters/recipe.sh b/parameters/recipe.sh
index 8f5902e..56433c5 100644
--- a/parameters/recipe.sh
+++ b/parameters/recipe.sh
@@ -5,7 +5,7 @@
 
 # unzip $JAVA_HOME/src.zip
 # find . -name '*.java' > sources.txt
-# $JAVA_HOME/bin/jvac -d classes -g -parameters @sources.txt 2>&1 | tee log.txt
+# $JAVA_HOME/bin/javac -d classes -g -parameters @sources.txt 2>&1 | tee log.txt
 
 # unfortunately this gives errors and you have to repeat the folowing steps
 
diff --git a/src/com/jh/SwiftHelloListener.java b/src/com/jh/SwiftHelloListener.java
deleted file mode 100644
index 0bdd67a..0000000
--- a/src/com/jh/SwiftHelloListener.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-package com.jh;
-
-public interface SwiftHelloListener {
-	
-	public void processNumber( double number );
-	
-	public void processText( String text );
-	
-}
diff --git a/src/com/jh/SwiftHelloResponder.java b/src/com/jh/SwiftHelloResponder.java
deleted file mode 100644
index 05b7e6a..0000000
--- a/src/com/jh/SwiftHelloResponder.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-package com.jh;
-
-public interface SwiftHelloResponder {
-	
-	public void processedNumber( double number );
-	
-	public void processedText( String text );
-	
-}
diff --git a/src/com/johnholdsworth/swiftbindings/SwiftHelloBinding.java b/src/com/johnholdsworth/swiftbindings/SwiftHelloBinding.java
new file mode 100644
index 0000000..28d7d50
--- /dev/null
+++ b/src/com/johnholdsworth/swiftbindings/SwiftHelloBinding.java
@@ -0,0 +1,67 @@
+
+package com.johnholdsworth.swiftbindings;
+
+import com.johnholdsworth.swiftbindings.SwiftHelloTypes.TextListener;
+import com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap;
+import com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList;
+import com.johnholdsworth.swiftbindings.SwiftHelloTypes.StringMap;
+import com.johnholdsworth.swiftbindings.SwiftHelloTypes.StringMapList;
+
+public interface SwiftHelloBinding {
+
+    // Messages from JavaActivity to Swift
+    public interface Listener {
+
+        public void setCacheDir( String cacheDir );
+
+        public void processNumber( double number );
+
+        public void processText( String text );
+
+        public void processedMap( ListenerMap map );
+
+        public void processedMapList( ListenerMapList map );
+
+        public void processStringMap( StringMap map );
+
+        public void processStringMapList( StringMapList map );
+
+        public double throwException() throws Exception;
+
+        public SwiftHelloTest.TestListener testResponder( int loopback );
+
+    }
+
+    // Messages from Swift back to Activity
+    public interface Responder {
+
+        public void processedNumber( double number );
+
+        public void processedText( String text );
+
+        public void processedTextListener( TextListener text );
+
+        public void processedTextListenerArray( TextListener text[] );
+
+        public void processedTextListener2dArray( TextListener text[][] );
+
+        public void processMap( ListenerMap map );
+
+        public void processMapList( ListenerMapList map );
+
+        public void processedStringMap( StringMap map );
+
+        public void processedStringMapList( StringMapList map );
+
+        public double throwException() throws Exception;
+
+        public String[] debug( String msg );
+
+        public void onMainThread( Runnable runnable );
+
+        public SwiftHelloTest.TestListener testResponder( int loopback );
+
+    }
+
+}
+
diff --git a/src/com/johnholdsworth/swiftbindings/SwiftHelloTest.java b/src/com/johnholdsworth/swiftbindings/SwiftHelloTest.java
new file mode 100644
index 0000000..acd414e
--- /dev/null
+++ b/src/com/johnholdsworth/swiftbindings/SwiftHelloTest.java
@@ -0,0 +1,391 @@
+
+// auto generated by ../../../../gentests.rb
+
+package com.johnholdsworth.swiftbindings;
+
+import com.johnholdsworth.swiftbindings.SwiftHelloTypes.TextListener;
+import com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap;
+import com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList;
+
+public interface SwiftHelloTest {
+
+    public interface TestListener {
+
+        public void setLoopback( TestListener loopback );
+
+        public boolean booleanMethod( boolean arg );
+        public boolean[] booleanArrayMethod( boolean arg[] );
+        public boolean[][] boolean2dArrayMethod( boolean arg[][] );
+
+        public byte byteMethod( byte arg );
+        public byte[] byteArrayMethod( byte arg[] );
+        public byte[][] byte2dArrayMethod( byte arg[][] );
+
+        public char charMethod( char arg );
+        public char[] charArrayMethod( char arg[] );
+        public char[][] char2dArrayMethod( char arg[][] );
+
+        public short shortMethod( short arg );
+        public short[] shortArrayMethod( short arg[] );
+        public short[][] short2dArrayMethod( short arg[][] );
+
+        public int intMethod( int arg );
+        public int[] intArrayMethod( int arg[] );
+        public int[][] int2dArrayMethod( int arg[][] );
+
+        public long longMethod( long arg );
+        public long[] longArrayMethod( long arg[] );
+        public long[][] long2dArrayMethod( long arg[][] );
+
+        public float floatMethod( float arg );
+        public float[] floatArrayMethod( float arg[] );
+        public float[][] float2dArrayMethod( float arg[][] );
+
+        public double doubleMethod( double arg );
+        public double[] doubleArrayMethod( double arg[] );
+        public double[][] double2dArrayMethod( double arg[][] );
+
+        public String StringMethod( String arg );
+        public String[] StringArrayMethod( String arg[] );
+        public String[][] String2dArrayMethod( String arg[][] );
+
+        public TestListener TestListenerMethod( TestListener arg );
+        public TestListener[] TestListenerArrayMethod( TestListener arg[] );
+        public TestListener[][] TestListener2dArrayMethod( TestListener arg[][] );
+
+        public ListenerMap testMap( ListenerMap arg );
+        public ListenerMapList testMapList( ListenerMapList arg );
+
+    }
+
+    public static class TestResponderAdapter implements TestListener {
+
+        public TestListener loopback;
+
+        public void setLoopback( TestListener loopback ) {
+            this.loopback = loopback;
+        }
+
+        public boolean booleanMethod( boolean arg ) {
+            return loopback != null ? loopback.booleanMethod( arg ) : arg;
+        }
+
+        public boolean[] booleanArrayMethod( boolean arg[] ) {
+            return loopback != null ? loopback.booleanArrayMethod( arg ) : arg;
+        }
+
+        public boolean[][] boolean2dArrayMethod( boolean arg[][] ) {
+            return loopback != null ? loopback.boolean2dArrayMethod( arg ) : arg;
+        }
+
+        public byte byteMethod( byte arg ) {
+            return loopback != null ? loopback.byteMethod( arg ) : arg;
+        }
+
+        public byte[] byteArrayMethod( byte arg[] ) {
+            return loopback != null ? loopback.byteArrayMethod( arg ) : arg;
+        }
+
+        public byte[][] byte2dArrayMethod( byte arg[][] ) {
+            return loopback != null ? loopback.byte2dArrayMethod( arg ) : arg;
+        }
+
+        public char charMethod( char arg ) {
+            return loopback != null ? loopback.charMethod( arg ) : arg;
+        }
+
+        public char[] charArrayMethod( char arg[] ) {
+            return loopback != null ? loopback.charArrayMethod( arg ) : arg;
+        }
+
+        public char[][] char2dArrayMethod( char arg[][] ) {
+            return loopback != null ? loopback.char2dArrayMethod( arg ) : arg;
+        }
+
+        public short shortMethod( short arg ) {
+            return loopback != null ? loopback.shortMethod( arg ) : arg;
+        }
+
+        public short[] shortArrayMethod( short arg[] ) {
+            return loopback != null ? loopback.shortArrayMethod( arg ) : arg;
+        }
+
+        public short[][] short2dArrayMethod( short arg[][] ) {
+            return loopback != null ? loopback.short2dArrayMethod( arg ) : arg;
+        }
+
+        public int intMethod( int arg ) {
+            return loopback != null ? loopback.intMethod( arg ) : arg;
+        }
+
+        public int[] intArrayMethod( int arg[] ) {
+            return loopback != null ? loopback.intArrayMethod( arg ) : arg;
+        }
+
+        public int[][] int2dArrayMethod( int arg[][] ) {
+            return loopback != null ? loopback.int2dArrayMethod( arg ) : arg;
+        }
+
+        public long longMethod( long arg ) {
+            return loopback != null ? loopback.longMethod( arg ) : arg;
+        }
+
+        public long[] longArrayMethod( long arg[] ) {
+            return loopback != null ? loopback.longArrayMethod( arg ) : arg;
+        }
+
+        public long[][] long2dArrayMethod( long arg[][] ) {
+            return loopback != null ? loopback.long2dArrayMethod( arg ) : arg;
+        }
+
+        public float floatMethod( float arg ) {
+            return loopback != null ? loopback.floatMethod( arg ) : arg;
+        }
+
+        public float[] floatArrayMethod( float arg[] ) {
+            return loopback != null ? loopback.floatArrayMethod( arg ) : arg;
+        }
+
+        public float[][] float2dArrayMethod( float arg[][] ) {
+            return loopback != null ? loopback.float2dArrayMethod( arg ) : arg;
+        }
+
+        public double doubleMethod( double arg ) {
+            return loopback != null ? loopback.doubleMethod( arg ) : arg;
+        }
+
+        public double[] doubleArrayMethod( double arg[] ) {
+            return loopback != null ? loopback.doubleArrayMethod( arg ) : arg;
+        }
+
+        public double[][] double2dArrayMethod( double arg[][] ) {
+            return loopback != null ? loopback.double2dArrayMethod( arg ) : arg;
+        }
+
+        public String StringMethod( String arg ) {
+            return loopback != null ? loopback.StringMethod( arg ) : arg;
+        }
+
+        public String[] StringArrayMethod( String arg[] ) {
+            return loopback != null ? loopback.StringArrayMethod( arg ) : arg;
+        }
+
+        public String[][] String2dArrayMethod( String arg[][] ) {
+            return loopback != null ? loopback.String2dArrayMethod( arg ) : arg;
+        }
+
+        public TestListener TestListenerMethod( TestListener arg ) {
+            return loopback != null ? loopback.TestListenerMethod( arg ) : arg;
+        }
+
+        public TestListener[] TestListenerArrayMethod( TestListener arg[] ) {
+            return loopback != null ? loopback.TestListenerArrayMethod( arg ) : arg;
+        }
+
+        public TestListener[][] TestListener2dArrayMethod( TestListener arg[][] ) {
+            return loopback != null ? loopback.TestListener2dArrayMethod( arg ) : arg;
+        }
+
+        public ListenerMap testMap( ListenerMap arg ) {
+            return loopback != null ? loopback.testMap( arg ) : arg;
+        }
+
+        public ListenerMapList testMapList( ListenerMapList arg ) {
+            return loopback != null ? loopback.testMapList( arg ) : arg;
+        }
+
+    }
+
+    public static class SwiftTestListener extends TestResponderAdapter {
+
+        static int tcount = 0;
+
+        public void respond( TestListener responder ) {
+            tcount += 1;
+            System.out.println("Java -> Swift "+tcount+"...");
+
+
+            if ( true ) {
+                boolean reference = true;
+                boolean referenceArray[] = new boolean [] {reference};
+                boolean reference2dArray[][] = new boolean [][] {referenceArray};
+
+                boolean response = responder.booleanMethod( reference );
+                boolean responseArray[] = responder.booleanArrayMethod( referenceArray );
+                boolean response2dArray[][] = responder.boolean2dArrayMethod( reference2dArray );
+
+                if ( response != reference ) {
+                    System.out.println("Bool: "+response+" != "+reference);
+                }
+                if ( responseArray[0] != referenceArray[0] ) {
+                    System.out.println("Bool: "+responseArray[0]+" != "+referenceArray[0]);
+                }
+                if ( response2dArray[0][0] != reference2dArray[0][0] ) {
+                    System.out.println("Bool: "+response2dArray[0][0]+" != "+reference2dArray[0][0]);
+                }
+            }
+
+            if ( true ) {
+                byte reference = 123;
+                byte referenceArray[] = new byte [] {reference};
+                byte reference2dArray[][] = new byte [][] {referenceArray};
+
+                byte response = responder.byteMethod( reference );
+                byte responseArray[] = responder.byteArrayMethod( referenceArray );
+                byte response2dArray[][] = responder.byte2dArrayMethod( reference2dArray );
+
+                if ( response != reference ) {
+                    System.out.println("Int8: "+response+" != "+reference);
+                }
+                if ( responseArray[0] != referenceArray[0] ) {
+                    System.out.println("Int8: "+responseArray[0]+" != "+referenceArray[0]);
+                }
+                if ( response2dArray[0][0] != reference2dArray[0][0] ) {
+                    System.out.println("Int8: "+response2dArray[0][0]+" != "+reference2dArray[0][0]);
+                }
+            }
+
+            if ( true ) {
+                char reference = 123;
+                char referenceArray[] = new char [] {reference};
+                char reference2dArray[][] = new char [][] {referenceArray};
+
+                char response = responder.charMethod( reference );
+                char responseArray[] = responder.charArrayMethod( referenceArray );
+                char response2dArray[][] = responder.char2dArrayMethod( reference2dArray );
+
+                if ( response != reference ) {
+                    System.out.println("UInt16: "+response+" != "+reference);
+                }
+                if ( responseArray[0] != referenceArray[0] ) {
+                    System.out.println("UInt16: "+responseArray[0]+" != "+referenceArray[0]);
+                }
+                if ( response2dArray[0][0] != reference2dArray[0][0] ) {
+                    System.out.println("UInt16: "+response2dArray[0][0]+" != "+reference2dArray[0][0]);
+                }
+            }
+
+            if ( true ) {
+                short reference = 123;
+                short referenceArray[] = new short [] {reference};
+                short reference2dArray[][] = new short [][] {referenceArray};
+
+                short response = responder.shortMethod( reference );
+                short responseArray[] = responder.shortArrayMethod( referenceArray );
+                short response2dArray[][] = responder.short2dArrayMethod( reference2dArray );
+
+                if ( response != reference ) {
+                    System.out.println("Int16: "+response+" != "+reference);
+                }
+                if ( responseArray[0] != referenceArray[0] ) {
+                    System.out.println("Int16: "+responseArray[0]+" != "+referenceArray[0]);
+                }
+                if ( response2dArray[0][0] != reference2dArray[0][0] ) {
+                    System.out.println("Int16: "+response2dArray[0][0]+" != "+reference2dArray[0][0]);
+                }
+            }
+
+            if ( true ) {
+                int reference = 123;
+                int referenceArray[] = new int [] {reference};
+                int reference2dArray[][] = new int [][] {referenceArray};
+
+                int response = responder.intMethod( reference );
+                int responseArray[] = responder.intArrayMethod( referenceArray );
+                int response2dArray[][] = responder.int2dArrayMethod( reference2dArray );
+
+                if ( response != reference ) {
+                    System.out.println("Int: "+response+" != "+reference);
+                }
+                if ( responseArray[0] != referenceArray[0] ) {
+                    System.out.println("Int: "+responseArray[0]+" != "+referenceArray[0]);
+                }
+                if ( response2dArray[0][0] != reference2dArray[0][0] ) {
+                    System.out.println("Int: "+response2dArray[0][0]+" != "+reference2dArray[0][0]);
+                }
+            }
+
+            if ( true ) {
+                long reference = 123;
+                long referenceArray[] = new long [] {reference};
+                long reference2dArray[][] = new long [][] {referenceArray};
+
+                long response = responder.longMethod( reference );
+                long responseArray[] = responder.longArrayMethod( referenceArray );
+                long response2dArray[][] = responder.long2dArrayMethod( reference2dArray );
+
+                if ( response != reference ) {
+                    System.out.println("Int64: "+response+" != "+reference);
+                }
+                if ( responseArray[0] != referenceArray[0] ) {
+                    System.out.println("Int64: "+responseArray[0]+" != "+referenceArray[0]);
+                }
+                if ( response2dArray[0][0] != reference2dArray[0][0] ) {
+                    System.out.println("Int64: "+response2dArray[0][0]+" != "+reference2dArray[0][0]);
+                }
+            }
+
+            if ( true ) {
+                float reference = 123;
+                float referenceArray[] = new float [] {reference};
+                float reference2dArray[][] = new float [][] {referenceArray};
+
+                float response = responder.floatMethod( reference );
+                float responseArray[] = responder.floatArrayMethod( referenceArray );
+                float response2dArray[][] = responder.float2dArrayMethod( reference2dArray );
+
+                if ( response != reference ) {
+                    System.out.println("Float: "+response+" != "+reference);
+                }
+                if ( responseArray[0] != referenceArray[0] ) {
+                    System.out.println("Float: "+responseArray[0]+" != "+referenceArray[0]);
+                }
+                if ( response2dArray[0][0] != reference2dArray[0][0] ) {
+                    System.out.println("Float: "+response2dArray[0][0]+" != "+reference2dArray[0][0]);
+                }
+            }
+
+            if ( true ) {
+                double reference = 123;
+                double referenceArray[] = new double [] {reference};
+                double reference2dArray[][] = new double [][] {referenceArray};
+
+                double response = responder.doubleMethod( reference );
+                double responseArray[] = responder.doubleArrayMethod( referenceArray );
+                double response2dArray[][] = responder.double2dArrayMethod( reference2dArray );
+
+                if ( response != reference ) {
+                    System.out.println("Double: "+response+" != "+reference);
+                }
+                if ( responseArray[0] != referenceArray[0] ) {
+                    System.out.println("Double: "+responseArray[0]+" != "+referenceArray[0]);
+                }
+                if ( response2dArray[0][0] != reference2dArray[0][0] ) {
+                    System.out.println("Double: "+response2dArray[0][0]+" != "+reference2dArray[0][0]);
+                }
+            }
+
+            if ( true ) {
+                String reference = "123";
+                String referenceArray[] = new String [] {reference};
+                String reference2dArray[][] = new String [][] {referenceArray};
+
+                String response = responder.StringMethod( reference );
+                String responseArray[] = responder.StringArrayMethod( referenceArray );
+                String response2dArray[][] = responder.String2dArrayMethod( reference2dArray );
+            }
+
+            if ( true ) {
+                TestListener reference = new SwiftTestListener();
+                TestListener referenceArray[] = new TestListener [] {reference};
+                TestListener reference2dArray[][] = new TestListener [][] {referenceArray};
+
+                TestListener response = responder.TestListenerMethod( reference );
+                TestListener responseArray[] = responder.TestListenerArrayMethod( referenceArray );
+                TestListener response2dArray[][] = responder.TestListener2dArrayMethod( reference2dArray );
+            }
+       }
+
+    }
+
+}
diff --git a/src/com/johnholdsworth/swiftbindings/SwiftHelloTypes.java b/src/com/johnholdsworth/swiftbindings/SwiftHelloTypes.java
new file mode 100644
index 0000000..d5ec454
--- /dev/null
+++ b/src/com/johnholdsworth/swiftbindings/SwiftHelloTypes.java
@@ -0,0 +1,88 @@
+
+// Shared types/interfaces between Java and Swift in example applications
+
+package com.johnholdsworth.swiftbindings;
+
+import java.util.Map;
+import java.util.HashMap;
+
+public interface SwiftHelloTypes {
+
+    // An example of publishing an object to Java.
+    // Add the associated protocol to an class and
+    // objects can be passed to a responder message.
+    public interface TextListener {
+        public String getText();
+    }
+
+    // These are required because of type erasure in Java jars
+    public static class ListenerMap extends HashMap<String,TextListener> {
+        public static Class<?> valueClass() {
+            return TextListener.class;
+        }
+    }
+
+    public static class ListenerMapList extends HashMap<String,TextListener[]> {
+        public static Class<?> valueClass() {
+            return (new TextListener [] {}).getClass();
+        }
+    }
+
+    public static class StringMap extends HashMap<String,String> {
+        public static Class<?> valueClass() {
+            return String.class;
+        }
+        public StringMap() {
+            super();
+        }
+        @SuppressWarnings("unchecked")
+        public StringMap(Map map) {
+            super(map);
+        }
+    }
+
+    public static class StringMapList extends HashMap<String,String[]> {
+        public static Class<?> valueClass() {
+            return (new String [] {}).getClass();
+        }
+        public StringMapList() {
+            super();
+        }
+        @SuppressWarnings("unchecked")
+        public StringMapList(Map map) {
+            super(map);
+        }
+    }
+
+    public static enum Planet {
+        MERCURY (3.303e+23, 2.4397e6),
+        VENUS   (4.869e+24, 6.0518e6),
+        EARTH   (5.976e+24, 6.37814e6),
+        MARS    (6.421e+23, 3.3972e6),
+        JUPITER (1.9e+27,   7.1492e7),
+        SATURN  (5.688e+26, 6.0268e7),
+        URANUS  (8.686e+25, 2.5559e7),
+        NEPTUNE (1.024e+26, 2.4746e7);
+
+        private final double mass;   // in kilograms
+        private final double radius; // in meters
+        Planet(double mass, double radius) {
+            this.mass = mass;
+            this.radius = radius;
+        }
+        public double mass() { return mass; }
+        public double radius() { return radius; }
+
+        // universal gravitational constant  (m3 kg-1 s-2)
+        public static final double G = 6.67300E-11;
+
+        public double surfaceGravity() {
+            return G * mass / (radius * radius);
+        }
+        public double surfaceWeight(double otherMass) {
+            return otherMass * surfaceGravity();
+        }
+    }
+}
+
+
diff --git a/src/genswift.java b/src/genswift.java
index 956dfcc..4173b69 100644
--- a/src/genswift.java
+++ b/src/genswift.java
@@ -1,179 +1,293 @@
 //
 //  genswift.java
-//  SwiftJava
+//  https://github.com/SwiftJava/SwiftJava
+//  $Id: //depot/SwiftJava/src/genswift.java#95 $
 //
 //  Created by John Holdsworth on 14/07/2016.
 //  Copyright (c) 2016 John Holdsworth. All rights reserved.
+//  MIT License
+//
+//  See ../genswift.sh for details on invocation.
+//  Code generator for Swift written in the style of a Perl script.
+//
+//  Requires https://github.com/SwiftJava/java_swift release 2.1.0+
 //
-//  See genswift.sh..
 //  List of classes to be generated received on stdin which is the
 //  output of a grep on the target jar for the classes of interest.
 //
 //  The ordering of frameworks can be specified in argv[0] otherwise
 //  the ordering is found by processing all files then re-processing
 //  after reordering to minimise the number of forward references in
-//  the generated code.
+//  the generated code. argv[1] can be the destination directory for
+/// generated Swift and argv[2] can be the root for Java generation.
+//
+//  For Java classes, a Swift class of the same name is generated in
+//  a framework derived from the first two packages of the classes
+//  full name (e.g. java_lang, java_util.) For Java interfaces a
+//  Swift protocol is generated along with a concrete class with
+//  "Forward" added that can be used to message to instances of
+//  the protocol from Swift.
+//
+//  Where the interface is java.lang.Runnable or the interface name
+//  ends in "Listener", "Handler" or "Manager" an additional "Base"
+//  class is generated, instances of which can be passed to Java and
+//  have Swift methods in a subclass called from Java. This is used
+//  in threading and in event processing in Swift. These "Base" classes
+//  are also generated for concrete classes with names ending in "Adapter".
+//  These seemingly arbitrary conventions are taken from java.awt & swing.
+//
+//  A variation on this forwarding of Java methods into Swift is where
+//  a method is generally a subclasses responsibility to implement such
+//  as the method java.awt.Canvas.paint(). A list of these methods must
+//  be maintained in this source and where one is encountered a "Base"
+//  class is generated allowing the method to be implemented in Swift.
+//
+//  For this proxy of Java methods into Swift, support is required on
+//  the Java side of the divide. Proxy classes delegating to "native"
+//  implementations of the relevant method are generated and must be
+//  available to the application. On UNIX this is through the jar file
+//  ~/.swiftjava.jar built from these generated sources using ../genjar.sh.
+//
+//
+//  MIT License
+//
+//  Copyright (c) 2016-7, John Holdsworth
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy of this
+//  software and associated documentation files (the "Software"), to deal in the Software
+//  without restriction, including without limitation the rights to use, copy, modify, merge,
+//  publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+//  to whom the Software is furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all copies
+//  or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+//  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+//  PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+//  FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 
 import java.io.*;
 import java.util.HashMap;
+
 import java.util.ArrayList;
-import java.lang.reflect.*;
+import java.util.Comparator;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 
 class genswift {
 
-	static void print( String s ) {
-		System.out.println(s);
-	}
-
-	static String Unclassed = "Unclassed";
-	static String pathToWriteSource = "./";
-	static String organisation = "org.genie.";
-	static String proxySourcePath = pathToWriteSource+"src/"+organisation.replace('.', '/');
-	static String repoBase = "https://github.com/SwiftJava/";
-
-    boolean isUnclassed( Class<?> type ) {
-    	return swiftTypeFor(type, false, true).indexOf(Unclassed) != -1;
+    static void print( String s ) {
+        System.out.println(s);
     }
 
-    boolean excludeFromCodeGeneration( Class<?> clazz ) {
-		return !Modifier.isPublic(clazz.getModifiers()) ||
-				classPrefix(clazz.getName()).equals("java_util") && clazz.getName().indexOf('$') != -1;
+    static void progress( Object o ) {
+            //print( o.toString() );
     }
 
-    boolean supportsProxyCallback( Class<?> clazz ) {
-    	String clazzName = clazz.getName();
-    	return clazz == java.lang.Runnable.class || isAdapter()
-    			|| clazz.isInterface() && (clazzName.endsWith("Listener") || clazzName.endsWith("Handler") || clazzName.endsWith("Manager"));
-    }
+    static int apiVersion = 2;
 
-    boolean isAdapter() {
-    	return classSuffix.endsWith("Adapter") && clazz != java.awt.dnd.DropTargetAdapter.class; // missing drop()?
+    static String Unavailable = "Unavailable";
+    static String pathToWriteSource = "./";
+    static String organisation = "org.swiftjava.";
+    static String proxySourcePath = organisation.replace('.', '/');
+    static String repoBase = "https://github.com/SwiftJava/";
+    static boolean sortMembers = true, convertEnums = true, returnImplicitlyUnwrapped = true;
+
+    boolean isUnavailable( Class<?> type ) {
+        return notVoid(type) && swiftTypeFor(type, false, true).indexOf(Unavailable) != -1;
     }
 
+    static HashMap<String,Boolean> swiftKeywords = new HashMap<String,Boolean>() {
+        private static final long serialVersionUID = 1L;
+
+        {
+            put( "init", true );
+            put( "self", true );
+            put( "new", true );
+            put( "in", true );
+            put( "is", true );
+            put( "operator", true );
+            put( "subscript", true );
+            put( "where", true );
+            put( "as", true );
+        }
+    };
+
     static HashMap<String,Boolean> swiftReserved = new HashMap<String,Boolean>() {
-		private static final long serialVersionUID = 1L;
-
-		{
-    		put( Float.class.getName(), true );
-    		put( Double.class.getName(), true );
-    		put( Object.class.getName(), true );
-    		put( String.class.getName(), true );
-    		put( Comparable.class.getName(), true );
-    		put( Error.class.getName(), true );
-    		put( SecurityException.class.getName(), true );
-    		put( java.util.Set.class.getName(), true );
-    		put( java.util.Locale.class.getName(), true );
-    		put( java.util.Comparator.class.getName(), true );
-    		put( javax.swing.text.TabSet.class.getName(), true );
-    	}
+        private static final long serialVersionUID = 1L;
+
+        {
+            put( Float.class.getName(), true );
+            put( Double.class.getName(), true );
+            put( Class.class.getName(), true );
+            put( Object.class.getName(), true );
+            put( Enum.class.getName(), true );
+            put( Thread.class.getName(), true );
+            put( String.class.getName(), true );
+            put( Comparable.class.getName(), true );
+            put( Error.class.getName(), true );
+            put( SecurityException.class.getName(), true );
+            put( java.util.Map.class.getName(), true );
+            put( java.util.Set.class.getName(), true );
+            put( java.util.Locale.class.getName(), true );
+            put( java.util.Comparator.class.getName(), true );
+            put( javax.swing.text.TabSet.class.getName(), true );
+        }
+    };
+
+    static HashMap<String,Boolean> keyClasses = new HashMap<String,Boolean>() {
+        private static final long serialVersionUID = 1L;
+
+        {
+            put( Object.class.getName(), true );
+            put( Class.class.getName(), true );
+            put( Enum.class.getName(), true );
+            put( Thread.class.getName(), true );
+            put( Runnable.class.getName(), true );
+            put( Throwable.class.getName(), true );
+            put( Exception.class.getName(), true );
+            put( java.util.Set.class.getName(), true );
+            put( java.util.Map.class.getName(), true );
+            put( java.util.HashMap.class.getName(), true );
+        }
     };
 
     static HashMap<String,Boolean> subclassResponsibilities = new HashMap<String,Boolean>() {
-		private static final long serialVersionUID = 1L;
-
-		{
-    		put( "public void java.awt.Window.paint(java.awt.Graphics)", true );
-    		put( "public void java.awt.Canvas.paint(java.awt.Graphics)", true );
-    		put( "public void java.awt.Canvas.update(java.awt.Graphics)", true );
-    		put( "public java.awt.Component javax.swing.JTable.prepareRenderer(javax.swing.table.TableCellRenderer,int,int)", true );
-    		put( "public void javax.swing.text.PlainDocument.insertString(int,java.lang.String,javax.swing.text.AttributeSet) throws javax.swing.text.BadLocationException", true );
-    		put( "public java.awt.Component javax.swing.table.DefaultTableCellRenderer.getTableCellRendererComponent(javax.swing.JTable,java.lang.Object,boolean,boolean,int,int)", true );
-    		put( "public boolean javax.swing.table.DefaultTableModel.isCellEditable(int,int)", true );
-    		put( "public void javax.swing.JTable.changeSelection(int,int,boolean,boolean)", true );
-		}
+        private static final long serialVersionUID = 1L;
+
+        {
+            put( "public void java.awt.Window.paint(java.awt.Graphics)", true );
+            put( "public void java.awt.Canvas.paint(java.awt.Graphics)", true );
+            put( "public void java.awt.Canvas.update(java.awt.Graphics)", true );
+            put( "public java.awt.Component javax.swing.JTable.prepareRenderer(javax.swing.table.TableCellRenderer,int,int)", true );
+            put( "public void javax.swing.text.PlainDocument.insertString(int,java.lang.String,javax.swing.text.AttributeSet) throws javax.swing.text.BadLocationException", true );
+            put( "public java.awt.Component javax.swing.table.DefaultTableCellRenderer.getTableCellRendererComponent(javax.swing.JTable,java.lang.Object,boolean,boolean,int,int)", true );
+            put( "public boolean javax.swing.table.DefaultTableModel.isCellEditable(int,int)", true );
+            put( "public void javax.swing.JTable.changeSelection(int,int,boolean,boolean)", true );
+        }
     };
 
     static HashMap<String,String> swiftTypes = new HashMap<String,String>() {
-		private static final long serialVersionUID = 1L;
-
-		{
-    		put( "boolean", "Bool");
-    		put( "byte", "Int8");
-    		put( "char", "UInt16");
-    		put( "short", "Int16");
-    		put( "int", "Int");
-    		put( "long", "Int64");
-    		put( "float", "Float");
-    		put( "double", "Double");
-    		put( Float.class.getName(), "Float");
-    		put( String.class.getName(), "String");
-    	}
+        private static final long serialVersionUID = 1L;
+
+        {
+            put( "boolean", "Bool");
+            put( "byte", "Int8");
+            put( "char", "UInt16");
+            put( "short", "Int16");
+            put( "int", "Int");
+            put( "long", "Int64");
+            put( "float", "Float");
+            put( "double", "Double");
+            put( Float.class.getName(), "Float");
+            put( String.class.getName(), "String");
+        }
     };
 
     static HashMap<String,String> arrayTypes = new HashMap<String,String>() {
-		private static final long serialVersionUID = 1L;
-
-		{
-    		put( "boolean", "Bool");
-    		put( "byte", "Int8");
-    		put( "char", "UInt16");
-    		put( "short", "Int16");
-    		put( "int", "Int32");
-    		put( "long", "Int64");
-    		put( "float", "Float");
-    		put( "double", "Double");
-    		put( String.class.getName(), "String");
-    	}
+        private static final long serialVersionUID = 1L;
+
+        {
+            put( "boolean", "Bool");
+            put( "byte", "Int8");
+            put( "char", "UInt16");
+            put( "short", "Int16");
+            put( "int", "Int32");
+            put( "long", "Int64");
+            put( "float", "Float");
+            put( "double", "Double");
+            put( String.class.getName(), "String");
+        }
     };
 
     static HashMap<String,String> funcNames = new HashMap<String,String>() {
-		private static final long serialVersionUID = 1L;
-
-		{
-    		put( "boolean", "Boolean");
-    		put( "byte", "Byte");
-    		put( "char", "Char");
-    		put( "short", "Short");
-    		put( "int", "Int");
-    		put( "long", "Long");
-    		put( "float", "Float");
-    		put( "double", "Double");
-    		put( "void", "Void");
-    	}
+        private static final long serialVersionUID = 1L;
+
+        {
+            put( "boolean", "Boolean");
+            put( "byte", "Byte");
+            put( "char", "Char");
+            put( "short", "Short");
+            put( "int", "Int");
+            put( "long", "Long");
+            put( "float", "Float");
+            put( "double", "Double");
+            put( "void", "Void");
+        }
     };
 
     static HashMap<String,String> jvalueFields = new HashMap<String,String>() {
-		private static final long serialVersionUID = 1L;
-
-		{
-    		put( "boolean", "z");
-    		put( "byte", "b");
-    		put( "char", "c");
-    		put( "short", "s");
-    		put( "int", "i");
-    		put( "long", "j");
-    		put( "float", "f");
-    		put( "double", "d");
-    		put( "void", "v");
-    	}
+        private static final long serialVersionUID = 1L;
+
+        {
+            put( "boolean", "z");
+            put( "byte", "b");
+            put( "char", "c");
+            put( "short", "s");
+            put( "int", "i");
+            put( "long", "j");
+            put( "float", "f");
+            put( "double", "d");
+            put( "void", "v");
+        }
     };
 
-    static HashMap<String,Integer> frameworkLevels = new HashMap<String,Integer>();
+    boolean excludeFromCodeGeneration( Class<?> clazz ) {
+        String className = clazz.getName();
+        return !Modifier.isPublic(clazz.getModifiers())
+                || classPrefix(className).equals("java_util") && className.indexOf('$') != -1
+                || className.equals("java.util.concurrent.CompletableFuture");
+    }
 
-    static boolean forwardReference( String currentFramework, String framework ) {
-    	Integer level = frameworkLevels.get( framework );
-    	if ( level == null )
-    		return true;
-    	return level > frameworkLevels.get( currentFramework );
+    boolean supportsProxyCallback( Class<?> clazz ) {
+        if ( false )
+            return clazz.isInterface() && !dontEnforceProtocol( clazz ) && !clazz.getName().startsWith("java.util.") || isAdapter();
+        String clazzName = clazz.getName();
+        while ( clazzName.charAt(className.length()-1) == ']' )
+                clazzName = clazzName.substring(0, clazzName.length()-1 );
+        return clazz == java.lang.Runnable.class || isAdapter() || clazz.isInterface() &&
+                (clazzName.endsWith("Listener") || clazzName.endsWith("Handler")
+                || clazzName.endsWith("Manager"));// || clazzName.indexOf(".swiftbindings.") != -1);
     }
 
-    String frameworkImports = "\nimport java_swift\n";
+    boolean isAdapter() {
+        return classSuffix.endsWith("Adapter");
+    }
+
+    String frameworkImports;
 
     HashMap<String,Boolean> referencedFrameworks = new HashMap<String,Boolean>();
 
     static int filesWritten = 0;
     static int frameworkLevel = 0;
-    static int unclassedReferences = 0;
+    static int UnavailableReferences = 0;
+
+    static String invocation = "genswift.java", packageOrder, swiftSourceRoot, javaSourceRoot;
 
     public static void main( String args[] ) {
 
-    	String knownFrameworkOrder[] = args[0].split("\\|");
+        for ( int i=0 ; i<args.length ; i++ )
+            invocation += " '"+args[i]+"'";
+
+        switch ( args.length ) {
+        case 3:
+                javaSourceRoot = args[2];
+        case 2:
+                swiftSourceRoot = args[1];
+            default:
+                packageOrder = args[0];
+        }
+
+        String knownFrameworkOrder[] = ("java_swift|"+packageOrder).split("\\|");
 
         for ( frameworkLevel=0 ; frameworkLevel<knownFrameworkOrder.length ; frameworkLevel++ ) {
-    		String framework = classPrefix(knownFrameworkOrder[frameworkLevel].replace('/', '.')+".");
-    		frameworkLevels.put( framework, frameworkLevel );
-    		knownAdditionalFrameworks.put(framework, true);
-    	}
+            String framework = classPrefix(knownFrameworkOrder[frameworkLevel].replace('/', '.')+".");
+            frameworkLevels.put( framework, frameworkLevel );
+            knownAdditionalFrameworks.put(framework, true);
+        }
 
         try {
             BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
@@ -181,132 +295,287 @@ public static void main( String args[] ) {
 
             String pathToClass;
             while ((pathToClass = reader.readLine())!= null) {
-            	paths.add(pathToClass);
+                paths.add(pathToClass);
 
-            	try {
-                	genswift generator = new genswift( pathToClass );
-                	if ( generator.generate() )
-                		generator.save();
+                try {
+                    genswift generator = new genswift( pathToClass );
+                    if ( generator.generate() )
+                        generator.save();
                 }
                 catch ( Exception e ) {
                     e.printStackTrace();
+                    System.exit(1);
                 }
             }
 
             if ( additionalFrameworks.size() > 1 ) {
-            	HashMap<String,Integer> alreadyMoved = new HashMap<String, Integer>();
+                HashMap<String,Integer> alreadyMoved = new HashMap<String, Integer>();
 
                 for ( int i=0; i<additionalFrameworks.size(); i++ ) {
-        			String mightMove = additionalFrameworks.get(i);
-        			if ( alreadyMoved.containsKey(mightMove) && alreadyMoved.get(mightMove) > 10 )
-        				continue;
-            	
-        			int mustBeAfter = i;
-            		for ( int j=i+1; j<additionalFrameworks.size(); j++ )
-						if (references(mightMove, additionalFrameworks.get(j)) >
-							references(additionalFrameworks.get(j), mightMove) )
-							mustBeAfter = j;
-            		if ( mustBeAfter > i ) {
-            			print("Moving "+mightMove+"["+i+"] after "+additionalFrameworks.get(mustBeAfter)+"["+mustBeAfter+"]");
-            			additionalFrameworks.remove(i);
-            			additionalFrameworks.add(mustBeAfter, mightMove);
-            			if ( !alreadyMoved.containsKey(mightMove) )
-            				alreadyMoved.put(mightMove, 1);
-            			else
-            				alreadyMoved.put(mightMove, alreadyMoved.get(mightMove)+1);
-            			i--;
-            		}
-            	}
-
-            	frameworkLevel = knownFrameworkOrder.length;
-            	for ( int i=0; i<additionalFrameworks.size(); i++ )
-            		if ( frameworkLevels.containsKey(additionalFrameworks.get(i)) )
-            			frameworkLevels.put( additionalFrameworks.get(i), frameworkLevel++ );
-
-            	for ( String newFramework : additionalFrameworks ) {
-            	    StringBuilder pkg = new StringBuilder();
-            	    pkg.append( "\nimport PackageDescription\n\nlet package = Package(\n");
-            	    pkg.append("    name: \""+newFramework+"\",\n    dependencies: [\n");
-            	
-            	    if ( crossReferences.containsKey(newFramework) )
-            	    	for ( String depend : crossReferences.get(newFramework).keySet() )
-            	    		if ( !newFramework.equals(depend) ) {
-            	    			if ( forwardReference( newFramework, depend ) )
-            	    				pkg.append("//");
-            	    			pkg.append("        Package(url: \"" + repoBase + depend + 
-            	    					".git\", versions: Version(1,0,0)..<Version(2,0,0)),\n");
-            	    		}
-
-            		pkg.append("        ]\n)\n");
-
-            		try { 
-            			FileOutputStream out = new FileOutputStream( pathToWriteSource+newFramework+"/Package.swift" );
-            			out.write( pkg.toString().getBytes("UTF-8") );
-            			out.close();
-            		}
-            		catch ( IOException e ) {}
-            	}
+                    String mightMove = additionalFrameworks.get(i);
+                    if ( alreadyMoved.containsKey(mightMove) && alreadyMoved.get(mightMove) > 10 )
+                        continue;
+
+                    int mustBeAfter = i;
+                    for ( int j=i+1; j<additionalFrameworks.size(); j++ )
+                        if (references(mightMove, additionalFrameworks.get(j)) >
+                            references(additionalFrameworks.get(j), mightMove) )
+                            mustBeAfter = j;
+                    if ( mustBeAfter > i ) {
+                        print("Moving "+mightMove+"["+i+"] after "+additionalFrameworks.get(mustBeAfter)+"["+mustBeAfter+"]");
+                        additionalFrameworks.remove(i);
+                        additionalFrameworks.add(mustBeAfter, mightMove);
+                        if ( !alreadyMoved.containsKey(mightMove) )
+                            alreadyMoved.put(mightMove, 1);
+                        else
+                            alreadyMoved.put(mightMove, alreadyMoved.get(mightMove)+1);
+                        i--;
+                    }
+                }
+
+                frameworkLevel = knownFrameworkOrder.length;
+                for ( int i=0; i<additionalFrameworks.size(); i++ )
+                    if ( frameworkLevels.containsKey(additionalFrameworks.get(i)) )
+                        frameworkLevels.put( additionalFrameworks.get(i), frameworkLevel++ );
+
+                for ( String newFramework : additionalFrameworks ) {
+                    StringBuilder pkg = new StringBuilder();
+                    pkg.append( "\nimport PackageDescription\n\nlet package = Package(\n");
+                    pkg.append("    name: \""+newFramework+"\",\n    dependencies: [\n");
+
+                    if ( crossReferences.containsKey(newFramework) )
+                        for ( String depend : crossReferences.get(newFramework).keySet() )
+                            if ( !newFramework.equals(depend) ) {
+                                if ( forwardReference( newFramework, depend ) )
+                                    pkg.append("//");
+                                pkg.append("        .Package(url: \"" + repoBase + depend +
+                                        ".git\", versions: Version("+apiVersion+",0,0)..<Version("+(apiVersion+1)+",0,0)),\n");
+                            }
 
-            	int beforeReorder = unclassedReferences;
-            	unclassedReferences = 0;
+                    pkg.append("        ]\n)\n");
 
-            	for ( int i=0; i<paths.size(); i++ ) {
-                	pathToClass = paths.get(i);
                     try {
-                    	genswift generator = new genswift( pathToClass );
-                    	if ( generator.generate() )
-                    		generator.save();
+                        FileOutputStream out = new FileOutputStream( pathToWriteSource+newFramework+"/Package.swift" );
+                        out.write( pkg.toString().getBytes("UTF-8") );
+                        out.close();
+                    }
+                    catch ( IOException e ) {}
+                }
+
+                int beforeReorder = UnavailableReferences;
+                UnavailableReferences = 0;
+
+                for ( int i=0; i<paths.size(); i++ ) {
+                    pathToClass = paths.get(i);
+                    try {
+                        genswift generator = new genswift( pathToClass );
+                        if ( generator.generate() )
+                            generator.save();
                     }
                     catch ( Exception e ) {
                         e.printStackTrace();
                     }
                 }
 
-                print( "Reorder "+beforeReorder+" -> "+unclassedReferences );
+                print( "Reorder "+beforeReorder+" -> "+UnavailableReferences );
             }
         }
         catch ( IOException e ) {
             e.printStackTrace();
         }
- 
-        print("\n"+filesWritten+" files written.");
-    }
-
-    static HashMap<String,HashMap<String,Integer>> crossReferences = new HashMap<String,HashMap<String,Integer>>();
-    static HashMap<String,Boolean> knownAdditionalFrameworks = new HashMap<String,Boolean>();
-    static ArrayList<String> additionalFrameworks = new ArrayList<String>();
-
-    static void crossReference( String from, String to ) {
-    	if ( !crossReferences.containsKey( from ) )
-    		crossReferences.put( from, new HashMap<String,Integer>() );
-    	if ( !crossReferences.get( from ).containsKey( to ) )
-    		crossReferences.get( from ).put( to, 0 );
-    	crossReferences.get(from).put(to,crossReferences.get(from).get(to)+1);
-    }
 
-    static int references( String from, String to ) {
-    	if ( !crossReferences.containsKey(from) || !crossReferences.get(from).containsKey(to) )
-    		return 0;
-    	return crossReferences.get(from).get(to);
+        print("\n"+filesWritten+" files written.");
     }
 
     StringBuilder code = new StringBuilder();
     String pathToClass, className, classSuffix, currentFramework, visibility, classCacheVar;
-    boolean isInterface, isLost, isListener;
+    boolean isInterface, isEnum, isLost;
     Class<?> clazz, superclazz;
 
     genswift( String pathToClass ) {
-    	this.pathToClass = pathToClass;
+        this.pathToClass = pathToClass;
+    }
+
+    boolean generate() throws Exception {
+        className = pathToClass.replace('/', '.');
+        clazz = Class.forName( className );
+
+        print( "\n"+clazz );
+
+        if ( excludeFromCodeGeneration( clazz ) )
+            return false;
+
+        classSuffix = classSuffix( className );
+        currentFramework = classPrefix( className );
+
+        if ( !frameworkLevels.containsKey(currentFramework) )
+            frameworkLevels.put( currentFramework, frameworkLevel++ );
+        if ( !knownAdditionalFrameworks.containsKey(currentFramework) ) {
+            knownAdditionalFrameworks.put(currentFramework, true);
+            additionalFrameworks.add(currentFramework);
+        }
+
+        frameworkImports = keyClasses.containsKey(className) ? "" : "\nimport java_swift\n";
+
+        visibility = "open ";
+        superclazz = clazz.getSuperclass();
+        isInterface = clazz.isInterface();
+        isEnum = isEnum( clazz );
+
+        code.append("\n/// generated by: "+invocation+" ///\n");
+//        code.append("\n/// JAVA_HOME: "+System.getenv("JAVA_HOME")+" ///\n");
+//        code.append("/// "+new java.util.Date()+" ///\n");
+
+        code.append("\n/// "+clazz+" ///\n");
+        
+        isLost = false;
+        String derivedFrom = "";
+
+        if (superclazz != null) {
+            String sname = classTypeFor(superclazz, false, true);
+            isLost = sname.indexOf(Unavailable+"Object") != -1;
+            derivedFrom += ": " + sname;
+        } else if (!isInterface)
+            derivedFrom += ": JNIObject";
+
+        ArrayList<Class<?>> interfacesSoFar = new ArrayList<Class<?>>();
+        Class<?> supr = superclazz;
+        while( supr != null ) {
+            interfacesSoFar.add(supr);
+            supr = supr.getSuperclass();
+        }
+
+        boolean hasUnavailable = false;
+        for (Class<?> intrface : clazz.getInterfaces()) {
+            if ( interfacesChangingReturnTypeInSubclass( intrface ) )
+                continue;
+
+            if ( redundantConformance( intrface, interfacesSoFar.toArray( new Class<?>[ interfacesSoFar.size() ] ) )
+                    || excludeFromCodeGeneration(intrface) )
+                continue;
+            interfacesSoFar.add( intrface );
+
+            String name = classTypeFor(intrface, false, true);
+            boolean isUnavailable = name.indexOf(Unavailable+"Protocol") != -1;
+            if ( isUnavailable )
+                if ( hasUnavailable )
+                    continue;
+                else
+                    hasUnavailable = true;
+
+            if (derivedFrom == "")
+                derivedFrom += ": ";
+            else
+                derivedFrom += ", ";
+
+            derivedFrom += classTypeFor(intrface, false, true)+(isInterface?"":"");
+        }
+
+        if (isInterface && derivedFrom == "")
+            derivedFrom += ": JavaProtocol";
+
+        code.append("\n"+(isEnum ? "public enum" : isInterface ? "public protocol" : "open class") + " " +
+                classSuffix+(isInterface?"" : "") + (isEnum ? ": Int, JNIObjectProtocol, JNIObjectInit" : derivedFrom) + " {\n\n");
+
+        if ( isEnum ) {
+    			String cases = "";
+    			for ( Object constant : clazz.getEnumConstants() )
+    				cases += (cases == "" ? "" : ", ") + ((Enum<?>)constant).name();
+    			code.append("    case "+cases+"\n\n");
+    			
+                code.append("    static let enumConstants = JavaClass(loading: \""+clazz.getName()+"\")\n" +
+    	    			"        .getEnumConstants()!.map { "+classSuffix+"Forward( javaObject: $0.javaObject ) }\n\n");
+    			
+    			code.append("    public func underlier() -> "+classSuffix+"Forward"+" {\n");
+    			code.append("        return "+classSuffix+".enumConstants[self.rawValue]\n    }\n\n");
+    			
+    			code.append("    public func localJavaObject(_ locals: UnsafeMutablePointer<[jobject]>) -> jobject? {\n");
+    			code.append("        return underlier().localJavaObject( locals )\n    }\n\n");
+
+    			code.append("    public init( javaObject: jobject? ) {\n");
+    			code.append("        self = "+classSuffix+"( rawValue: JavaEnum( javaObject: javaObject ).ordinal() )!\n    }\n\n");
+        }
+        else if ( !isInterface ) {
+            code.append("    public convenience init?( casting object: "+swiftTypeFor( java.lang.Object.class, false, true )+", _ file: StaticString = #file, _ line: Int = #line ) {\n");
+            code.append("        self.init( javaObject: nil )\n" );
+            if ( frameworkImports.indexOf("import java_lang") != -1 ) {
+                    code.append("        if !object.validDownCast( toJavaClass: \""+className+"\", file, line ) {\n" );
+                    code.append("            return nil\n");
+                    code.append("        }\n");
+            }
+            code.append("        object.withJavaObject {\n");
+            code.append("            self.javaObject = $0\n");
+            code.append("        }\n");
+            code.append("    }\n\n" );
+        }
+
+        classCacheVar = classSuffix+"JNIClass";
+        if ( !isInterface && !isEnum )
+            code.append( "    private static var "+classCacheVar+": jclass?\n\n" );
+
+        HashMap<String,Boolean> fieldsSeen = new HashMap<String,Boolean>();
+        findInterfaceMethods( clazz );
+
+        if ( !isEnum ) {
+        		generateFields( fieldsSeen, isInterface, clazz );
+
+        		if ( !isInterface )
+        			for ( Class<?> intrface : interfacesSoFar.toArray( new Class<?>[ interfacesSoFar.size() ] ) )
+        				generateInterfaceFields( fieldsSeen, intrface );
+
+        		generateConstructors( pathToClass, classSuffix, false );
+        }
+
+        generateMethods( clazz.getDeclaredMethods(), isInterface, fieldsSeen, classSuffix, false );
+
+        ArrayList<java.lang.reflect.Method> responsibles = new ArrayList<java.lang.reflect.Method>();
+        for ( java.lang.reflect.Method method : clazz.getMethods() ) {
+            if ( subclassResponsibilities.containsKey(method.toString()) )
+                responsibles.add( method );
+        }
+
+        if ( !isInterface && !isEnum )
+            addAnyMethodsDeclaredInProtocolsButNotDefined( isInterface, fieldsSeen, classSuffix );
+
+        code.append("}\n\n");
+
+        if ( isInterface || isEnum ) {
+            String superProtocol = "JNIObjectForward";
+            if ( clazz.getInterfaces().length != 0 )
+                superProtocol = classTypeFor( clazz.getInterfaces()[0], false, true )+"Forward";
+            code.append( "\nopen class "+classSuffix+"Forward: "+superProtocol+(isEnum ? "" : ", "+classSuffix)+" {\n\n" );
+            code.append( "    private static var "+classCacheVar+": jclass?\n\n" );
+
+            	findInterfaceMethods( clazz );
+
+            	fieldsSeen = new HashMap<String,Boolean>();
+            	generateFields( fieldsSeen, false, clazz );
+
+            boolean subinterface = clazz.getInterfaces().length == 1 && clazz.getDeclaredMethods().length == 0;
+            if ( !subinterface || isEnum ) {
+            		isEnum = false;
+                generateMethods( clazz.getMethods(), false, fieldsSeen, classSuffix+"Forward", false );
+                addAnyMethodsDeclaredInProtocolsButNotDefined( false, fieldsSeen, classSuffix+"Forward" );
+            }
+
+            code.append( "}\n\n" );
+        }
+
+        if ( isInterface && supportsProxyCallback( clazz ) || isAdapter() || !responsibles.isEmpty() )
+            generateCallbackBase( fieldsSeen, responsibles.toArray( new java.lang.reflect.Method[ responsibles.size() ] ) );
+
+        return true;
     }
 
-    void save( ) throws IOException {
-    	String Sources = pathToWriteSource + currentFramework + "/Sources/";
-    	new File( Sources ).mkdirs();
+    void save() throws IOException {
+        String Sources = swiftSourceRoot != null ? swiftSourceRoot+"/" :
+                pathToWriteSource + currentFramework + "/Sources/";
+        new File( Sources ).mkdirs();
 
-    	String source = Sources + classSuffix + ".swift";
+        String source = Sources + classSuffix + ".swift";
         byte bytes[] = (frameworkImports+code.toString()).getBytes("UTF-8");
         if ( bytes.length == new File( source ).length() && java.util.Arrays.equals( bytes, existing( source )) )
-        	return;
+            return;
 
         print( "Saving: "+source);
         FileOutputStream out = new FileOutputStream( source );
@@ -316,1098 +585,1006 @@ void save( ) throws IOException {
     }
 
     byte [] existing( String source ) throws IOException {
-    	File file = new File( source );
-    	if ( !file.exists() )
-    		return null;
-    	byte bytes[] = new byte[ (int) file.length() ];
-    	FileInputStream in = new FileInputStream( source );
-    	in.read( bytes );
-    	in.close();
-    	return bytes;
+        File file = new File( source );
+        if ( !file.exists() )
+            return null;
+        byte bytes[] = new byte[ (int) file.length() ];
+        FileInputStream in = new FileInputStream( source );
+        in.read( bytes );
+        in.close();
+        return bytes;
     }
 
-    boolean generate() throws Exception {
-    	className = pathToClass.replace('/', '.');
-		clazz = Class.forName( className );
-
-        print( "\n"+clazz );
-
-		if ( excludeFromCodeGeneration( clazz ) )
-			return false;
-
-        classSuffix = classSuffix( className );
-        currentFramework = classPrefix( className );
-
-		if ( !frameworkLevels.containsKey(currentFramework) )
-        	frameworkLevels.put( currentFramework, frameworkLevel++ );
-		if ( !knownAdditionalFrameworks.containsKey(currentFramework) ) {
-			knownAdditionalFrameworks.put(currentFramework, true);
-			additionalFrameworks.add(currentFramework);
-		}
-//		if ( !currentFramework.equals("java_lang") )
-//			classTypeFor( java.lang.Object.class, false, false );
-		
-        visibility = "open ";
-		superclazz = clazz.getSuperclass();
-		isInterface = clazz.isInterface();
-		isListener = isInterface && supportsProxyCallback( clazz );
-
-		code.append( "\n/// "+clazz+" ///\n" );
-
-		isLost = false;
-		String derivedFrom = "";
-
-		if (superclazz != null) {
-			String sname = classTypeFor(superclazz, false, true);
-			isLost = sname.indexOf(Unclassed+"Object") != -1;
-			derivedFrom += ": " + sname;
-		} else if (!isInterface)
-			derivedFrom += ": JNIObject";
+    int idcount = 0;
+
+    void generateFields( HashMap<String,Boolean> fieldsSeen, boolean isInterface, Class<?> clazz ) {
+    		Field fields[] = clazz.getDeclaredFields();
+    		
+    		if ( sortMembers )
+    	        java.util.Arrays.sort( fields, new Comparator<Field>() {
+    				@Override
+    				public int compare(Field o1, Field o2) {
+    					int statics = compareStatic( o1.getModifiers(), o2.getModifiers() );
+    					return statics != 0 ? statics : o1.getName().compareTo(o2.getName());
+    				}
+    			} );
+
+        for (Field field : fields) {
+
+            progress(field);
+            code.append( "    /// "+field+"\n\n" );
+
+            int mods = field.getModifiers();
+            String fieldName = safe(field.getName());
+            boolean isFinal = Modifier.isFinal(mods);
+            boolean isStatic = Modifier.isStatic(mods);
+            
+            if ( skipBecause( "field", field, new boolean [] {
+            		!Modifier.isPublic(mods) && !Modifier.isProtected(mods),
+            		fieldOverride( field, superclazz) && isStatic,
+            		fieldsSeen.containsKey(fieldName),
+            		fieldName.equals(classSuffix),
+            		interfaceMethods.containsKey(fieldName+"()"),
+            		isStatic && (Modifier.isProtected(mods) || isInterface /*|| ////
+                            superclazz == javax.swing.undo.AbstractUndoableEdit.class ||
+                             superclazz != null && superclazz.getSuperclass() == javax.swing.undo.AbstractUndoableEdit.class ||
+                             superclazz == javax.swing.plaf.basic.BasicComboBoxRenderer.class ||
+                             superclazz == javax.swing.border.TitledBorder.class*/)
+            } ) )
+            		continue;
+
+            fieldsSeen.put(fieldName, true);
+            Class<?> fieldType = field.getType();
+            try {
+                if ( superclazz != null )
+                    fieldType = superclazz.getField(field.getName()).getType();
+            }
+            catch ( NoSuchFieldException e ) {
+            }
 
-		ArrayList<Class<?>> interfacesSoFar = new ArrayList<Class<?>>();
-		Class<?> supr = superclazz;
-		while( supr != null ) {
-			interfacesSoFar.add(supr);
-			supr = supr.getSuperclass();
-		}
+            boolean arrayType = crashesCompilerOnLinx(fieldType);
+            if ( arrayType )
+                code.append( "    #if !os(Linux)\n");
 
-		boolean hasUnclassed = false;
-		for (Class<?> intrface : clazz.getInterfaces()) {
-			if ( interfacesChangingReturnTypeInSubclass( intrface ) )
-				continue;
+            String fieldIDVar = safe(field.getName())+"_FieldID";
+            if ( ! isInterface )
+                code.append( "    private static var "+fieldIDVar+": jfieldID?\n\n" );
 
-			if ( redundantConformance( intrface, interfacesSoFar.toArray( new Class<?>[ interfacesSoFar.size() ] ) )
-					|| excludeFromCodeGeneration(intrface) )
-				continue;
-			interfacesSoFar.add( intrface );
+            if ( !isStatic )
+                fieldIDVar = classSuffix+"."+fieldIDVar;
 
-			String name = classTypeFor(intrface, false, true);
-			boolean isUnclassed = name.indexOf(Unclassed+"Protocol") != -1;
-			if ( isUnclassed )
-				if ( hasUnclassed )
-					continue;
-				else
-					hasUnclassed = true;
+            code.append( "    "+(fieldOverride(field,superclazz)&&!isLost?"override ":"")+(isInterface?"":visibility)+
+                    (Modifier.isStatic(mods) ? "static " : "")+"var "+fieldName+": "+
+                    swiftTypeFor(fieldType, true, false) );
 
-			if (derivedFrom == "")
-				derivedFrom += ": ";
-			else
-				derivedFrom += ", ";
-
-			derivedFrom += classTypeFor(intrface, false, true);
-		}
-
-		if (isInterface && derivedFrom == "")
-			derivedFrom += ": JavaProtocol";
-
-		code.append("\n"+(isInterface ? "public protocol" : "open class") + " " + classSuffix + derivedFrom + " {\n\n");
-
-		if ( !isInterface ) {
-			code.append("    public convenience init?( casting object: "+swiftTypeFor( java.lang.Object.class, false, true )+", _ file: StaticString = #file, _ line: Int = #line ) {\n");
-			code.append("        self.init( javaObject: object.javaObject )\n" );
-			code.append("        if !object.validDownCast( toJavaClass: \""+className+"\", file, line ) {\n" );
-			code.append("            return nil\n        }\n    }\n\n" );
-		}
-
-		classCacheVar = classSuffix+"JNIClass";
-		if ( !isInterface )
-			code.append( "    private static var "+classCacheVar+": jclass?\n\n" );
-
-		HashMap<String,Boolean> fieldsSeen = new HashMap<String,Boolean>();
-		findInterfaceMethods( clazz );
-
-		generateFields( fieldsSeen, isInterface, clazz );
-
-		if ( !isInterface )
-			for ( Class<?> intrface : interfacesSoFar.toArray( new Class<?>[ interfacesSoFar.size() ] ) )
-				generateInterfaceFields( fieldsSeen, intrface );
-
-
-		generateConstructors( pathToClass, classSuffix, false );
-
-		boolean hasSubclassResponsibility = generateMethods( clazz.getDeclaredMethods(), isInterface, fieldsSeen, classSuffix, false );
-
-		ArrayList<Method> responsibles = new ArrayList<Method>();
-		for ( Method method : clazz.getMethods() ) {
-			//print( "!!"+method.toString() );
-			if ( subclassResponsibilities.containsKey(method.toString()) )
-				responsibles.add( method );
-		}
-
-		if ( !isInterface )
-			addAnyMethodsDeclaredInProtocolsButNotDefined( isInterface, fieldsSeen, classSuffix );
-
-		code.append("}\n");
-
-		if ( isInterface ) {
-			String superProtocol = "JNIObjectForward";
-			if ( clazz.getInterfaces().length != 0 )
-				superProtocol = classTypeFor( clazz.getInterfaces()[0], false, true )+"Forward";
-			code.append( "\nopen class "+classSuffix+"Forward: "+superProtocol+", "+classSuffix+" {\n\n" );
-			code.append( "    private static var "+classCacheVar+": jclass?\n\n" );
-
-			findInterfaceMethods( clazz );
-
-			fieldsSeen = new HashMap<String,Boolean>();
-			generateFields( fieldsSeen, false, clazz );
-
-			generateMethods( clazz.getMethods(), false, fieldsSeen, classSuffix+"Forward", false );
-
-			addAnyMethodsDeclaredInProtocolsButNotDefined( false, fieldsSeen, classSuffix+"Forward" );
-
-			code.append( "}\n\n\n" );
-		}
-
-		if ( isInterface && supportsProxyCallback( clazz ) || isAdapter() || !responsibles.isEmpty() )
-			generateCallbackBase( fieldsSeen, responsibles.toArray( new Method[ responsibles.size() ] ) );
-
-		return true;
-	}
-
-	int idcount = 0;
-
-	void generateFields( HashMap<String,Boolean> fieldsSeen, boolean isInterface, Class<?> clazz ) {
-		for (Field field : clazz.getDeclaredFields()) {
-			int mods = field.getModifiers();
-
-			print(field.toString());
-			code.append( "    /// "+field+"\n\n" );
-
-			String fieldName = safe(field.getName());
-			boolean isFinal = Modifier.isFinal(mods);
-			boolean isStatic = Modifier.isStatic(mods);
-			
-			boolean skipField = (fieldOverride( field, superclazz)) && isStatic ||
-					 !Modifier.isPublic(mods) && !Modifier.isProtected(mods) || fieldsSeen.containsKey(fieldName) ||
-					 fieldName.equals(classSuffix) || interfaceMethods.containsKey(fieldName+"()") ||
-					 isStatic && (Modifier.isProtected(mods) ||
-						superclazz == javax.swing.undo.AbstractUndoableEdit.class ||
-					 	superclazz != null && superclazz.getSuperclass() == javax.swing.undo.AbstractUndoableEdit.class ||
-					 	superclazz == javax.swing.plaf.basic.BasicComboBoxRenderer.class ||
-					 	superclazz == javax.swing.border.TitledBorder.class);
-			if ( skipField )
-				continue;
-
-			fieldsSeen.put(fieldName, true);
-			Class<?> fieldType = field.getType();
-	    	try {
-	    		if ( superclazz != null )
-	    			fieldType = superclazz.getField(field.getName()).getType();
-	    	}
-	    	catch ( NoSuchFieldException e ) {
-	    	}
-	
-//	    	if ( fieldType.isInterface() && fieldType.isArray() )
-//	    		continue; ////
-	
-	    	boolean arrayType = crashesCompilerOnLinx(fieldType);
-	    	if ( arrayType )
-	    		code.append( "    #if !os(Linux)\n");
-	
-	    	String fieldIDVar = safe(field.getName())+"_FieldID";
-	    	if ( ! isInterface )
-	    		code.append( "    private static var "+fieldIDVar+": jfieldID?\n\n" );
-	
-	    	if ( !Modifier.isStatic(mods) )
-	    		fieldIDVar = classSuffix+"."+fieldIDVar;
-	
-			code.append( "    "+(fieldOverride(field,superclazz)&&!isLost?"override ":"")+(isInterface?"":visibility)+
-					(Modifier.isStatic(mods) ? "static " : "")+"var "+fieldName+": "+
-					swiftTypeFor(fieldType, true, false) );
-
-			if ( isInterface )
-				code.append((isStatic ? isFinal ?" { get }" : " { get set }" : "")+"\n");
+            if ( isInterface )
+                code.append((isStatic ? isFinal ?" { get }" : " { get set }" : "")+"\n");
             else {
-		    	String fieldArgs = "fieldName: \""+field.getName()+"\", fieldType: \""+jniEncoding(field.getType())+"\", fieldCache: &"+fieldIDVar+
-		    			(Modifier.isStatic(mods)?
-		    					", className: \""+pathToClass+"\", classCache: &"+classCacheVar :
-		    					", object: javaObject");
-		
+                String fieldArgs = "fieldName: \""+field.getName()+"\", fieldType: \""+jniEncoding(field.getType())+"\", fieldCache: &"+fieldIDVar+
+                        (isStatic?
+                                ", className: \""+pathToClass+"\", classCache: &"+classCacheVar :
+                                ", object: javaObject");
+
                 code.append( " {\n" );
                 code.append( "        get {\n" );
-                code.append( "            let value = JNIField.Get"+funcType( fieldType, mods )+"Field( "+fieldArgs+" )\n" );
-                code.append( "            return "+decoder( "value", fieldType )+"\n" );
+                code.append( "            let __value = JNIField.Get"+funcType( fieldType, mods )+"Field( "+fieldArgs+" )\n" );
+                if ( isObjectType( fieldType ) )
+                    code.append( "            defer { JNI.DeleteLocalRef( __value ) }\n" );
+                code.append( "            return "+decoder( "__value", fieldType, "" )+"\n" );
                 code.append( "        }\n" );
                 if (!isFinal) {
                     code.append("        set(newValue) {\n");
-                    code.append("            let value = " + encoder("newValue", fieldType, "nil") + "\n");
+                    code.append("            var __locals = [jobject]()\n");
+                    code.append("            let __value = " + encoder("newValue", fieldType) + "\n");
                     code.append("            JNIField.Set" + funcType(fieldType, mods) + "Field( " + fieldArgs
-                            + ", value: value" + encodeSuffix(fieldType) + " )\n");
+                            + ", value: __value" + encodeSuffix(fieldType) + ", locals: &__locals )\n");
                     code.append("        }\n");
                 }
                 code.append( "    }\n" );
             }
 
-			if ( arrayType )
-	    		code.append( "    #endif\n");
-			code.append( "\n" );
-		}
-	}
-
-	void generateConstructors( String pathToClass, String classSuffix, boolean isListenerBase ) {
-		HashMap<String,Boolean> constructorSeen = new HashMap<String,Boolean>();
-
-		for (Constructor<?> constructor : clazz.getDeclaredConstructors()) {
-			int mods = constructor.getModifiers();
-
-			print(constructor.toString());
-			code.append( "    /// "+constructor.toString()+"\n\n" );
-
-	    	String namedSignature = argsFor( constructor, true, true );
-			if (  !Modifier.isPublic(mods) && !Modifier.isProtected(mods) || constructorSeen.containsKey(namedSignature) ||  ambiguousInitialiser( constructor.toString() ) )
-				continue;
-			constructorSeen.put( namedSignature, true );
-
-			String methodIDVar = "new_MethodID_"+(++idcount);
-			Constructor<?> overridden = constructorOverride(constructor, superclazz);
-			boolean canThrow = constructor.getExceptionTypes().length != 0 && constructor.getParameterCount() != 0 &&
-					(overridden == null || overridden.getExceptionTypes().length != 0);
-
-			boolean unnamedOverride = overridden != null;
-			if (overridden != null)
-				if ( argumentNamesDiffer( constructor, overridden ) )
-					overridden = null;
-
-	    	boolean arrayType = false;
-	    	for ( Parameter param : constructor.getParameters() )
-	    		if ( crashesCompilerOnLinx( param.getType() ) )
-	    			arrayType = true;
-	
-	    	if ( arrayType )
-	    		code.append( "    #if !os(Linux)\n");
-
-			code.append("    private static var "+methodIDVar+": jmethodID?\n\n" );
-
-			code.append( "    public "+/*(overridden != null && !isLost && clazz != String.class || isListenerBase ? "override " : "")+*/
-					"convenience init("+argsFor( constructor, false, true )+")"+(canThrow?" throws":"")+" {\n" );
-			code.append( functionHeader( constructor.getParameters(), null, isListenerBase ? 1 : 0 ) );
-			
-			String signature = jniArgs(constructor, "");
-			if ( isListenerBase ) {
-				signature = jniArgs(constructor, "J");
-				code.append("\n        self.init( javaObject: nil )\n");
-				code.append("        __args["+constructor.getParameterCount()+"] = swiftValue()\n\n");
-			}
-
-			code.append( "        let __object = JNIMethod.NewObject( className: \""+pathToClass+"\", classCache: &"+
-					classSuffix+"."+classSuffix+"JNIClass, methodSig: \""+signature+"V\", methodCache: &"+classSuffix+"."+methodIDVar+
-					", args: &__args, locals: "+(constructor.getParameters().length != 0?"&__locals":"nil")+" )\n" );
-
-			if ( canThrow )
-				addThrowCode( constructor );
-
-			if ( isListenerBase )
-				code.append( "        self.javaObject = __object\n" );
-			else
-				code.append( "        self.init( javaObject: __object )\n" );
-			code.append( "    }\n" );
+            if ( arrayType )
+                code.append( "    #endif\n");
+            code.append( "\n" );
+        }
+    }
 
-	    	String unnamedSigature = argsFor( constructor, true, false );
-			if ( !constructorSeen.containsKey(unnamedSigature) && constructor.getParameters().length != 0 ) {
+    void generateConstructors( String pathToClass, String classSuffix, boolean isListenerBase ) {
+        HashMap<String,Boolean> constructorSeen = new HashMap<String,Boolean>();
+      
+        java.lang.reflect.Constructor<?> constructors[] = clazz.getDeclaredConstructors();
+
+		if ( sortMembers )
+			java.util.Arrays.sort( constructors, new Comparator<java.lang.reflect.Constructor<?>>() {
+				@Override
+				public int compare(java.lang.reflect.Constructor<?> o1, java.lang.reflect.Constructor<?> o2) {
+					return argsFor( newConstructor(o1), true, true, null )
+							.compareTo(argsFor( newConstructor(o2), true, true, null ));
+				}
+			} );
+
+        for (java.lang.reflect.Constructor<?> _constructor : constructors) {
+            Constructor<?> constructor = newConstructor( _constructor );
+            int mods = constructor.getModifiers();
+
+            progress(constructor);
+            code.append( "    /// "+constructor+"\n\n" );
+
+            String namedSignature = argsFor( constructor, true, true, null );
+            if ( skipBecause( "init", constructor.constructor, new boolean [] {
+            		!Modifier.isPublic(mods) && !Modifier.isProtected(mods),
+            		constructorSeen.containsKey(namedSignature),
+            		ambiguousInitialiser( constructor.toString() )
+            } ) )
+                continue;
+            
+            constructorSeen.put( namedSignature, true );
+
+            String methodIDVar = "new_MethodID_"+(++idcount);
+            java.lang.reflect.Constructor<?> overridden = constructorOverride(_constructor, superclazz);
+            boolean canThrow = constructor.getExceptionTypes().length != 0 && constructor.getParameterCount() != 0 &&
+                    (overridden == null || overridden.getExceptionTypes().length != 0);
+
+            if (overridden != null)
+                if ( argumentNamesDiffer( constructor, newConstructor( overridden ) ) )
+                    overridden = null;
+
+            boolean arrayType = false;
+            for ( Parameter param : constructor.getParameters() )
+                if ( crashesCompilerOnLinx( param.getType() ) )
+                    arrayType = true;
+
+            if ( arrayType )
+                code.append( "    #if !os(Linux)\n");
+
+            code.append("    private static var "+methodIDVar+": jmethodID?\n\n" );
+
+            code.append( "    public "+/*(overridden != null && !isLost && clazz != String.class || isListenerBase ? "override " : "")+*/
+                    "convenience init("+argsFor( constructor, false, true, null )+")"+(canThrow?" throws":"")+" {\n" );
+            code.append( functionHeader( constructor.getParameters(), null, isListenerBase ? 1 : 0 ) );
+
+            String signature = jniArgs(constructor, "", "");
+            if ( isListenerBase ) {
+                signature = jniArgs(constructor, "", "J");
+                code.append("\n        self.init( javaObject: nil )\n");
+                code.append("        __args["+constructor.getParameterCount()+"] = __local!.swiftValue()\n\n");
+            }
 
-				code.append( "\n    public "+/*(unnamedOverride && !isLost && clazz != String.class || isListenerBase ? "override " : "")+*/
-						"convenience init("+argsFor( constructor, false, false )+")"+(canThrow?" throws":"")+" {\n" );
+            code.append( "        let __object = JNIMethod.NewObject( className: \""+pathToClass+"\", classCache: &"+
+                    classSuffix+"."+classSuffix+"JNIClass, methodSig: \""+signature+"V\", methodCache: &"+classSuffix+"."+methodIDVar+
+                    ", args: &__args, locals: &__locals )\n" );
 
-				code.append( "        "+(canThrow?"try ":"")+"self.init("+passthroughArguments(constructor,null)+" )\n    }\n" );
+            if ( canThrow )
+                addThrowCode( constructor );
 
-				constructorSeen.put( unnamedSigature, true );
-			}
+            if ( isListenerBase )
+                code.append( "        self.javaObject = __object\n" );
+            else
+                code.append( "        self.init( javaObject: __object )\n" );
+            code.append( "        JNI.DeleteLocalRef( __object )\n" );
+            code.append( "    }\n" );
 
-			if ( arrayType )
-	    		code.append( "    #endif\n");
-	    	code.append( "\n" );
-		}
-	}
+            String unnamedSigature = argsFor( constructor, true, false, null );
+            if ( !constructorSeen.containsKey(unnamedSigature) && constructor.getParameters().length != 0 ) {
 
-	boolean generateMethods( Method methods[], boolean isProtocol, HashMap<String,Boolean> fieldsSeen, String outputClassName, boolean isListenerBase ) {
+                code.append( "\n    public "+/*(unnamedOverride && !isLost && clazz != String.class || isListenerBase ? "override " : "")+*/
+                        "convenience init("+argsFor( constructor, false, false, null )+")"+(canThrow?" throws":"")+" {\n" );
 
-		HashMap<String,Boolean> methodsSeen = new HashMap<String,Boolean>();
-		boolean hasSubclassResponsibility = false;
+                code.append( "        "+(canThrow?"try ":"")+"self.init("+passthroughArguments(constructor,null, "_")+" )\n    }\n" );
 
-		for (Method method : methods ) {
-			int mods = method.getModifiers();
-			boolean isStatic = Modifier.isStatic(mods);
-			String methodIdent = method.toString();
+                constructorSeen.put( unnamedSigature, true );
+            }
 
-			print(method.toString());
-			code.append( "    /// "+method+"\n\n" );
+            if ( arrayType )
+                code.append( "    #endif\n");
+            code.append( "\n" );
+        }
+    }
 
-			if ( subclassResponsibilities.containsKey(methodIdent) )
-				hasSubclassResponsibility = true;
+    boolean generateMethods( java.lang.reflect.Method methods[], boolean isProtocol, HashMap<String,Boolean> fieldsSeen, String outputClassName, boolean isListenerBase ) {
+
+        HashMap<String,Boolean> methodsSeen = new HashMap<String,Boolean>();
+        boolean hasSubclassResponsibility = false;
+        
+        if ( sortMembers )
+            java.util.Arrays.sort( methods, new Comparator<java.lang.reflect.Method>() {
+            		@Override
+            		public int compare(java.lang.reflect.Method o1, java.lang.reflect.Method o2) {
+    					int statics = compareStatic( o1.getModifiers(), o2.getModifiers() );
+    					return statics != 0 ? statics : swiftSignatureFor( newMethod(o1), isProtocol, true, true, null)
+    							.compareTo(swiftSignatureFor( newMethod(o2), isProtocol, true, true, null));
+            		}
+            } );
+
+        for (java.lang.reflect.Method _method : methods ) {
+            Method method = newMethod( _method );
+            int mods = method.getModifiers();
+            boolean isStatic = Modifier.isStatic(mods);
+
+            progress(method);
+            code.append( "    /// "+method+"\n\n" );
+
+            if ( subclassResponsibilities.containsKey(method.toString()) )
+                hasSubclassResponsibility = true;
+
+            java.lang.reflect.Method overridden = funcOverride(method.method, superclazz);
+            if ( overridden != null && Modifier.isPrivate(overridden.getModifiers()) )
+                overridden = null;
+
+            boolean unnamedOverride = overridden != null;
+            if ( argumentNamesDiffer(method, newMethod(overridden)) )
+                overridden = null;
+
+            unnamedOverride = overridden != null;
+
+            String methodName = method.getName();
+            String methodString = method.toString();
+            boolean fieldExists = fieldsSeen.containsKey(safe(methodName)) && method.getParameterCount() == 0;
+
+            if ( skipBecause( "method", method.method, new boolean [] {
+                    !Modifier.isPublic(mods) && !Modifier.isProtected(mods),
+                    overridden != null && !isStatic && !isListenerBase && !isUnavailable(superclazz)
+                        && !(isInterface && clazz.getInterfaces().length != 0
+                        					&& isUnavailable(clazz.getInterfaces()[0])),
+                    isInterface && (dontEnforceProtocol(clazz)
+                    		|| awkwardMethodInProtocol(method) 
+                    		|| isUnavailable(method.getReturnType())),
+                    methodName.startsWith("lambda$"),
+                    fieldExists
+            } ) && !methodString.equals("public void javax.swing.text.PlainDocument.insertString(int,java.lang.String,javax.swing.text.AttributeSet) throws javax.swing.text.BadLocationException")
+                && !methodString.equals("public java.util.Set java.util.HashMap.keySet()") )
+            		continue;
+            
+            String namedSignature = swiftSignatureFor( method, isProtocol, true, true, null);
+            if ( methodsSeen.containsKey(namedSignature) )
+                continue;
+            methodsSeen.put(namedSignature, true );
+
+            Class <?> returnType = method.getReturnType();
+            boolean arrayType = crashesCompilerOnLinx( method );
+            boolean canThrow = method.getExceptionTypes().length != 0;
+            String unnamedSignature = swiftSignatureFor( method, isProtocol, true, false, null);
+            boolean createsNameless = !methodsSeen.containsKey(unnamedSignature) && !fieldExists &&
+                    !(isInterface && lostType(returnType)) && method.getParameterCount() != 0 && !isListenerBase;
+
+            if ( arrayType )
+                code.append( "    #if !os(Linux)\n");
+
+            if ( isProtocol && isStatic )
+                code.append("    //");
+
+            String methodKey = methodKey(method);
+            Method interfaceMethod = interfaceMethods.get(methodKey);
+            interfaceMethods.remove(methodKey);
+
+            boolean createBody = !isListenerBase || !isInterface;
+            boolean notVoid = notVoid(returnType);
+
+            if ( !(isProtocol && argumentsOfProtocolRenamed( clazz )) ) {
+                String methodIDVar = methodName+"_MethodID_"+(++idcount), methodIDVarRef = methodIDVar;
+                if ( !isStatic )
+                    methodIDVarRef = outputClassName+"."+methodIDVarRef;
+
+                if ( !isProtocol && (!isListenerBase || !isInterface) )
+                    code.append("    private static var "+methodIDVar+": jmethodID?\n\n" );
+
+                code.append("    " + (overridden != null && !isLost && !createBody && !(isListenerBase && isProtocol)
+                        || isAdapter() && isListenerBase ? "override " : "")
+                        + swiftSignatureFor(method, isProtocol, false, true, interfaceMethod));
+
+                if ( isListenerBase )
+                    code.append( " /**/" );
 
-			Method overridden = funcOverride(method, superclazz);
-			if ( overridden != null && Modifier.isPrivate(overridden.getModifiers()) )
-				overridden = null;
-
-			boolean unnamedOverride = overridden != null;
-			if ( argumentNamesDiffer(method, overridden) )
-				overridden = null;
+                if (isProtocol)
+                    code.append("\n");
+                else if (isEnum) {
+                    code.append(" {\n        return "+(canThrow?"try ":"")+(isStatic ? classSuffix+"Forward." : "underlier()."));
+                    code.append(safe(method.getName()) + "("+passthroughArguments(method, interfaceMethod, "")+" )\n    }\n");
+                }
+                else {
+                    code.append(" {\n");
 
-			unnamedOverride = overridden != null;
+                    if ( createBody ) {
+                        code.append( functionHeader( method.getParameters(), interfaceMethod, 0 ) );
 
-			String methodName = method.getName();
-			boolean fieldExists = fieldsSeen.containsKey(safe(methodName)) && method.getParameterCount() == 0;
-			boolean skipMethod = overridden != null && !isStatic && !isListenerBase || !Modifier.isPublic(mods) && !Modifier.isProtected(mods)
-					|| isInterface && (dontEnforceProtocol(clazz)
-							|| awkwardMethodInProtocol(method) || isUnclassed(method.getReturnType()))
-					|| methodName.startsWith("lambda$") || fieldExists;
+                        code.append( "        " );
+                        if ( notVoid )
+                            code.append( "let __return = " );
 
-			if ( skipMethod )
-				continue;
-
-			String namedSignature = swiftSignatureFor( method, isProtocol, true, true);
-			if ( methodsSeen.containsKey(namedSignature) )
-				continue;
-			methodsSeen.put(namedSignature, true );
+                        String methodArgs =
+                                (Modifier.isStatic(mods)?
+                                        "className: \""+pathToClass+"\", classCache: &"+classCacheVar :
+                                        "object: javaObject")+
+                                ", methodName: \""+methodName+"\", methodSig: \""+jniSignature(method, "", "")+"\", methodCache: &"+methodIDVarRef;
 
-			String methodIDVar = methodName+"_MethodID_"+(++idcount), methodIDVarRef = methodIDVar;
-			if ( !isStatic )
-				methodIDVarRef = outputClassName+"."+methodIDVarRef;
+                        code.append( "JNIMethod.Call"+funcType( returnType, mods )+"Method( "+methodArgs + ", args: &__args, locals: &__locals )\n" );
 
+                        if ( isObjectType( returnType ) )
+                            code.append( "        defer { JNI.DeleteLocalRef( __return ) }\n" );
 
-	    	boolean arrayType = crashesCompilerOnLinx( method );
-	    	boolean canThrow = method.getExceptionTypes().length != 0;
-			String unnamedSignature = swiftSignatureFor( method, isProtocol, true, false);
-	    	boolean createsNameless = !methodsSeen.containsKey(unnamedSignature) && !fieldExists &&
-					!(isInterface && lostType(method.getReturnType())) && method.getParameterCount() != 0;
-	
-	    	if ( arrayType )
-	    		code.append( "    #if !os(Linux)\n");
+                        if ( canThrow )
+                            addThrowCode( method );
 
-			if ( isProtocol && isStatic )
-				code.append("    //");
+                        if ( notVoid )
+                            code.append("        return "+decoder( "__return", returnType, "")+"\n");
+                    }
+                    else if ( notVoid(returnType) ) {
+                        String passthrough = "";
+                        for ( Parameter param : method.getParameters() )
+                            passthrough += (passthrough==""?" ":", ")+safe(param.getName())+": _"+safe(param.getName());
+                        code.append("        return "+ (clazz.isInterface() ? defaultReturn(returnType) :
+                                "super."+methodName+"("+passthrough+" )")+"\n");
+                    }
 
-			String methodKey = methodKey(method);
-			Method interfaceMethod = interfaceMethods.get(methodKey);
-			interfaceMethods.remove(methodKey);
+                    code.append("    }\n\n");
+                }
+            }
 
-			boolean createBody = !isListenerBase || !isInterface;
+            if ( createsNameless && !isProtocol ) {
 
-			if ( !(isProtocol && argumentsOfProtocolRenamed( clazz )) ) {
-				if ( !isProtocol && (!isListenerBase || !isInterface) )
-                	code.append("    private static var "+methodIDVar+": jmethodID?\n\n" );
+                if ( isProtocol && isStatic )
+                    code.append("//");
 
-                code.append("    " + (overridden != null && !isLost && !createBody && !(isListenerBase && isProtocol) 
-						|| isAdapter() && isListenerBase ? "override " : "")
-						+ swiftSignatureFor(method, isProtocol, false, true, interfaceMethod));
+                code.append("    " + (unnamedOverride && !isLost && !createBody || isAdapter() && isListenerBase ? "override " : "")
+                        + swiftSignatureFor(method, isProtocol, false, false, interfaceMethod));
 
-				if ( isListenerBase )
-					code.append( " /**/" );
+                if ( isListenerBase )
+                    code.append( " /**/" );
 
                 if (isProtocol)
                     code.append("\n");
                 else {
                     code.append(" {\n");
+                    code.append("        "+(notVoid?"return ":"") + (canThrow?"try ":"") +
+                                safe(method.getName()) + "("+passthroughArguments(method, interfaceMethod, "_")+" )\n");
+                    code.append("    }\n" );
+                }
+            }
 
-                    if ( createBody ) {
-                        code.append( functionHeader( method.getParameters(), interfaceMethod, 0 ) );
+            if ( arrayType )
+                code.append( "    #endif\n");
+            code.append( "\n" );
 
-                        code.append( "        " );
-                        if ( notVoid(method.getReturnType()) ) 
-                            code.append( "let __return = " );
+            methodsSeen.put( unnamedSignature, true );
+        }
 
-                    	String methodArgs = 
-                    			(Modifier.isStatic(mods)?
-                    					"className: \""+pathToClass+"\", classCache: &"+classCacheVar :
-                    					"object: javaObject")+
-                    			", methodName: \""+methodName+"\", methodSig: \""+jniSignature(method)+"\", methodCache: &"+methodIDVarRef;
+        return hasSubclassResponsibility;
+    }
 
-                    	code.append( "JNIMethod.Call"+funcType( method.getReturnType(), mods )+"Method( "+methodArgs+
-                    			", args: &__args, locals: "+(method.getParameters().length != 0?"&__locals":"nil")+" )\n" );
+    void generateCallbackBase( HashMap<String,Boolean> fieldsSeen, java.lang.reflect.Method responsibles[] ) throws IOException {
+        java.lang.reflect.Method methods[] = responsibles.length != 0 ? responsibles : clazz.getMethods();
+        ArrayList<java.lang.reflect.Method> methodsCallingBack = new ArrayList<java.lang.reflect.Method>();
+
+        if ( sortMembers )
+            java.util.Arrays.sort( methods, new Comparator<java.lang.reflect.Method>() {
+            		@Override
+            		public int compare(java.lang.reflect.Method o1, java.lang.reflect.Method o2) {
+    					int statics = compareStatic( o1.getModifiers(), o2.getModifiers() );
+    					return statics != 0 ? statics : swiftSignatureFor( newMethod(o1), true, true, true, null)
+    							.compareTo(swiftSignatureFor( newMethod(o2), true, true, true, null));
+            		}
+            } );
+
+        for (int i = 0; i < methods.length; i++) {
+            Method method = newMethod( methods[i] );
+            if ( skipCallbackMethod( method ) )
+                continue;
+            if ( crashesCompilerOnLinx( method ) )
+                code.append("#if !os(Linux)\n");
+
+            methodsCallingBack.add( method.method );
+
+            code.append("private typealias " + jniName(method, i) + "_type = @convention(c) "
+                    + jniDecl(method, null) + "\n\n");
+
+            code.append("private func " + jniName(method, i) + jniDecl(method, "_ ") + " {\n");
+            String passthrough = "";
+            for (Parameter param : method.getParameters())
+                passthrough += (passthrough == ""?" ":", ") + safe(param.getName())+": " +/////
+                        decoder( safe(param.getName()), param.getType(), ", consume: false" );//+(!p.getType().isPrimitive()?"!":"");
+            String call = classSuffix + "Local_.swiftObject( jniEnv: __env, javaObject: __this, swiftObject: __swiftObject )."
+                    + method.getName() + "(" + passthrough + " )";
+            boolean rethrow = method.getExceptionTypes().length != 0;
+            String indent = "";
+            if ( rethrow ) {
+                call = "try " + call;
+                code.append("    do {\n");
+                indent = "    ";
+            }
 
-                    	if ( canThrow )
-                    		addThrowCode( method );
+            Class<?> returnType = method.getReturnType();
+            boolean notVoid = notVoid(returnType);
+            if ( notVoid )
+                call = "let __return = "+call;
+            code.append(indent+"    "+call+"\n");
+            if ( notVoid ) {
+                code.append(indent+"    var __locals = [jobject]()\n");
+                code.append(indent+"    return JNI.check( "+(
+                        encoder("__return", returnType) + encodeSuffix(returnType))+", &__locals, removeLast: true )\n");
+            }
 
-                    	if (notVoid(method.getReturnType()))
-                    		code.append("        return "+decoder( "__return", method.getReturnType())+"\n");
-                    }
-                    else if ( createsNameless ) {
-                    	String passthrough = "";
-                    	for ( Parameter param : method.getParameters() )
-                    		passthrough += (passthrough==""?" ":", ")+safe(param.getName());
-                    	String extra = "";
-                    	if ( notVoid(method.getReturnType()) )
-                    		extra += "return ";
-                    	if ( canThrow )
-                    		extra += "try! ";
-                    	code.append("        "+extra+method.getName()+"("+passthrough+" )\n");
-                    }
+            if ( rethrow ) {
+                    String dflt = returnType.getName().equals("boolean") ? "0" : defaultReturn(returnType);
+                    code.append("    }\n");
+                    code.append("    catch let exception as Throwable {\n");
+                    code.append("        _ = exception.withJavaObject { JNI.api.Throw( JNI.env, $0 ) }\n");
+                    if ( notVoid )
+                        code.append("        return "+dflt+"\n");
+                    code.append("    }\n    catch {\n");
+                    code.append("        _ = Exception(\"Unknown exception\").withJavaObject { JNI.api.Throw( JNI.env, $0 ) }\n");
+                    if ( notVoid )
+                        code.append("        return "+dflt+"\n");
+                    code.append("    }\n");
+            }
 
-                    code.append("    }\n\n");
-                }
-			}
-
-			if ( createsNameless ) {
-
-				if ( isProtocol && isStatic )
-					code.append("//");
-
-				code.append("    " + (unnamedOverride && !isLost && !createBody || isAdapter() && isListenerBase ? "override " : "")
-						+ swiftSignatureFor(method, isProtocol, false, false, interfaceMethod));
-
-				if ( isListenerBase )
-					code.append( " /**/" );
-
-				if (isProtocol)
-					code.append("\n");
-				else {
-					code.append(" {\n");
-					if ( createBody )
-						code.append("        "+(notVoid(method.getReturnType())?"return ":"")+(canThrow?"try ":"")+
-								safe(method.getName()) + "("+passthroughArguments(method, interfaceMethod)+" )\n");
-					else if ( notVoid(method.getReturnType()) ) {
-                    	String passthrough = "";
-                    	for ( Parameter param : method.getParameters() )
-                    		passthrough += (passthrough==""?" ":", ")+safe(param.getName())+": _"+safe(param.getName());
-						code.append("        return "+ (clazz.isInterface() ?
-								method.getReturnType().isPrimitive() ? "0" : "nil" :
-								"super."+methodName+"("+passthrough+" )")+"\n");
-					}
-					code.append("    }\n" );
-				}
-			}
-
-	    	if ( arrayType )
-	    		code.append( "    #endif\n");
-	    	code.append( "\n" );
-
-			methodsSeen.put( unnamedSignature, true );
-		}
-
-		return hasSubclassResponsibility;
-    }
-
-	void generateCallbackBase( HashMap<String,Boolean> fieldsSeen, Method responsibles[] ) throws IOException {
-		Method methods[] = responsibles.length != 0 ? responsibles : clazz.getMethods();
-		ArrayList<Method> methodsCallingBack = new ArrayList<Method>();
-
-		for (int i = 0; i < methods.length; i++) {
-			Method method = methods[i];
-			if ( skipCallbackMethod( method ) )
-				continue;
-			if ( crashesCompilerOnLinx( method ) )
-				code.append("#if !os(Linux)\n");
-
-			methodsCallingBack.add( method );
-
-			code.append("private typealias " + jniName(method, i) + "_type = @convention(c) "
-					+ jniDecl(method, null) + "\n\n");
-
-			code.append("private func " + jniName(method, i) + jniDecl(method, "_ ") + " {\n");
-			String passthrough = "";
-			for (Parameter param : method.getParameters())
-				passthrough += (passthrough == ""?" ":", ") + safe(param.getName())+
-				": "+decoder( safe(param.getName()), param.getType() );//+(!p.getType().isPrimitive()?"!":"");
-			String call = classSuffix + "Base.swiftObject( jniEnv: __env, javaObject: __this )."
-					+ method.getName() + "(" + passthrough + " )";
-			if ( method.getExceptionTypes().length != 0 )
-				call = "try! " + call;
-
-			Class<?> returnType = method.getReturnType();
-			if ( notVoid(returnType) )
-				call = "let __return = "+call;
-			code.append("    " + call + "\n");
-			if ( notVoid(returnType) )
-				code.append("    return "+(returnType.isPrimitive() || returnType == java.lang.String.class ?
-						encoder("__return", returnType, "nil") + encodeSuffix(returnType) :
-						"JNI.api.NewWeakGlobalRef( JNI.env, __return?.javaObject )")+"\n");
-
-			code.append("}\n");
-			if ( crashesCompilerOnLinx( method ) )
-				code.append("#endif\n");
-			code.append("\n");
-		}
-
-		code.append("open class " + classSuffix + "Base: "+(isInterface?"JNIObjectProxy, ":"") + classSuffix + " {\n\n");
-
-		if ( !isInterface )
-			code.append( "    private static var "+classSuffix+"BaseJNIClass: jclass?\n" );
-		
-		code.append("    private static var nativesRegistered = false\n\n");
-
-		code.append("    private static func registerNatives() {\n");
-		code.append("        if ( !nativesRegistered ) {\n");
-		code.append("            var natives = [JNINativeMethod]()\n\n");
-
-		for (int i = 0; i < methods.length; i++) {
-			Method method = methods[i];
-			if ( skipCallbackMethod( method ) )
-				continue;
-			if ( crashesCompilerOnLinx( method ) )
-				code.append("            #if !os(Linux)\n");
-
-			String jniName = jniName(method, i);
-			code.append("            let " + jniName + "_thunk: " + jniName + "_type = " + jniName + "\n");
-			code.append("            natives.append( JNINativeMethod( name: strdup(\"__" + method.getName() + "\")"
-					+ ", signature: strdup(\"" + jniSignature(method) + "\"), fnPtr: unsafeBitCast( " + jniName
-					+ "_thunk, to: UnsafeMutableRawPointer.self ) ) )\n");
-
-			if ( crashesCompilerOnLinx( method ) )
-				code.append("            #endif\n");
-			code.append("\n");
-		}
-
-		String proxyClass = "org/genie/" + currentFramework + "/" + classSuffix + "Proxy";
-
-		code.append("            withUnsafePointer(to: &natives[0]) {\n");
-		code.append("                nativesPtr in\n");
-		code.append("                let clazz = JNI.FindClass( \"" + proxyClass + "\" )\n");
-		code.append("                if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr, jint(natives.count) ) != jint(JNI_OK) {\n");
-		code.append("                    JNI.report( \"Unable to register java natives\" )\n");
-		code.append("                }\n");
-		code.append("            }\n\n");
-		code.append("            nativesRegistered = true\n");
-		code.append("        }\n");
-		code.append("    }\n\n");
-
-		if ( isInterface ) {
-			code.append("    public convenience init() {\n");
-			code.append("        self.init( javaObject: nil )\n");
-//		else {
-//			code.append("        let object = "+classSuffix+"Base.new()\n");
-//			code.append("        self.init( javaObject: object?.javaObject )\n");
-			code.append("    }\n\n");
-		}
-
-		code.append("    public required init( javaObject: jobject! ) {\n");
-		code.append("        super.init( javaObject: javaObject )\n");
-		code.append("        "+classSuffix+"Base.registerNatives()\n");
-		if ( isInterface )
-			code.append("        createProxy( javaClassName: \""+proxyClass+"\" )\n");
-		else
-			code.append("        updateSwiftObject()\n");
-		code.append("    }\n\n");
-		code.append("    static func swiftObject( jniEnv: UnsafeMutablePointer<JNIEnv?>?, javaObject: jobject? ) -> " + classSuffix + "Base {\n");
-		code.append("        return unsafeBitCast( swiftPointer( jniEnv: jniEnv, object: javaObject ), to: " + classSuffix + "Base.self )\n    }\n\n");
-
-		if ( !isInterface ) {
-			generateConstructors( proxyClass, classSuffix+"Base", true );
-			methods = methodsCallingBack.toArray( new Method[ methodsCallingBack.size() ] );
-		}
-		//else
-		if ( isInterface || clazz == javax.swing.text.PlainDocument.class )
-			generateMethods(methodsCallingBack.toArray( new Method[ methodsCallingBack.size() ] ), false, fieldsSeen, classSuffix + "Base", true);
-
-		code.append("}\n");
-
-		generateJavaCallbackStub( methods ); 
-	}
-	
-	void generateJavaCallbackStub( Method methods[] ) throws IOException {
-		StringBuilder java = new StringBuilder();
-		
-		java.append("\n/// "+clazz+" ///\n\n");
-
-		java.append("package "+organisation+currentFramework+";\n\npublic class "+classSuffix+ "Proxy "+
-				(isInterface?"implements ":"extends ")+className.replace('$', '.')+" {\n\n");
-
-		java.append("    long swiftObject;\n\n");
-
-		if ( isInterface ) {
-			java.append("    "+classSuffix+"Proxy( long swiftObject ) {\n" );
-			java.append("        this.swiftObject = swiftObject;\n    }\n\n" );
-		}
-		else {
-			for ( Constructor<?> constructor : clazz.getDeclaredConstructors() ) {
-				java.append("    /// "+constructor+"\n\n");
-				int mods = constructor.getModifiers();
-				if ( !Modifier.isPublic(mods) && !Modifier.isProtected(mods) )
-					continue;
-				
-				String args = longJavaArgs(constructor);
-				java.append("    "+classSuffix+"Proxy("+args+(args==""?" ":", ")+"long swiftObject ) {\n" );
-
-				args = "";
-				for (Parameter param : constructor.getParameters()) 
-					args += (args == ""?" ":", ")+safe(param.getName());
-				java.append("        super("+args+" );\n");
-				java.append("        this.swiftObject = swiftObject;\n    }\n\n");
-			}
-		}
-
-		for (int i = 0; i < methods.length; i++) {
-			Method method = methods[i];
-			java.append("    /// "+method+"\n\n");
-			String methodName = safe(method.getName());
-			Class<?> returnType = method.getReturnType();
-//			if ( skipCallbackMethod( method ) )
-//				continue;
-
-			String args = longJavaArgs(method);
-			java.append("    public native "+returnType.getName()+" __"+methodName+"("+args+");\n\n");
-
-			boolean notVoid = notVoid(returnType);
-			String retrn = notVoid ? "return " : "";
-			String assign = notVoid ? returnType.getName() + " __return = " : "";
-
-			String enteredName = "entered_"+methodName+"_"+i;
-			if ( !isInterface )
-				java.append("    boolean "+enteredName+";\n\n");
-
-			String throwz = "";
-			for ( Class<?> type : method.getExceptionTypes() )
-				throwz += (throwz==""?" throws ":", ")+type.getName();
-			java.append("    public "+returnType.getName()+" "+methodName+"("+args+")"+throwz+" {\n");
-
-			args = "";
-			for (Parameter param : method.getParameters())
-				args += (args == ""?" ":", ")+safe(param.getName());
-
-			if ( !isInterface ) {
-				java.append("        if ( !"+enteredName+" ) {\n");
-				java.append("            "+enteredName+" = true;\n");
-				java.append("            "+assign+"__"+methodName+"("+args+" );\n");
-				java.append("            "+enteredName+" = false;\n");
-				if ( notVoid )
-					java.append("            return __return;\n");
-				java.append("        }\n");
-				java.append("        else\n");
-				java.append("            "+retrn+"super."+method.getName()+"("+args+" );\n");
-			}
-			else
-				java.append("        "+retrn+"__"+method.getName()+"("+args+" );\n");
-			java.append("    }\n\n");
-		}
-
-		java.append("}\n");
-
-		String dest = proxySourcePath+currentFramework;
-		new File( dest ).mkdirs();
-		String javaSource = dest+"/"+classSuffix+"Proxy.java";
-		FileOutputStream out = new FileOutputStream( javaSource );
-		out.write(java.toString().getBytes("UTF-8") );
-		out.close();
-		print("Wrote: "+javaSource);
-	}
+            code.append("}\n");
+            if ( crashesCompilerOnLinx( method ) )
+                code.append("#endif\n");
+            code.append("\n");
+        }
+
+        code.append("fileprivate class " + classSuffix + "Local_: JNI"+(isInterface?"Local":"Object")+
+                "Proxy<"+classSuffix+(isInterface?", Any":"")+"> {\n\n");
+
+        code.append("    fileprivate static let _proxyClass: jclass = {\n");
+        code.append("        var natives = [JNINativeMethod]()\n\n");
+
+        for (int i = 0; i < methods.length; i++) {
+            Method method = newMethod( methods[i] );
+            if ( skipCallbackMethod( method ) )
+                continue;
+            if ( crashesCompilerOnLinx( method ) )
+                code.append("        #if !os(Linux)\n");
+
+            String jniName = jniName(method, i);
+            code.append("        let " + jniName + "_thunk: " + jniName + "_type = " + jniName + "\n");
+            code.append("        natives.append( JNINativeMethod( name: strdup(\"__" + method.getName() + "\")"
+                    + ", signature: strdup(\"" + jniSignature(method, "J", "") + "\"), fnPtr: unsafeBitCast( " + jniName
+                    + "_thunk, to: UnsafeMutableRawPointer.self ) ) )\n");
+
+            if ( crashesCompilerOnLinx( method ) )
+                code.append("        #endif\n");
+            code.append("\n");
+        }
+
+        code.append("        natives.append( JNINativeMethod( name: strdup(\"__finalize\"), signature: strdup(\"(J)V\")"
+                + ", fnPtr: unsafeBitCast( JNIReleasableProxy__finalize_thunk, to: UnsafeMutableRawPointer.self ) ) )\n\n");
+
+        String proxyClass = "org/swiftjava/" + currentFramework + "/" + classSuffix + "Proxy";
+        code.append("        let clazz = JNI.FindClass( proxyClassName() )\n");
+
+        code.append("        natives.withUnsafeBufferPointer {\n");
+        code.append("            nativesPtr in\n");
+        code.append("            if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr.baseAddress, jint(nativesPtr.count) ) != jint(JNI_OK) {\n");
+        code.append("                JNI.report( \"Unable to register java natives\" )\n");
+        code.append("            }\n");
+        code.append("        }\n\n");
+        code.append("        defer { JNI.DeleteLocalRef( clazz ) }\n");
+        code.append("        return JNI.api.NewGlobalRef( JNI.env, clazz )!\n");
+        code.append("    }()\n\n");
+
+        code.append("    override open class func proxyClassName() -> String { return \"" + proxyClass + "\" }\n");
+        code.append("    override open class func proxyClass() -> jclass? { return _proxyClass }\n\n}\n\n");
+
+        if ( isInterface ) {
+            code.append("extension "+classSuffix+" {\n\n");
+            code.append("    public func localJavaObject( _ locals: UnsafeMutablePointer<[jobject]> ) -> jobject? {\n");
+            code.append("        return "+classSuffix+"Local_( owned: self, proto: self ).localJavaObject( locals )\n");
+            code.append("    }\n\n}\n\n");
+        }
+
+        code.append("open class " + classSuffix + "Base: " + classSuffix + " {\n\n");
+
+        if ( !isInterface ) {
+            code.append("    private static var "+classSuffix+"BaseJNIClass: jclass? = "+classSuffix+"Local_.proxyClass()\n\n" );
+            code.append("    private lazy var __local: "+classSuffix+"Local_? = "+classSuffix+"Local_( owned: self, proto: self )\n\n");
+
+            code.append("    override open func clearLocal() {\n        __local = nil\n    }\n\n");
+
+            code.append("    open func inherit( _ parent: JNIObjectProtocol ) {\n");
+            code.append("        parent.withJavaObject {\n");
+            code.append("            self.javaObject = $0\n");
+            code.append("            self.__local?.takeOwnership(javaObject: $0)\n");
+            code.append("        }\n");
+            code.append("    }\n\n");
+        }
+        else
+            code.append("    public init() {}\n\n");
+
+        if ( !isInterface ) {
+            generateConstructors( proxyClass, classSuffix+"Base", true );
+            methods = methodsCallingBack.toArray( new java.lang.reflect.Method[ methodsCallingBack.size() ] );
+        }
+        ////else
+        if ( isInterface || clazz == javax.swing.text.PlainDocument.class )
+            generateMethods(methodsCallingBack.toArray( new java.lang.reflect.Method[ methodsCallingBack.size() ] ), false, fieldsSeen, classSuffix + "Base", true);
+
+        code.append("}\n");
+
+        generateJavaProxyStub( methods );
+    }
+
+    void generateJavaProxyStub( java.lang.reflect.Method methods[] ) throws IOException {
+        StringBuilder java = new StringBuilder();
+
+        java.append("\n/// generated by: "+invocation+" ///\n");
+        java.append("\n/// "+clazz+" ///\n\n");
+
+        java.append("package "+organisation+currentFramework+";\n\n"+
+                    "@SuppressWarnings(\"JniMissingFunction\")\n"+
+                    "public class "+classSuffix+ "Proxy "+
+                (isInterface?"implements ":"extends ")+className.replace('$', '.')+" {\n\n");
+
+        java.append("    // address of proxy object\n");
+        java.append("    long __swiftObject;\n\n");
+
+        if ( isInterface ) {
+            java.append("    "+classSuffix+"Proxy( long __swiftObject ) {\n" );
+            java.append("        this.__swiftObject = __swiftObject;\n    }\n\n" );
+        }
+        else {
+            for ( java.lang.reflect.Constructor<?> _constructor : clazz.getDeclaredConstructors() ) {
+                Constructor<?> constructor = newConstructor( _constructor );
+                java.append("    /// "+constructor+"\n\n");
+                int mods = constructor.getModifiers();
+                if ( !Modifier.isPublic(mods) && !Modifier.isProtected(mods) )
+                    continue;
+
+                String args = longJavaArgs(constructor);
+                java.append("    "+classSuffix+"Proxy("+args+(args==""?" ":", ")+"long __swiftObject ) {\n" );
+
+                args = "";
+                for (Parameter param : constructor.getParameters())
+                    args += (args == ""?" ":", ")+safe(param.getName());
+                java.append("        super("+args+" );\n");
+                java.append("        this.__swiftObject = __swiftObject;\n    }\n\n");
+            }
+        }
+
+        for (int i = 0; i < methods.length; i++) {
+            Method method = newMethod( methods[i] );
+            java.append("    /// "+method+"\n\n");
+            String methodName = safe(method.getName());
+            Class<?> returnType = method.getReturnType();
+//            if ( skipCallbackMethod( method ) )
+//                continue;
+
+            String args = longJavaArgs(method);
+            String argsSwift = " long __swiftObject"+(args==""?" ":",")+args;
+            String returnTypeName = longJavaType( returnType );
+            java.append("    public native "+returnTypeName+" __"+methodName+"("+argsSwift+");\n\n");
+
+            boolean notVoid = notVoid(returnType);
+            String retrn = notVoid ? "return " : "";
+            String assign = notVoid ? returnTypeName + " __return = " : "";
+
+            String enteredName = "entered_"+methodName+"_"+i;
+            if ( !isInterface )
+                java.append("    boolean "+enteredName+";\n\n");
+
+            String throwz = "";
+            for ( Class<?> type : method.getExceptionTypes() )
+                throwz += (throwz==""?" throws ":", ")+type.getName();
+            java.append("    public "+returnTypeName+" "+methodName+"("+args+")"+throwz+" {\n");
+
+            args = "";
+            for (Parameter param : method.getParameters())
+                args += (args == ""?" ":", ")+safe(param.getName());
+            argsSwift = " __swiftObject"+(args==""?" ":",")+args;
+
+            if ( !isInterface && !Modifier.isAbstract(method.getModifiers()) ) {
+                java.append("        if ( !"+enteredName+" ) {\n");
+                java.append("            "+enteredName+" = true;\n");
+                java.append("            "+assign+"__"+methodName+"("+argsSwift+");\n");
+                java.append("            "+enteredName+" = false;\n");
+                if ( notVoid )
+                    java.append("            return __return;\n");
+                java.append("        }\n");
+                java.append("        else\n");
+                java.append("            "+retrn+"super."+method.getName()+"("+args+" );\n");
+            }
+            else
+                java.append("        "+retrn+"__"+method.getName()+"("+argsSwift+" );\n");
+            java.append("    }\n\n");
+        }
+
+        java.append(
+                "    public native void __finalize( long __swiftObject );\n\n" +
+                "    public void finalize() {\n" +
+                "        __finalize( __swiftObject );\n" +
+                "    }\n\n}\n");
+
+        String dest = (javaSourceRoot != null ? javaSourceRoot+"/" :
+                pathToWriteSource+"src/") + proxySourcePath+currentFramework;
+        new File( dest ).mkdirs();
+
+        String javaSource = dest + "/" + classSuffix+"Proxy.java";
+        FileOutputStream out = new FileOutputStream( javaSource );
+        out.write(java.toString().getBytes("UTF-8") );
+        out.close();
+
+        print("Created: "+javaSource);
+    }
 
     void generateInterfaceFields( HashMap<String,Boolean> fieldsSeen, Class<?> intrface ) {
-		generateFields( fieldsSeen, isInterface, intrface );									
-		for ( Class<?> secondLevel : intrface.getInterfaces() )
-			generateInterfaceFields( fieldsSeen, secondLevel );									
-    }
-
-	String longJavaArgs( Executable executable ) {
-		String args = "";
-		for (Parameter param : executable.getParameters()) {
-			Class<?> type = param.getType();
-			String subs = "";
-			String javaType = type.getName();
-			while ( type.isArray() ) {
-				type = type.getComponentType();
-				subs += "[]";
-				javaType = type.getName()+subs;
-			}
-			args += (args == ""?" ":", ")+javaType.replace('$', '.')+" "+safe(param.getName());
-		}
-		return args == "" ? "" : args + " ";
-	}
-
-	boolean interfacesChangingReturnTypeInSubclass( Class<?> intrface ) {
-		return intrface == java.util.stream.BaseStream.class
-			|| intrface == java.util.concurrent.CompletionStage.class
-			|| intrface == java.util.SortedSet.class
-			|| intrface == java.util.Iterator.class 
-		    || intrface == java.util.concurrent.BlockingQueue.class
-		    || intrface == java.util.NavigableSet.class
-		    || intrface == java.util.concurrent.locks.ReadWriteLock.class
-			|| classPrefix(intrface.getName()).equals("java_util") && intrface.getName().endsWith("Map");
-	}
+        generateFields( fieldsSeen, isInterface, intrface );
+        for ( Class<?> secondLevel : intrface.getInterfaces() )
+            generateInterfaceFields( fieldsSeen, secondLevel );
+    }
+
+    String longJavaType( Class<?> type ) {
+        return type.isArray() ? longJavaType( type.getComponentType() )+"[]" : type.getName().replace('$', '.');
+    }
+
+    String longJavaArgs( Executable executable ) {
+        String args = "";
+        for (Parameter param : executable.getParameters()) {
+            String javaType = longJavaType( param.getType() );
+            args += (args == "" ? " " : ", ")+javaType+" "+safe(param.getName());
+        }
+        return args == "" ? "" : args + " ";
+    }
+    
+    int compareStatic( int m1, int m2 ) {
+    		return Modifier.isStatic( m1 ) && !Modifier.isStatic( m2 ) ? -1 :
+    			Modifier.isStatic( m1 ) == Modifier.isStatic( m2 ) ? 0 : 1;
+    }
+
+    boolean interfacesChangingReturnTypeInSubclass( Class<?> intrface ) {
+        return intrface == java.util.SortedSet.class
+            || intrface == java.util.Iterator.class
+            || intrface == java.util.concurrent.BlockingQueue.class
+            || intrface == java.util.NavigableSet.class
+            || intrface == java.util.concurrent.locks.ReadWriteLock.class
+            || classPrefix(intrface.getName()).equals("java_util") && intrface.getName().endsWith("Map");
+    }
 
     boolean dontEnforceProtocol( Class<?> clazz ) {
-    	return clazz == java.lang.Iterable.class;
+        return clazz == java.lang.Iterable.class;
     }
 
     boolean argumentsOfProtocolRenamed( Class<?> clazz ) {
-    	return false;
+        return false;
     }
 
     boolean awkwardMethodInProtocol( Method method ) {
-    	return false;
+        return false;
     }
-   
+
    boolean ambiguousInitialiser( String signature ) {
-		return signature.equals("public java.awt.Dialog(java.awt.Window)")
-				|| signature.equals("public java.awt.Window(java.awt.Frame)") //// crashes compiler on Linux
-				|| signature.equals("public javax.swing.JDialog(java.awt.Window)")
-				|| signature.equals("public javax.swing.JWindow(java.awt.Window)")
-				|| signature.equals("public javax.swing.JDialog(java.awt.Window,java.lang.String)");
-    }
-
-	boolean redundantConformance(Class<?> prospectiveInterface, Class<?> interfaces[]) {
-		boolean prospectiveUnclassed = isUnclassed(prospectiveInterface);
-		for (Class<?> intrface : interfaces)
-			if ( prospectiveInterface == intrface || prospectiveUnclassed && isUnclassed(intrface) ||
-					redundantConformance(prospectiveInterface, intrface.getInterfaces()))
-				return true;
-		return false;
-	}
+       return false;
+//        return signature.equals("public java.awt.Dialog(java.awt.Window)")
+//                || signature.equals("public java.awt.Window(java.awt.Frame)") //// crashes compiler on Linux
+//                || signature.equals("public javax.swing.JDialog(java.awt.Window)")
+//                || signature.equals("public javax.swing.JWindow(java.awt.Window)")
+//                || signature.equals("public javax.swing.JDialog(java.awt.Window,java.lang.String)");
+    }
+
+    boolean redundantConformance(Class<?> prospectiveInterface, Class<?> interfaces[]) {
+        boolean prospectiveUnavailable = isUnavailable(prospectiveInterface);
+        for (Class<?> intrface : interfaces)
+            if ( prospectiveInterface == intrface || prospectiveUnavailable && isUnavailable(intrface) ||
+                    redundantConformance(prospectiveInterface, intrface.getInterfaces()) )
+                return true;
+        return false;
+    }
 
     boolean skipCallbackMethod( Method method ) {
-    	return awkwardMethodInProtocol( method ) || Modifier.isFinal(method.getModifiers())
-    			|| !isInterface && !subclassResponsibilities.containsKey(method.toString()) && !isAdapter();
+        return awkwardMethodInProtocol( method ) || Modifier.isFinal(method.getModifiers())
+                || !isInterface && !subclassResponsibilities.containsKey(method.toString()) && !isAdapter()
+                || isUnavailable(method.getReturnType()) || Modifier.isStatic(method.getModifiers());
     }
 
-	HashMap<String,Method> interfaceMethods = new HashMap<String,Method>();
+    HashMap<String,Method> interfaceMethods = new HashMap<String,Method>();
 
     void findInterfaceMethods( Class<?> clazz ) {
-    	for ( Class<?> intrface : clazz.getInterfaces() ) {
-    		for ( Method method : intrface.getMethods() )
-    			interfaceMethods.put( methodKey( method ), method );
-    		findInterfaceMethods( intrface );
-    	}
+        for ( Class<?> intrface : clazz.getInterfaces() ) {
+            for ( java.lang.reflect.Method method : intrface.getMethods() )
+                interfaceMethods.put( methodKey( newMethod( method ) ), newMethod( method ) );
+            findInterfaceMethods( intrface );
+        }
     }
 
     String methodKey( Method method ) {
-    	return method.getName()+jniArgs(method, "");
+        return method.getName()+jniArgs(method, "", "");
     }
 
     void addAnyMethodsDeclaredInProtocolsButNotDefined( boolean isProtocol, HashMap<String,Boolean> fieldsSeen, String outputClassName ) {
-		java.util.Collection<Method> inProtocolsButNotDeclared = interfaceMethods.values();
-		if ( inProtocolsButNotDeclared.size() != 0 ) {
-			code.append( "    /// In declared protocol but not defined.. ///\n\n" );
-			Method missingMethods[] = inProtocolsButNotDeclared.toArray( new Method[ inProtocolsButNotDeclared.size() ] );
-			generateMethods( missingMethods, isProtocol, fieldsSeen, outputClassName, false );
-		}
-	}
+        java.util.Collection<Method> inProtocolsButNotDeclared = interfaceMethods.values();
+        if ( inProtocolsButNotDeclared.size() != 0 ) {
+            code.append( "    /// In declared protocol but not defined.. ///\n\n" );
+            Method missingMethods0[] = inProtocolsButNotDeclared.toArray( new Method[inProtocolsButNotDeclared.size()] );
+            java.lang.reflect.Method missingMethods[] = new java.lang.reflect.Method[inProtocolsButNotDeclared.size()];
+            for ( int i=0 ; i< missingMethods0.length ; i++ )
+                missingMethods[i] = missingMethods0[i].method;
+            generateMethods( missingMethods, isProtocol, fieldsSeen, outputClassName, false );
+        }
+    }
 
     String functionHeader( Parameter parameters[], Method interfaceMethod, int extra ) {
-    	StringBuilder setup = new StringBuilder();
-    	setup.append( "        var __args = [jvalue]( repeating: jvalue(), count: "+Math.max(1,parameters.length+extra)+" )\n" );
-    	if ( parameters.length != 0 )
-    		setup.append( "        var __locals = [jobject]()\n" );
-    	for ( int i=0 ; i<parameters.length ; i++ ) {
-    		String name = interfaceMethod!=null ? interfaceMethod.getParameters()[i].getName() : parameters[i].getName();
-    		setup.append( "        __args["+i+"] = "+encoder( safe(name), parameters[i].getType(), "&__locals" )+"\n" );
-    	}
-    	return setup.toString();
+        StringBuilder setup = new StringBuilder();
+        setup.append( "        var __locals = [jobject]()\n" );
+        setup.append( "        var __args = [jvalue]( repeating: jvalue(), count: "+Math.max(1,parameters.length+extra)+" )\n" );
+        for ( int i=0 ; i<parameters.length ; i++ ) {
+            String name = interfaceMethod!=null ? interfaceMethod.getParameters()[i].getName() : parameters[i].getName();
+            setup.append( "        __args["+i+"] = "+encoder( safe(name), parameters[i].getType() )+"\n" );
+        }
+        return setup.toString();
     }
 
     void addThrowCode( Executable executable ) {
         code.append( "        if let throwable = JNI.ExceptionCheck() {\n" );
+        code.append( "            defer { JNI.DeleteLocalRef( throwable ) }\n" );
         code.append( "            throw "+swiftTypeFor(executable.getExceptionTypes()[0], false, false)+"( javaObject: throwable )\n        }\n" );
     }
 
+    String defaultReturn( Class<?> returnType ) {
+            return returnType.isPrimitive() ? returnType.getName() == "boolean" ? "false" : "0" : "nil";
+    }
+
     String funcType( Class<?> type, int mods ) {
-    	String typeName = funcNames.get( type.getName() );
-    	if ( typeName == null )
-    		typeName = "Object";
-    	return (Modifier.isStatic(mods)?"Static":"")+typeName;
+        String typeName = funcNames.get( type.getName() );
+        if ( typeName == null )
+            typeName = "Object";
+        return (Modifier.isStatic(mods)?"Static":"")+typeName;
     }
- 
-    String jniArgs( Executable executable, String extra ) {
-    	String sig = "(";
-    	for ( Parameter param : executable.getParameters() )
-    		sig += jniEncoding(param.getType());
-    	return sig+extra+")";
+
+    String jniArgs( Executable executable, String prefix, String suffix ) {
+        String sig = "("+prefix;
+        for ( Parameter param : executable.getParameters() )
+            sig += jniEncoding(param.getType());
+        return sig+suffix+")";
     }
 
-    String jniSignature( Method method ) {
-    	return jniArgs( method, "" )+jniEncoding(method.getReturnType());
+    String jniSignature( Method method, String prefix, String suffix ) {
+        return jniArgs( method, prefix, suffix )+jniEncoding(method.getReturnType());
     }
 
     String jniEncoding( Class<?> clazz ) {
-		String name = clazz.getName();
-		String type = jvalueFields.get(name);
-		return type != null ? type.toUpperCase() : clazz.isArray() ? "[" + jniEncoding(clazz.getComponentType()) : "L"+name.replace('.', '/')+";";
+        String name = clazz.getName();
+        String type = jvalueFields.get(name);
+        return type != null ? type.toUpperCase() : clazz.isArray() ? "[" + jniEncoding(clazz.getComponentType()) : "L"+name.replace('.', '/')+";";
     }
 
     String jniName( Method method, int i ) {
-    	return classSuffix+"_"+safe(method.getName())+"_"+i;
+        return classSuffix+"_"+safe(method.getName())+"_"+i;
     }
 
-	String jniDecl( Method method, String unnamed ) {
-		String decl = "";
-		for ( Parameter param : method.getParameters() ) 
-			decl += ", "+(unnamed==null?"_":unnamed+safe(param.getName()))+": "+jniType(param.getType());
-		return "( "+(unnamed==null?"_":unnamed+"__env")+": UnsafeMutablePointer<JNIEnv?>, "+
-					(unnamed==null?"_":unnamed+"__this")+": jobject?"+decl+" )"+" -> "+(notVoid(method.getReturnType()) ? jniType(method.getReturnType()) : "()");
-	}
+    String jniDecl( Method method, String unnamed ) {
+        String decl = "";
+        for ( Parameter param : method.getParameters() )
+            decl += ", "+(unnamed==null?"_":unnamed+safe(param.getName()))+": "+jniType(param.getType());
+        return "( "+(unnamed==null?"_":unnamed+"__env")+": UnsafeMutablePointer<JNIEnv?>, "+
+                    (unnamed==null?"_":unnamed+"__this")+": jobject?, "+
+                    (unnamed==null?"_":unnamed+"__swiftObject")+": jlong"+decl+" )"+
+                    " -> "+(notVoid(method.getReturnType()) ? jniType(method.getReturnType()) : "()");
+    }
 
-	String jniType( Class<?> type ) {
-		return type.isPrimitive() ? "j"+type.getName() : "jobject?";
-	}
+    String jniType( Class<?> type ) {
+        return type.isPrimitive() ? "j"+type.getName() : "jobject?";
+    }
 
     boolean argumentNamesDiffer( Executable executable, Executable overridden ) {
-    	if ( overridden == null )
-    		return true; ////
-		for (int i = 0; i < executable.getParameterCount(); i++)
-			if (!executable.getParameters()[i].getName()
-					.equals(overridden.getParameters()[i].getName()))
-				return true;
-		return false;
+        if ( overridden == null )
+            return true; ////
+        for (int i = 0; i < executable.getParameterCount(); i++)
+            if (!executable.getParameters()[i].getName()
+                    .equals(overridden.getParameters()[i].getName()))
+                return true;
+        return false;
     }
 
-    String passthroughArguments( Executable executable, Method interfaceMethod ) {
-		String passthrough = "";
-		Parameter parameters[] = executable.getParameters();
-		for ( int i=0 ; i<parameters.length ; i++ ) {
-			String name = safe(interfaceMethod!=null ? interfaceMethod.getParameters()[i].getName() : parameters[i].getName());
-			passthrough += (passthrough == "" ? " " : ", ")+name+": _"+name;
-		}
-		return passthrough;
+    String passthroughArguments( Executable executable, Method interfaceMethod, String underscore ) {
+        String passthrough = "";
+        Parameter parameters[] = executable.getParameters();
+        for ( int i=0 ; i<parameters.length ; i++ ) {
+            String name = safe(interfaceMethod!=null ? interfaceMethod.getParameters()[i].getName() : parameters[i].getName());
+            passthrough += (passthrough == "" ? " " : ", ")+name+": "+underscore+name;
+        }
+        return passthrough;
+    }
+    
+    boolean skipBecause( String category, java.lang.reflect.Member member, boolean reasons[] ) {
+    		if ( Modifier.isPrivate(member.getModifiers()) )
+    			return true;
+    		for ( boolean reason : reasons )
+    			if ( reason ) {
+    				String out = "    // Skipping " + category + ": ";
+    	    			for ( boolean value : reasons )
+    	    				out += value + " ";
+    	    			code.append( out + "\n\n" );
+    	    			return true;
+    			}
+    		return false;
     }
 
     boolean crashesCompilerOnLinx( Method method ) {
-    	boolean arrayType = crashesCompilerOnLinx( method.getReturnType() );
-		for ( Parameter param : method.getParameters() )
-			if ( crashesCompilerOnLinx( param.getType() ) )
-				arrayType = true;
-		return arrayType;
+        boolean arrayType = crashesCompilerOnLinx( method.getReturnType() );
+        for ( Parameter param : method.getParameters() )
+            if ( crashesCompilerOnLinx( param.getType() ) )
+                arrayType = true;
+        return arrayType;
     }
 
-	boolean crashesCompilerOnLinx( Class<?> type ) {
-    	return false;//type.isArray() && !type.getComponentType().isPrimitive();
+    boolean crashesCompilerOnLinx( Class<?> type ) {
+        return false;//type.isArray() && !type.getComponentType().isPrimitive();
     }
 
-    String encoder( String var, Class<?> type, String locals ) {
-    	if ( type == java.lang.Float.class )
-    		return "JNIType.encodeFloat( value: "+var+" )";
-    	else if ( type.isInterface() )
-    		return "jvalue( l: "+var+"?.javaObject )";
-    	else if ( type.isArray() && type.getComponentType().isInterface() )
-    		var += "?.map { $0.javaObject }";
-    	return "JNIType.encode( value: "+var+", locals: "+locals+" )";
+    String encodeSuffix( Class<?> type ) {
+        String jvalueField = jvalueFields.get( type.getName() );
+        if ( jvalueField == null )
+            jvalueField = "l";
+        return "."+jvalueField;
     }
 
-    String encodeSuffix( Class<?> type ) {
-    	String jvalueField = jvalueFields.get( type.getName() );
-    	if ( jvalueField == null )
-    		jvalueField = "l";
-    	return "."+jvalueField;
+    String encoder( String var, Class<?> type ) {
+        if ( type == java.lang.Float.class )
+            return "JNIType.toJavaFloat( value: "+var+", locals: &__locals )";
+        String typeName = type.getName();
+        if ( type.isPrimitive() ) {
+            if ( typeName.equals("boolean") )
+        			var = "jboolean("+var+" ? JNI_TRUE : JNI_FALSE)";
+            if ( typeName.equals("int") )
+        			var = "jint("+var+")";
+            return "jvalue( "+jvalueFields.get( typeName )+": "+var+" )";
+        }
+        return "JNIType.toJava( value: " + var + (java.util.Map.class.isAssignableFrom(type) ?
+        		", mapClass: \""+typeName.replace(".", "/")+"\"" : "") + ", locals: &__locals )";
     }
 
-    String decoder( String var, Class<?> type ) {
-    	if ( type == java.lang.Float.class )
-    		return "JNIType.decodeFloat( from: "+var+" )";
-    	String swiftType = swiftTypeFor(type, false, false);
-    	if ( type.isInterface() )
-    		swiftType += "Forward";
-    	if ( type.isArray() && type.getComponentType().isInterface() )
-    		swiftType = "["+swiftTypeFor(type.getComponentType(), false, false, false, false)+"Forward]";
-    	boolean isObjectType = !type.isPrimitive() && type != String.class && !type.isArray();
-    	return isObjectType ? var + " != nil ? " + swiftType+"( javaObject: " + var + " ) : nil" :
-    		"JNIType.decode( type: "+swiftType+"(), from: " + var + " )";
+    String decoder( String var, Class<?> type, String consume ) {
+        if ( type == java.lang.Float.class )
+            return "JNIType.toSwiftFloat( from: "+var+consume+" )";
+        if ( type.isPrimitive() ) {
+            if ( type.getName().equals("boolean") )
+        			return var+" != jboolean(JNI_FALSE)";
+            if ( type.getName().equals("int") )
+        			return "Int("+var+")";
+        		return var;
+        }
+        String swiftType = swiftTypeFor(type, false, false, true, false, true);
+        return isObjectType( type ) ?
+        		var + " != nil ? " + swiftType + "( javaObject: "+var+" ) : nil" :
+            "JNIType.toSwift( type: "+swiftType+".self, from: "+var+consume+" )";
     }
 
-    String argsFor( Executable e, boolean anon, boolean named ) {
-    	return argsFor( e, anon, named, null );
+    boolean isObjectType( Class<?> type ) {
+        return !type.isPrimitive() && !type.isArray() && !java.util.Map.class.isAssignableFrom(type);
+    }
+    
+    boolean isEnum( Class<?> type ) {
+    		return convertEnums && type.isEnum() && !isUnavailable( type );
     }
 
     String argsFor( Executable e, boolean anon, boolean named, Method interfaceMethod ) {
-    	String args = "";
-    	for ( int i=0 ; i<e.getParameterCount() ; i++ ) {
-    		Parameter param = e.getParameters()[i];
-    		String name = interfaceMethod != null ? interfaceMethod.getParameters()[i].getName() : param.getName();
-    		args += (args == "" ? " " : ", ") + (named?"":"_ _")+
-    				(anon?"arg":safe(name)) + ": " + 
-					swiftTypeFor( param.getType(), true, anon, true, true );
-    	}
-    	return args == "" ? "" : args+" ";
-    }
- 
-    boolean notVoid( Class<?> returnType ) {
-    	return !returnType.getName().equals("void");
+        String args = "";
+        for ( int i=0 ; i<e.getParameterCount() ; i++ ) {
+            Parameter param = e.getParameters()[i];
+            String name = interfaceMethod != null ? interfaceMethod.getParameters()[i].getName() : param.getName();
+            args += (args == "" ? " " : ", ") + (named?"":"_ _")+
+                    (anon?"arg":safe(name)) + ": " +
+                    swiftTypeFor( param.getType(), true, anon, true, true, false );
+        }
+        return args == "" ? "" : args+" ";
     }
 
-    static HashMap<String,Boolean> swiftKeywords = new HashMap<String,Boolean>() {
-		private static final long serialVersionUID = 1L;
-
-		{
-    		put( "init", true );
-    		put( "self", true );
-    		put( "new", true );
-    		put( "in", true );
-    		put( "is", true );
-    		put( "operator", true );
-    		put( "subscript", true );
-    		put( "where", true );
-    		put( "as", true );
-    	}
-    };
+    boolean notVoid( Class<?> returnType ) {
+        return !returnType.getName().equals("void");
+    }
 
     String safe( String name ) {
-	   return (swiftKeywords.containsKey(name)?"_":"")+name.replace('$','_');
+       return (swiftKeywords.containsKey(name)?"_":"")+name.replace('$','_');
     }
 
-    String swiftSignatureFor( Method method, boolean isProtocol, boolean anon, boolean named ) {
-        return swiftSignatureFor( method, isProtocol, anon, named, null );
-    }
- 
     String swiftSignatureFor( Method method, boolean isProtocol, boolean anon, boolean named, Method interfaceMethod ) {
-    	String ret = "";
-    	if ( method.getExceptionTypes().length != 0 ) {
-    		String exceptions = "";
-    		for ( Class<?> exception : method.getExceptionTypes() )
-    			exceptions += (exceptions==""?"":", ") + exception.getName();
-    		ret += " throws /* "+exceptions+" */";
-
-    	}
-    	Class<?> returnType = method.getReturnType();
-    	if ( notVoid( returnType ) && !anon )
-    		ret += " -> " + swiftTypeFor( returnType, true, false );
-    	boolean isStatic = Modifier.isStatic(method.getModifiers());
-    	return (isProtocol ? "" : visibility)+(isStatic ? "class ": "")+
-    			"func "+safe(method.getName())+"("+argsFor(  method, anon, named, interfaceMethod )+")" + ret;
-    }
- 
-    boolean fieldOverride(Field f, Class<?> superclazz) {
-		if (superclazz == null)
-			return false;
-		if (f.getName().equals("serialVersionUID"))
-			return true;
-    	try {
-    		return superclazz.getField(f.getName()) != null;
-    	}
-    	catch ( NoSuchFieldException e ) {
-    		return false;
-    	}
-    }
-
-    Constructor<?> constructorOverride(Constructor<?> c, Class<?> superclazz) {
-		if (superclazz == null)
-			return null;
-		Class<?> types[] = c.getParameterTypes();
-		//print(""+types.length);
-
-		try {
-			switch (types.length) {
-			case 0:
-				return superclazz.getConstructor();
-			case 1:
-				return superclazz.getConstructor(types[0]);
-			case 2:
-				return superclazz.getConstructor(types[0], types[1]);
-			case 3:
-				return superclazz.getConstructor(types[0], types[1], types[2]);
-			case 4:
-				return superclazz.getConstructor(types[0], types[1], types[2], types[3]);
-			case 5:
-				return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4]);
-			case 6:
-				return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4], types[5]);
-			case 7:
-				return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4], types[5],types[6]);
-			case 8:
-				return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7]);
-			case 9:
-				return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7], types[8]);
-			case 10:
-				return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7], types[8], types[9]);
-			default:
-				return null;
-			}
-		} catch (NoSuchMethodException e) {
-			return null;
-		}
-	}
-
-	Method funcOverride(Method m, Class<?> superclazz) {
-		if (superclazz == null)
-			return null;
-		String name = m.getName();
-		Class<?> types[] = m.getParameterTypes();
-		if ( types.length == 0 && name.equals("registerNatives") )
-			return null;////
-		try {
-			switch (types.length) {
-			case 0:
-				return superclazz.getMethod(name);
-			case 1:
-				return superclazz.getMethod(name, types[0]);
-			case 2:
-				return superclazz.getMethod(name, types[0], types[1]);
-			case 3:
-				return superclazz.getMethod(name, types[0], types[1], types[2]);
-			case 4:
-				return superclazz.getMethod(name, types[0], types[1], types[2], types[3]);
-			case 5:
-				return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4]);
-			case 6:
-				return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4], types[5]);
-			case 7:
-				return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4], types[5],types[6]);
-			case 8:
-				return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7]);
-			case 9:
-				return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7], types[8]);
-			case 10:
-				return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7], types[8], types[9]);
-			default:
-				return null;
-			}
-		} catch (NoSuchMethodException e) {
-			return null;
-		}
-	}
+        String ret = "";
+        if ( method.getExceptionTypes().length != 0 ) {
+            String exceptions = "";
+            for ( Class<?> exception : method.getExceptionTypes() )
+                exceptions += (exceptions==""?"":", ") + exception.getName();
+            ret += " throws /* "+exceptions+" */";
+        }
+        Class<?> returnType = method.getReturnType();
+        if ( notVoid( returnType ) && !anon )
+            ret += " -> " + swiftTypeFor( returnType, true, false );
+        boolean isStatic = Modifier.isStatic(method.getModifiers());
+        return (isProtocol ? "" : isEnum ? "public " : visibility)+(isStatic ? isEnum ? "static " : "class ": "")+
+                "func "+safe(method.getName())+"("+argsFor(  method, anon, named, interfaceMethod )+")" + ret;
+    }
 
     String swiftTypeFor( Class<?> type, boolean isReturn, boolean anon ) {
-    	return swiftTypeFor( type, isReturn, anon, true, false );
-    }
-
-    String swiftTypeFor( Class<?> type, boolean isReturn, boolean anon, boolean prefix, boolean isArg ) {
-    	String decl = swiftTypes.get(type.getName());
-    	if ( decl == null )
-    		if(type.isArray()) {
-        		String left = "[", right = "]";
-      			Class<?> elementType = type.getComponentType();
-    			while ( elementType.isArray() ) {
-    				elementType = elementType.getComponentType();
-    				left += "[";
-    				right += "]";
-    			}
-    			String nativeType = arrayTypes.get( elementType.getName() );
-    			if ( nativeType != null )
-    				decl = nativeType;
-    			else
-    				decl = classTypeFor( elementType, anon, false );
+        return swiftTypeFor( type, isReturn, anon, true, false, false );
+    }
 
-        		decl = (isReturn || true ? "" : "inout ") + left + decl + right;
-    		}
-    		else
-    			decl = classTypeFor( type, anon, prefix );
+    String swiftTypeFor( Class<?> type, boolean isReturn, boolean anon, boolean prefix, boolean isArg, boolean addForward ) {
+        String decl = swiftTypes.get(type.getName());
+        if ( decl == null ) {
+            if(type.isArray()) {
+                String left = "[", right = "]";
+                Class<?> elementType = type.getComponentType();
+
+                while ( elementType.isArray() ) {
+                    elementType = elementType.getComponentType();
+                    left += "[";
+                    right += "]";
+                }
+
+                String nativeType = arrayTypes.get( elementType.getName() );
+                if ( nativeType != null )
+                    decl = nativeType;
+                else
+                    decl = classTypeFor( elementType, anon, false );
+
+                if ( addForward && elementType.isInterface() )
+                        decl += "Forward";
+
+                decl = (isReturn || true ? "" : "inout ") + left + decl + right;
+            }
+            else if ( java.util.Map.class.isAssignableFrom(type) ) {
+                    try {
+                        java.lang.reflect.Method method = type.getDeclaredMethod("valueClass");
+                        Class<?> vtype = (Class<?>) method.invoke(type);
+                        decl = "[String:"+swiftTypeFor(vtype, false, anon, true, false, addForward)+"]";
+                    }
+                    catch (Exception e) {
+                        decl = classTypeFor( type, anon, prefix );
+                        if ( addForward && type.isInterface() )
+                                decl += "Forward";
+                    }
+                }
+            else {
+                decl = classTypeFor( type, anon, prefix );
+                if ( addForward && type.isInterface() )
+                        decl += "Forward";
+            }
+        }
 
-    	return decl + (isReturn && !type.isPrimitive() /*&& !isListener*/ ? isArg && type != java.lang.Float.class ? "?" : "!" : "");
+        return decl + (isReturn && !type.isPrimitive() ?
+        		isArg && type != java.lang.Float.class || !returnImplicitlyUnwrapped ? "?" : "!" : "");
     }
 
     String classTypeFor( Class<?> type, boolean anon, boolean prefix ) {
-    	String typeName = type.getName();
-    	String className = classSuffix( typeName );
-    	String frameworkPrefix = classPrefix( typeName );
-    	
-    	crossReference( currentFramework, frameworkPrefix );
-
-    	if ( lostType( type ) || excludeFromCodeGeneration( type ) ) {
-    		unclassedReferences++;
-    		return (anon?"":"/* "+typeName+" */ ") + Unclassed + (type.isInterface()?"Protocol":"Object");
-    	}
-
-    	if ( !frameworkPrefix.equals(currentFramework) && !type.isPrimitive() ) {
-    		if ( !referencedFrameworks.containsKey( frameworkPrefix ) ) {
-    			frameworkImports += "import "+frameworkPrefix+"\n";
-    			referencedFrameworks.put(frameworkPrefix, true);
-    		}
-    		if ( prefix )
-    			className = frameworkPrefix + "." + className;
-    	}
-    	return className;
+        String typeName = type.getName();
+        String className = classSuffix( typeName );
+        String frameworkPrefix = classPrefix( typeName );
+
+        crossReference( currentFramework, frameworkPrefix );
+
+        if ( lostType( type ) || excludeFromCodeGeneration( type ) ) {
+            UnavailableReferences++;
+            return (anon?"":"/* "+type+" */ ") + Unavailable + (type.isEnum() ? "Enum" : type.isInterface() ? "Protocol" : "Object");
+        }
+
+        if ( !frameworkPrefix.equals(currentFramework) && !type.isPrimitive() ) {
+            if ( !referencedFrameworks.containsKey( frameworkPrefix ) ) {
+                    if ( !frameworkPrefix.equals("java_swift") )
+                        frameworkImports += "import "+frameworkPrefix+"\n";
+                referencedFrameworks.put(frameworkPrefix, true);
+            }
+            if ( prefix )
+                className = frameworkPrefix + "." + className;
+        }
+        return className;
     }
 
     boolean lostType( Class<?> type ) {
-    	return forwardReference( currentFramework, classPrefix( type.getName() ) );
+        return !type.isArray() && forwardReference( currentFramework, classPrefix( type.getName() ) );
     }
 
     static int prefixLength( String className ) {
         int firstDot = className.indexOf( '.' );
         if ( firstDot == -1 )
-        	return -1;
+            return -1;
         int secondDot = className.indexOf( '.', firstDot+1 );
         return secondDot == -1 ? firstDot : secondDot;
     }
 
     static String classPrefix( String className ) {
-    	int  prefixLength = prefixLength( className );
-    	if ( prefixLength == -1 )
-        	return "java_lang";
+        int  prefixLength = prefixLength( className );
+        if ( prefixLength == -1 )
+            return "java_lang";
+        if ( keyClasses.containsKey(className) )
+            return "java_swift";
         return className.substring( 0, prefixLength ).replace( '.', '_' );
     }
 
@@ -1418,18 +1595,244 @@ static String classSuffix( String className ) {
         String classSuffix = className.substring( suffixIndex ).replace('$', '_');
 
         if ( swiftReserved.containsKey(className) )
-        	classSuffix = "Java" + classSuffix;
+            classSuffix = "Java" + classSuffix;
 
         String allocated = allocatedSuffies.get( classSuffix );
         if ( allocated != null && !allocated.equals(className) ) {
-        	int  prefixLength = prefixLength( className );
+            int  prefixLength = prefixLength( className );
             String other = className.substring( prefixLength+1, suffixIndex );
-        	return other.replace('.', '_') + classSuffix;
+            return other.replace('.', '_') + classSuffix;
         }
 
         if ( allocated == null )
-        	allocatedSuffies.put( classSuffix, className );
+            allocatedSuffies.put( classSuffix, className );
         return classSuffix;
     }
 
+    static HashMap<String,HashMap<String,Integer>> crossReferences = new HashMap<String,HashMap<String,Integer>>();
+    static HashMap<String,Boolean> knownAdditionalFrameworks = new HashMap<String,Boolean>();
+    static HashMap<String,Integer> frameworkLevels = new HashMap<String,Integer>();
+    static ArrayList<String> additionalFrameworks = new ArrayList<String>();
+
+    static boolean forwardReference( String currentFramework, String framework ) {
+        Integer level = frameworkLevels.get( framework );
+        if ( level == null )
+            return true;
+        return level > frameworkLevels.get( currentFramework );
+    }
+
+
+    static void crossReference( String from, String to ) {
+        if ( !crossReferences.containsKey( from ) )
+            crossReferences.put( from, new HashMap<String,Integer>() );
+        if ( !crossReferences.get( from ).containsKey( to ) )
+            crossReferences.get( from ).put( to, 0 );
+        crossReferences.get(from).put(to,crossReferences.get(from).get(to)+1);
+    }
+
+    static int references( String from, String to ) {
+        if ( !crossReferences.containsKey(from) || !crossReferences.get(from).containsKey(to) )
+            return 0;
+        return crossReferences.get(from).get(to);
+    }
+
+    boolean fieldOverride(Field f, Class<?> superclazz) {
+        if (superclazz == null)
+            return false;
+        if (f.getName().equals("serialVersionUID"))
+            return true;
+        try {
+            return superclazz.getField(f.getName()) != null;
+        }
+        catch ( NoSuchFieldException e ) {
+            return false;
+        }
+    }
+
+    java.lang.reflect.Constructor<?> constructorOverride(java.lang.reflect.Constructor<?> c, Class<?> superclazz) {
+        if (superclazz == null)
+            return null;
+        Class<?> types[] = c.getParameterTypes();
+
+        try {
+            switch (types.length) {
+            case 0:
+                return superclazz.getConstructor();
+            case 1:
+                return superclazz.getConstructor(types[0]);
+            case 2:
+                return superclazz.getConstructor(types[0], types[1]);
+            case 3:
+                return superclazz.getConstructor(types[0], types[1], types[2]);
+            case 4:
+                return superclazz.getConstructor(types[0], types[1], types[2], types[3]);
+            case 5:
+                return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4]);
+            case 6:
+                return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4], types[5]);
+            case 7:
+                return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4], types[5],types[6]);
+            case 8:
+                return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7]);
+            case 9:
+                return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7], types[8]);
+            case 10:
+                return superclazz.getConstructor(types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7], types[8], types[9]);
+            default:
+                return null;
+            }
+        } catch (NoSuchMethodException e) {
+            return null;
+        }
+    }
+
+    java.lang.reflect.Method funcOverride(java.lang.reflect.Method m, Class<?> superclazz) {
+        if (superclazz == null)
+            return null;
+        String name = m.getName();
+        Class<?> types[] = m.getParameterTypes();
+        if ( types.length == 0 && name.equals("registerNatives") )
+            return null;////
+        try {
+            switch (types.length) {
+            case 0:
+                return superclazz.getMethod(name);
+            case 1:
+                return superclazz.getMethod(name, types[0]);
+            case 2:
+                return superclazz.getMethod(name, types[0], types[1]);
+            case 3:
+                return superclazz.getMethod(name, types[0], types[1], types[2]);
+            case 4:
+                return superclazz.getMethod(name, types[0], types[1], types[2], types[3]);
+            case 5:
+                return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4]);
+            case 6:
+                return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4], types[5]);
+            case 7:
+                return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4], types[5],types[6]);
+            case 8:
+                return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7]);
+            case 9:
+                return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7], types[8]);
+            case 10:
+                return superclazz.getMethod(name, types[0], types[1], types[2], types[3], types[4], types[5], types[6],types[7], types[8], types[9]);
+            default:
+                return null;
+            }
+        } catch (NoSuchMethodException e) {
+            return null;
+        }
+    }
+
+    // for compatibility with JDK < 1.8
+
+    static class Parameter {
+        Executable executable;
+        int number;
+
+        public Class<?> getType() {
+            return executable.constructor != null ?
+                    executable.constructor.getParameterTypes()[number] :
+                    executable.method.getParameterTypes()[number];
+        }
+
+        public String getName() {
+            return executable.parameterNames != null ?
+                    executable.parameterNames[number] : "arg"+number;
+        }
+    }
+
+    static class Executable {
+        java.lang.reflect.Constructor<?> constructor;
+        java.lang.reflect.Method method;
+        Parameter parameters[];
+        String parameterNames[];
+
+        public int getModifiers() {
+            return constructor != null ?
+                    constructor.getModifiers() :
+                    method.getModifiers();
+        }
+
+        public int getParameterCount() {
+            return constructor != null ?
+                    constructor.getParameterTypes().length :
+                    method.getParameterTypes().length;
+        }
+
+        public Parameter [] getParameters() {
+            if ( parameters == null ) {
+                int size = getParameterCount();
+                parameters = new Parameter[size];
+                if ( size != 0 ) {
+                    for ( int i=0 ; i<size ; i++ ) {
+                        Parameter next = parameters[i] = new Parameter();
+                        next.executable = this;
+                        next.number = i;
+                    }
+
+                    try {
+                        Object executable = constructor != null ? constructor : method;
+                        Class<?> executableClass = executable.getClass();
+                        java.lang.reflect.Method paramsMethod = executableClass.getMethod("getParameters", new Class<?>[] {});
+
+                        Object realParameters[] = (Object []) paramsMethod.invoke(executable, new Object[] {});
+                        Class<?> parametersClass = realParameters[0].getClass();
+                        java.lang.reflect.Method nameMethod = parametersClass.getMethod("getName", new Class<?>[] {});
+
+                        parameterNames = new String[size];
+                        for ( int i=0 ; i<size ; i++ )
+                            parameterNames[i] = (String) nameMethod.invoke(realParameters[i], new Object[] {});
+                    }
+                    catch ( Exception e ) {
+                    }
+                }
+            }
+            return parameters;
+        }
+
+        public Class<?> [] getExceptionTypes() {
+            return constructor != null ?
+                    constructor.getExceptionTypes() :
+                    method.getExceptionTypes();
+        }
+
+    }
+
+    static class Constructor<aClass> extends Executable {
+        public String toString() {
+            return constructor.toString();
+        }
+    }
+
+    @SuppressWarnings("rawtypes")
+    static Constructor<?> newConstructor( java.lang.reflect.Constructor<?> constructor ) {
+        if ( constructor == null )
+            return null;
+        Constructor<?> proxy = new Constructor();
+        proxy.constructor = constructor;
+        return proxy;
+    }
+
+    static class Method extends Executable {
+        public String getName() {
+            return method.getName();
+        }
+        public Class<?> getReturnType() {
+            return method.getReturnType();
+        }
+        public String toString() {
+            return method.toString();
+        }
+    }
+
+    static Method newMethod( java.lang.reflect.Method method ) {
+        if ( method == null )
+            return null;
+        Method proxy = new Method();
+        proxy.method = method;
+        return proxy;
+    }
+
 }
diff --git a/src/org/genie/com_apple/AboutHandlerProxy.java b/src/org/genie/com_apple/AboutHandlerProxy.java
deleted file mode 100644
index a83789f..0000000
--- a/src/org/genie/com_apple/AboutHandlerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface com.apple.eawt.AboutHandler ///
-
-package org.genie.com_apple;
-
-public class AboutHandlerProxy implements com.apple.eawt.AboutHandler {
-
-    long swiftObject;
-
-    AboutHandlerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.AboutHandler.handleAbout(com.apple.eawt.AppEvent$AboutEvent)
-
-    public native void __handleAbout( com.apple.eawt.AppEvent.AboutEvent arg0 );
-
-    public void handleAbout( com.apple.eawt.AppEvent.AboutEvent arg0 ) {
-        __handleAbout( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/AppEventListenerProxy.java b/src/org/genie/com_apple/AppEventListenerProxy.java
deleted file mode 100644
index 33c30a4..0000000
--- a/src/org/genie/com_apple/AppEventListenerProxy.java
+++ /dev/null
@@ -1,14 +0,0 @@
-
-/// interface com.apple.eawt.AppEventListener ///
-
-package org.genie.com_apple;
-
-public class AppEventListenerProxy implements com.apple.eawt.AppEventListener {
-
-    long swiftObject;
-
-    AppEventListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-}
diff --git a/src/org/genie/com_apple/AppForegroundListenerProxy.java b/src/org/genie/com_apple/AppForegroundListenerProxy.java
deleted file mode 100644
index f6e49b5..0000000
--- a/src/org/genie/com_apple/AppForegroundListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface com.apple.eawt.AppForegroundListener ///
-
-package org.genie.com_apple;
-
-public class AppForegroundListenerProxy implements com.apple.eawt.AppForegroundListener {
-
-    long swiftObject;
-
-    AppForegroundListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.AppForegroundListener.appRaisedToForeground(com.apple.eawt.AppEvent$AppForegroundEvent)
-
-    public native void __appRaisedToForeground( com.apple.eawt.AppEvent.AppForegroundEvent arg0 );
-
-    public void appRaisedToForeground( com.apple.eawt.AppEvent.AppForegroundEvent arg0 ) {
-        __appRaisedToForeground( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.AppForegroundListener.appMovedToBackground(com.apple.eawt.AppEvent$AppForegroundEvent)
-
-    public native void __appMovedToBackground( com.apple.eawt.AppEvent.AppForegroundEvent arg0 );
-
-    public void appMovedToBackground( com.apple.eawt.AppEvent.AppForegroundEvent arg0 ) {
-        __appMovedToBackground( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/AppHiddenListenerProxy.java b/src/org/genie/com_apple/AppHiddenListenerProxy.java
deleted file mode 100644
index 066693a..0000000
--- a/src/org/genie/com_apple/AppHiddenListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface com.apple.eawt.AppHiddenListener ///
-
-package org.genie.com_apple;
-
-public class AppHiddenListenerProxy implements com.apple.eawt.AppHiddenListener {
-
-    long swiftObject;
-
-    AppHiddenListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.AppHiddenListener.appHidden(com.apple.eawt.AppEvent$AppHiddenEvent)
-
-    public native void __appHidden( com.apple.eawt.AppEvent.AppHiddenEvent arg0 );
-
-    public void appHidden( com.apple.eawt.AppEvent.AppHiddenEvent arg0 ) {
-        __appHidden( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.AppHiddenListener.appUnhidden(com.apple.eawt.AppEvent$AppHiddenEvent)
-
-    public native void __appUnhidden( com.apple.eawt.AppEvent.AppHiddenEvent arg0 );
-
-    public void appUnhidden( com.apple.eawt.AppEvent.AppHiddenEvent arg0 ) {
-        __appUnhidden( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/AppReOpenedListenerProxy.java b/src/org/genie/com_apple/AppReOpenedListenerProxy.java
deleted file mode 100644
index c4c3c6f..0000000
--- a/src/org/genie/com_apple/AppReOpenedListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface com.apple.eawt.AppReOpenedListener ///
-
-package org.genie.com_apple;
-
-public class AppReOpenedListenerProxy implements com.apple.eawt.AppReOpenedListener {
-
-    long swiftObject;
-
-    AppReOpenedListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.AppReOpenedListener.appReOpened(com.apple.eawt.AppEvent$AppReOpenedEvent)
-
-    public native void __appReOpened( com.apple.eawt.AppEvent.AppReOpenedEvent arg0 );
-
-    public void appReOpened( com.apple.eawt.AppEvent.AppReOpenedEvent arg0 ) {
-        __appReOpened( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/ApplicationAdapterProxy.java b/src/org/genie/com_apple/ApplicationAdapterProxy.java
deleted file mode 100644
index 4498cd4..0000000
--- a/src/org/genie/com_apple/ApplicationAdapterProxy.java
+++ /dev/null
@@ -1,180 +0,0 @@
-
-/// class com.apple.eawt.ApplicationAdapter ///
-
-package org.genie.com_apple;
-
-public class ApplicationAdapterProxy extends com.apple.eawt.ApplicationAdapter {
-
-    long swiftObject;
-
-    /// public com.apple.eawt.ApplicationAdapter()
-
-    ApplicationAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void com.apple.eawt.ApplicationAdapter.handleAbout(com.apple.eawt.ApplicationEvent)
-
-    public native void __handleAbout( com.apple.eawt.ApplicationEvent arg0 );
-
-    boolean entered_handleAbout_0;
-
-    public void handleAbout( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handleAbout_0 ) {
-            entered_handleAbout_0 = true;
-            __handleAbout( arg0 );
-            entered_handleAbout_0 = false;
-        }
-        else
-            super.handleAbout( arg0 );
-    }
-
-    /// public void com.apple.eawt.ApplicationAdapter.handlePreferences(com.apple.eawt.ApplicationEvent)
-
-    public native void __handlePreferences( com.apple.eawt.ApplicationEvent arg0 );
-
-    boolean entered_handlePreferences_1;
-
-    public void handlePreferences( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handlePreferences_1 ) {
-            entered_handlePreferences_1 = true;
-            __handlePreferences( arg0 );
-            entered_handlePreferences_1 = false;
-        }
-        else
-            super.handlePreferences( arg0 );
-    }
-
-    /// public void com.apple.eawt.ApplicationAdapter.handleOpenApplication(com.apple.eawt.ApplicationEvent)
-
-    public native void __handleOpenApplication( com.apple.eawt.ApplicationEvent arg0 );
-
-    boolean entered_handleOpenApplication_2;
-
-    public void handleOpenApplication( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handleOpenApplication_2 ) {
-            entered_handleOpenApplication_2 = true;
-            __handleOpenApplication( arg0 );
-            entered_handleOpenApplication_2 = false;
-        }
-        else
-            super.handleOpenApplication( arg0 );
-    }
-
-    /// public void com.apple.eawt.ApplicationAdapter.handleOpenFile(com.apple.eawt.ApplicationEvent)
-
-    public native void __handleOpenFile( com.apple.eawt.ApplicationEvent arg0 );
-
-    boolean entered_handleOpenFile_3;
-
-    public void handleOpenFile( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handleOpenFile_3 ) {
-            entered_handleOpenFile_3 = true;
-            __handleOpenFile( arg0 );
-            entered_handleOpenFile_3 = false;
-        }
-        else
-            super.handleOpenFile( arg0 );
-    }
-
-    /// public void com.apple.eawt.ApplicationAdapter.handlePrintFile(com.apple.eawt.ApplicationEvent)
-
-    public native void __handlePrintFile( com.apple.eawt.ApplicationEvent arg0 );
-
-    boolean entered_handlePrintFile_4;
-
-    public void handlePrintFile( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handlePrintFile_4 ) {
-            entered_handlePrintFile_4 = true;
-            __handlePrintFile( arg0 );
-            entered_handlePrintFile_4 = false;
-        }
-        else
-            super.handlePrintFile( arg0 );
-    }
-
-    /// public void com.apple.eawt.ApplicationAdapter.handleQuit(com.apple.eawt.ApplicationEvent)
-
-    public native void __handleQuit( com.apple.eawt.ApplicationEvent arg0 );
-
-    boolean entered_handleQuit_5;
-
-    public void handleQuit( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handleQuit_5 ) {
-            entered_handleQuit_5 = true;
-            __handleQuit( arg0 );
-            entered_handleQuit_5 = false;
-        }
-        else
-            super.handleQuit( arg0 );
-    }
-
-    /// public void com.apple.eawt.ApplicationAdapter.handleReOpenApplication(com.apple.eawt.ApplicationEvent)
-
-    public native void __handleReOpenApplication( com.apple.eawt.ApplicationEvent arg0 );
-
-    boolean entered_handleReOpenApplication_6;
-
-    public void handleReOpenApplication( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handleReOpenApplication_6 ) {
-            entered_handleReOpenApplication_6 = true;
-            __handleReOpenApplication( arg0 );
-            entered_handleReOpenApplication_6 = false;
-        }
-        else
-            super.handleReOpenApplication( arg0 );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_7;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_7 ) {
-            entered_equals_7 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_7 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_8;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_8 ) {
-            entered_toString_8 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_8 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_9;
-
-    public int hashCode() {
-        if ( !entered_hashCode_9 ) {
-            entered_hashCode_9 = true;
-            int __return = __hashCode( );
-            entered_hashCode_9 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/com_apple/FullScreenAdapterProxy.java b/src/org/genie/com_apple/FullScreenAdapterProxy.java
deleted file mode 100644
index 49757aa..0000000
--- a/src/org/genie/com_apple/FullScreenAdapterProxy.java
+++ /dev/null
@@ -1,132 +0,0 @@
-
-/// class com.apple.eawt.FullScreenAdapter ///
-
-package org.genie.com_apple;
-
-public class FullScreenAdapterProxy extends com.apple.eawt.FullScreenAdapter {
-
-    long swiftObject;
-
-    /// public com.apple.eawt.FullScreenAdapter()
-
-    FullScreenAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void com.apple.eawt.FullScreenAdapter.windowEnteringFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
-
-    public native void __windowEnteringFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 );
-
-    boolean entered_windowEnteringFullScreen_0;
-
-    public void windowEnteringFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
-        if ( !entered_windowEnteringFullScreen_0 ) {
-            entered_windowEnteringFullScreen_0 = true;
-            __windowEnteringFullScreen( arg0 );
-            entered_windowEnteringFullScreen_0 = false;
-        }
-        else
-            super.windowEnteringFullScreen( arg0 );
-    }
-
-    /// public void com.apple.eawt.FullScreenAdapter.windowEnteredFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
-
-    public native void __windowEnteredFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 );
-
-    boolean entered_windowEnteredFullScreen_1;
-
-    public void windowEnteredFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
-        if ( !entered_windowEnteredFullScreen_1 ) {
-            entered_windowEnteredFullScreen_1 = true;
-            __windowEnteredFullScreen( arg0 );
-            entered_windowEnteredFullScreen_1 = false;
-        }
-        else
-            super.windowEnteredFullScreen( arg0 );
-    }
-
-    /// public void com.apple.eawt.FullScreenAdapter.windowExitingFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
-
-    public native void __windowExitingFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 );
-
-    boolean entered_windowExitingFullScreen_2;
-
-    public void windowExitingFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
-        if ( !entered_windowExitingFullScreen_2 ) {
-            entered_windowExitingFullScreen_2 = true;
-            __windowExitingFullScreen( arg0 );
-            entered_windowExitingFullScreen_2 = false;
-        }
-        else
-            super.windowExitingFullScreen( arg0 );
-    }
-
-    /// public void com.apple.eawt.FullScreenAdapter.windowExitedFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
-
-    public native void __windowExitedFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 );
-
-    boolean entered_windowExitedFullScreen_3;
-
-    public void windowExitedFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
-        if ( !entered_windowExitedFullScreen_3 ) {
-            entered_windowExitedFullScreen_3 = true;
-            __windowExitedFullScreen( arg0 );
-            entered_windowExitedFullScreen_3 = false;
-        }
-        else
-            super.windowExitedFullScreen( arg0 );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_4;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_4 ) {
-            entered_equals_4 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_4 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_5;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_5 ) {
-            entered_toString_5 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_5 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_6;
-
-    public int hashCode() {
-        if ( !entered_hashCode_6 ) {
-            entered_hashCode_6 = true;
-            int __return = __hashCode( );
-            entered_hashCode_6 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/com_apple/FullScreenListenerProxy.java b/src/org/genie/com_apple/FullScreenListenerProxy.java
deleted file mode 100644
index 145038b..0000000
--- a/src/org/genie/com_apple/FullScreenListenerProxy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/// interface com.apple.eawt.FullScreenListener ///
-
-package org.genie.com_apple;
-
-public class FullScreenListenerProxy implements com.apple.eawt.FullScreenListener {
-
-    long swiftObject;
-
-    FullScreenListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.FullScreenListener.windowEnteringFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
-
-    public native void __windowEnteringFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 );
-
-    public void windowEnteringFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
-        __windowEnteringFullScreen( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.FullScreenListener.windowEnteredFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
-
-    public native void __windowEnteredFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 );
-
-    public void windowEnteredFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
-        __windowEnteredFullScreen( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.FullScreenListener.windowExitingFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
-
-    public native void __windowExitingFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 );
-
-    public void windowExitingFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
-        __windowExitingFullScreen( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.FullScreenListener.windowExitedFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
-
-    public native void __windowExitedFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 );
-
-    public void windowExitedFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
-        __windowExitedFullScreen( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/GestureAdapterProxy.java b/src/org/genie/com_apple/GestureAdapterProxy.java
deleted file mode 100644
index 036f040..0000000
--- a/src/org/genie/com_apple/GestureAdapterProxy.java
+++ /dev/null
@@ -1,196 +0,0 @@
-
-/// class com.apple.eawt.event.GestureAdapter ///
-
-package org.genie.com_apple;
-
-public class GestureAdapterProxy extends com.apple.eawt.event.GestureAdapter {
-
-    long swiftObject;
-
-    /// public com.apple.eawt.event.GestureAdapter()
-
-    GestureAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void com.apple.eawt.event.GestureAdapter.rotate(com.apple.eawt.event.RotationEvent)
-
-    public native void __rotate( com.apple.eawt.event.RotationEvent arg0 );
-
-    boolean entered_rotate_0;
-
-    public void rotate( com.apple.eawt.event.RotationEvent arg0 ) {
-        if ( !entered_rotate_0 ) {
-            entered_rotate_0 = true;
-            __rotate( arg0 );
-            entered_rotate_0 = false;
-        }
-        else
-            super.rotate( arg0 );
-    }
-
-    /// public void com.apple.eawt.event.GestureAdapter.gestureBegan(com.apple.eawt.event.GesturePhaseEvent)
-
-    public native void __gestureBegan( com.apple.eawt.event.GesturePhaseEvent arg0 );
-
-    boolean entered_gestureBegan_1;
-
-    public void gestureBegan( com.apple.eawt.event.GesturePhaseEvent arg0 ) {
-        if ( !entered_gestureBegan_1 ) {
-            entered_gestureBegan_1 = true;
-            __gestureBegan( arg0 );
-            entered_gestureBegan_1 = false;
-        }
-        else
-            super.gestureBegan( arg0 );
-    }
-
-    /// public void com.apple.eawt.event.GestureAdapter.gestureEnded(com.apple.eawt.event.GesturePhaseEvent)
-
-    public native void __gestureEnded( com.apple.eawt.event.GesturePhaseEvent arg0 );
-
-    boolean entered_gestureEnded_2;
-
-    public void gestureEnded( com.apple.eawt.event.GesturePhaseEvent arg0 ) {
-        if ( !entered_gestureEnded_2 ) {
-            entered_gestureEnded_2 = true;
-            __gestureEnded( arg0 );
-            entered_gestureEnded_2 = false;
-        }
-        else
-            super.gestureEnded( arg0 );
-    }
-
-    /// public void com.apple.eawt.event.GestureAdapter.magnify(com.apple.eawt.event.MagnificationEvent)
-
-    public native void __magnify( com.apple.eawt.event.MagnificationEvent arg0 );
-
-    boolean entered_magnify_3;
-
-    public void magnify( com.apple.eawt.event.MagnificationEvent arg0 ) {
-        if ( !entered_magnify_3 ) {
-            entered_magnify_3 = true;
-            __magnify( arg0 );
-            entered_magnify_3 = false;
-        }
-        else
-            super.magnify( arg0 );
-    }
-
-    /// public void com.apple.eawt.event.GestureAdapter.swipedDown(com.apple.eawt.event.SwipeEvent)
-
-    public native void __swipedDown( com.apple.eawt.event.SwipeEvent arg0 );
-
-    boolean entered_swipedDown_4;
-
-    public void swipedDown( com.apple.eawt.event.SwipeEvent arg0 ) {
-        if ( !entered_swipedDown_4 ) {
-            entered_swipedDown_4 = true;
-            __swipedDown( arg0 );
-            entered_swipedDown_4 = false;
-        }
-        else
-            super.swipedDown( arg0 );
-    }
-
-    /// public void com.apple.eawt.event.GestureAdapter.swipedLeft(com.apple.eawt.event.SwipeEvent)
-
-    public native void __swipedLeft( com.apple.eawt.event.SwipeEvent arg0 );
-
-    boolean entered_swipedLeft_5;
-
-    public void swipedLeft( com.apple.eawt.event.SwipeEvent arg0 ) {
-        if ( !entered_swipedLeft_5 ) {
-            entered_swipedLeft_5 = true;
-            __swipedLeft( arg0 );
-            entered_swipedLeft_5 = false;
-        }
-        else
-            super.swipedLeft( arg0 );
-    }
-
-    /// public void com.apple.eawt.event.GestureAdapter.swipedRight(com.apple.eawt.event.SwipeEvent)
-
-    public native void __swipedRight( com.apple.eawt.event.SwipeEvent arg0 );
-
-    boolean entered_swipedRight_6;
-
-    public void swipedRight( com.apple.eawt.event.SwipeEvent arg0 ) {
-        if ( !entered_swipedRight_6 ) {
-            entered_swipedRight_6 = true;
-            __swipedRight( arg0 );
-            entered_swipedRight_6 = false;
-        }
-        else
-            super.swipedRight( arg0 );
-    }
-
-    /// public void com.apple.eawt.event.GestureAdapter.swipedUp(com.apple.eawt.event.SwipeEvent)
-
-    public native void __swipedUp( com.apple.eawt.event.SwipeEvent arg0 );
-
-    boolean entered_swipedUp_7;
-
-    public void swipedUp( com.apple.eawt.event.SwipeEvent arg0 ) {
-        if ( !entered_swipedUp_7 ) {
-            entered_swipedUp_7 = true;
-            __swipedUp( arg0 );
-            entered_swipedUp_7 = false;
-        }
-        else
-            super.swipedUp( arg0 );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_8;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_8 ) {
-            entered_equals_8 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_8 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_9;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_9 ) {
-            entered_toString_9 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_9 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_10;
-
-    public int hashCode() {
-        if ( !entered_hashCode_10 ) {
-            entered_hashCode_10 = true;
-            int __return = __hashCode( );
-            entered_hashCode_10 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/com_apple/GestureListenerProxy.java b/src/org/genie/com_apple/GestureListenerProxy.java
deleted file mode 100644
index 62fc0df..0000000
--- a/src/org/genie/com_apple/GestureListenerProxy.java
+++ /dev/null
@@ -1,14 +0,0 @@
-
-/// interface com.apple.eawt.event.GestureListener ///
-
-package org.genie.com_apple;
-
-public class GestureListenerProxy implements com.apple.eawt.event.GestureListener {
-
-    long swiftObject;
-
-    GestureListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-}
diff --git a/src/org/genie/com_apple/GesturePhaseListenerProxy.java b/src/org/genie/com_apple/GesturePhaseListenerProxy.java
deleted file mode 100644
index b7f76b9..0000000
--- a/src/org/genie/com_apple/GesturePhaseListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface com.apple.eawt.event.GesturePhaseListener ///
-
-package org.genie.com_apple;
-
-public class GesturePhaseListenerProxy implements com.apple.eawt.event.GesturePhaseListener {
-
-    long swiftObject;
-
-    GesturePhaseListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.event.GesturePhaseListener.gestureBegan(com.apple.eawt.event.GesturePhaseEvent)
-
-    public native void __gestureBegan( com.apple.eawt.event.GesturePhaseEvent arg0 );
-
-    public void gestureBegan( com.apple.eawt.event.GesturePhaseEvent arg0 ) {
-        __gestureBegan( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.event.GesturePhaseListener.gestureEnded(com.apple.eawt.event.GesturePhaseEvent)
-
-    public native void __gestureEnded( com.apple.eawt.event.GesturePhaseEvent arg0 );
-
-    public void gestureEnded( com.apple.eawt.event.GesturePhaseEvent arg0 ) {
-        __gestureEnded( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/MagnificationListenerProxy.java b/src/org/genie/com_apple/MagnificationListenerProxy.java
deleted file mode 100644
index 2c65506..0000000
--- a/src/org/genie/com_apple/MagnificationListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface com.apple.eawt.event.MagnificationListener ///
-
-package org.genie.com_apple;
-
-public class MagnificationListenerProxy implements com.apple.eawt.event.MagnificationListener {
-
-    long swiftObject;
-
-    MagnificationListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.event.MagnificationListener.magnify(com.apple.eawt.event.MagnificationEvent)
-
-    public native void __magnify( com.apple.eawt.event.MagnificationEvent arg0 );
-
-    public void magnify( com.apple.eawt.event.MagnificationEvent arg0 ) {
-        __magnify( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/OpenFilesHandlerProxy.java b/src/org/genie/com_apple/OpenFilesHandlerProxy.java
deleted file mode 100644
index 931845e..0000000
--- a/src/org/genie/com_apple/OpenFilesHandlerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface com.apple.eawt.OpenFilesHandler ///
-
-package org.genie.com_apple;
-
-public class OpenFilesHandlerProxy implements com.apple.eawt.OpenFilesHandler {
-
-    long swiftObject;
-
-    OpenFilesHandlerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.OpenFilesHandler.openFiles(com.apple.eawt.AppEvent$OpenFilesEvent)
-
-    public native void __openFiles( com.apple.eawt.AppEvent.OpenFilesEvent arg0 );
-
-    public void openFiles( com.apple.eawt.AppEvent.OpenFilesEvent arg0 ) {
-        __openFiles( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/OpenURIHandlerProxy.java b/src/org/genie/com_apple/OpenURIHandlerProxy.java
deleted file mode 100644
index 1c86e20..0000000
--- a/src/org/genie/com_apple/OpenURIHandlerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface com.apple.eawt.OpenURIHandler ///
-
-package org.genie.com_apple;
-
-public class OpenURIHandlerProxy implements com.apple.eawt.OpenURIHandler {
-
-    long swiftObject;
-
-    OpenURIHandlerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.OpenURIHandler.openURI(com.apple.eawt.AppEvent$OpenURIEvent)
-
-    public native void __openURI( com.apple.eawt.AppEvent.OpenURIEvent arg0 );
-
-    public void openURI( com.apple.eawt.AppEvent.OpenURIEvent arg0 ) {
-        __openURI( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/PreferencesHandlerProxy.java b/src/org/genie/com_apple/PreferencesHandlerProxy.java
deleted file mode 100644
index f109fce..0000000
--- a/src/org/genie/com_apple/PreferencesHandlerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface com.apple.eawt.PreferencesHandler ///
-
-package org.genie.com_apple;
-
-public class PreferencesHandlerProxy implements com.apple.eawt.PreferencesHandler {
-
-    long swiftObject;
-
-    PreferencesHandlerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.PreferencesHandler.handlePreferences(com.apple.eawt.AppEvent$PreferencesEvent)
-
-    public native void __handlePreferences( com.apple.eawt.AppEvent.PreferencesEvent arg0 );
-
-    public void handlePreferences( com.apple.eawt.AppEvent.PreferencesEvent arg0 ) {
-        __handlePreferences( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/PrintFilesHandlerProxy.java b/src/org/genie/com_apple/PrintFilesHandlerProxy.java
deleted file mode 100644
index abcf3e6..0000000
--- a/src/org/genie/com_apple/PrintFilesHandlerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface com.apple.eawt.PrintFilesHandler ///
-
-package org.genie.com_apple;
-
-public class PrintFilesHandlerProxy implements com.apple.eawt.PrintFilesHandler {
-
-    long swiftObject;
-
-    PrintFilesHandlerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.PrintFilesHandler.printFiles(com.apple.eawt.AppEvent$PrintFilesEvent)
-
-    public native void __printFiles( com.apple.eawt.AppEvent.PrintFilesEvent arg0 );
-
-    public void printFiles( com.apple.eawt.AppEvent.PrintFilesEvent arg0 ) {
-        __printFiles( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/QuitHandlerProxy.java b/src/org/genie/com_apple/QuitHandlerProxy.java
deleted file mode 100644
index 0d5745a..0000000
--- a/src/org/genie/com_apple/QuitHandlerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface com.apple.eawt.QuitHandler ///
-
-package org.genie.com_apple;
-
-public class QuitHandlerProxy implements com.apple.eawt.QuitHandler {
-
-    long swiftObject;
-
-    QuitHandlerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.QuitHandler.handleQuitRequestWith(com.apple.eawt.AppEvent$QuitEvent,com.apple.eawt.QuitResponse)
-
-    public native void __handleQuitRequestWith( com.apple.eawt.AppEvent.QuitEvent arg0, com.apple.eawt.QuitResponse arg1 );
-
-    public void handleQuitRequestWith( com.apple.eawt.AppEvent.QuitEvent arg0, com.apple.eawt.QuitResponse arg1 ) {
-        __handleQuitRequestWith( arg0, arg1 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/RotationListenerProxy.java b/src/org/genie/com_apple/RotationListenerProxy.java
deleted file mode 100644
index 8b63bb0..0000000
--- a/src/org/genie/com_apple/RotationListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface com.apple.eawt.event.RotationListener ///
-
-package org.genie.com_apple;
-
-public class RotationListenerProxy implements com.apple.eawt.event.RotationListener {
-
-    long swiftObject;
-
-    RotationListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.event.RotationListener.rotate(com.apple.eawt.event.RotationEvent)
-
-    public native void __rotate( com.apple.eawt.event.RotationEvent arg0 );
-
-    public void rotate( com.apple.eawt.event.RotationEvent arg0 ) {
-        __rotate( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/ScreenSleepListenerProxy.java b/src/org/genie/com_apple/ScreenSleepListenerProxy.java
deleted file mode 100644
index ae3a475..0000000
--- a/src/org/genie/com_apple/ScreenSleepListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface com.apple.eawt.ScreenSleepListener ///
-
-package org.genie.com_apple;
-
-public class ScreenSleepListenerProxy implements com.apple.eawt.ScreenSleepListener {
-
-    long swiftObject;
-
-    ScreenSleepListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.ScreenSleepListener.screenAwoke(com.apple.eawt.AppEvent$ScreenSleepEvent)
-
-    public native void __screenAwoke( com.apple.eawt.AppEvent.ScreenSleepEvent arg0 );
-
-    public void screenAwoke( com.apple.eawt.AppEvent.ScreenSleepEvent arg0 ) {
-        __screenAwoke( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.ScreenSleepListener.screenAboutToSleep(com.apple.eawt.AppEvent$ScreenSleepEvent)
-
-    public native void __screenAboutToSleep( com.apple.eawt.AppEvent.ScreenSleepEvent arg0 );
-
-    public void screenAboutToSleep( com.apple.eawt.AppEvent.ScreenSleepEvent arg0 ) {
-        __screenAboutToSleep( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/SwipeListenerProxy.java b/src/org/genie/com_apple/SwipeListenerProxy.java
deleted file mode 100644
index e29e30e..0000000
--- a/src/org/genie/com_apple/SwipeListenerProxy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/// interface com.apple.eawt.event.SwipeListener ///
-
-package org.genie.com_apple;
-
-public class SwipeListenerProxy implements com.apple.eawt.event.SwipeListener {
-
-    long swiftObject;
-
-    SwipeListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.event.SwipeListener.swipedDown(com.apple.eawt.event.SwipeEvent)
-
-    public native void __swipedDown( com.apple.eawt.event.SwipeEvent arg0 );
-
-    public void swipedDown( com.apple.eawt.event.SwipeEvent arg0 ) {
-        __swipedDown( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.event.SwipeListener.swipedLeft(com.apple.eawt.event.SwipeEvent)
-
-    public native void __swipedLeft( com.apple.eawt.event.SwipeEvent arg0 );
-
-    public void swipedLeft( com.apple.eawt.event.SwipeEvent arg0 ) {
-        __swipedLeft( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.event.SwipeListener.swipedRight(com.apple.eawt.event.SwipeEvent)
-
-    public native void __swipedRight( com.apple.eawt.event.SwipeEvent arg0 );
-
-    public void swipedRight( com.apple.eawt.event.SwipeEvent arg0 ) {
-        __swipedRight( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.event.SwipeListener.swipedUp(com.apple.eawt.event.SwipeEvent)
-
-    public native void __swipedUp( com.apple.eawt.event.SwipeEvent arg0 );
-
-    public void swipedUp( com.apple.eawt.event.SwipeEvent arg0 ) {
-        __swipedUp( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/SystemSleepListenerProxy.java b/src/org/genie/com_apple/SystemSleepListenerProxy.java
deleted file mode 100644
index 21625ae..0000000
--- a/src/org/genie/com_apple/SystemSleepListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface com.apple.eawt.SystemSleepListener ///
-
-package org.genie.com_apple;
-
-public class SystemSleepListenerProxy implements com.apple.eawt.SystemSleepListener {
-
-    long swiftObject;
-
-    SystemSleepListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.SystemSleepListener.systemAwoke(com.apple.eawt.AppEvent$SystemSleepEvent)
-
-    public native void __systemAwoke( com.apple.eawt.AppEvent.SystemSleepEvent arg0 );
-
-    public void systemAwoke( com.apple.eawt.AppEvent.SystemSleepEvent arg0 ) {
-        __systemAwoke( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.SystemSleepListener.systemAboutToSleep(com.apple.eawt.AppEvent$SystemSleepEvent)
-
-    public native void __systemAboutToSleep( com.apple.eawt.AppEvent.SystemSleepEvent arg0 );
-
-    public void systemAboutToSleep( com.apple.eawt.AppEvent.SystemSleepEvent arg0 ) {
-        __systemAboutToSleep( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_apple/UserSessionListenerProxy.java b/src/org/genie/com_apple/UserSessionListenerProxy.java
deleted file mode 100644
index 00bb45f..0000000
--- a/src/org/genie/com_apple/UserSessionListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface com.apple.eawt.UserSessionListener ///
-
-package org.genie.com_apple;
-
-public class UserSessionListenerProxy implements com.apple.eawt.UserSessionListener {
-
-    long swiftObject;
-
-    UserSessionListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.apple.eawt.UserSessionListener.userSessionDeactivated(com.apple.eawt.AppEvent$UserSessionEvent)
-
-    public native void __userSessionDeactivated( com.apple.eawt.AppEvent.UserSessionEvent arg0 );
-
-    public void userSessionDeactivated( com.apple.eawt.AppEvent.UserSessionEvent arg0 ) {
-        __userSessionDeactivated( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.UserSessionListener.userSessionActivated(com.apple.eawt.AppEvent$UserSessionEvent)
-
-    public native void __userSessionActivated( com.apple.eawt.AppEvent.UserSessionEvent arg0 );
-
-    public void userSessionActivated( com.apple.eawt.AppEvent.UserSessionEvent arg0 ) {
-        __userSessionActivated( arg0 );
-    }
-
-}
diff --git a/src/org/genie/com_jh/SwiftHelloListenerProxy.java b/src/org/genie/com_jh/SwiftHelloListenerProxy.java
deleted file mode 100644
index 97408e3..0000000
--- a/src/org/genie/com_jh/SwiftHelloListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface com.jh.SwiftHelloListener ///
-
-package org.genie.com_jh;
-
-public class SwiftHelloListenerProxy implements com.jh.SwiftHelloListener {
-
-    long swiftObject;
-
-    SwiftHelloListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void com.jh.SwiftHelloListener.processNumber(double)
-
-    public native void __processNumber( double number );
-
-    public void processNumber( double number ) {
-        __processNumber( number );
-    }
-
-    /// public abstract void com.jh.SwiftHelloListener.processText(java.lang.String)
-
-    public native void __processText( java.lang.String text );
-
-    public void processText( java.lang.String text ) {
-        __processText( text );
-    }
-
-}
diff --git a/src/org/genie/java_awt/AWTEventListenerProxy.java b/src/org/genie/java_awt/AWTEventListenerProxy.java
deleted file mode 100644
index 32d0e3a..0000000
--- a/src/org/genie/java_awt/AWTEventListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.awt.event.AWTEventListener ///
-
-package org.genie.java_awt;
-
-public class AWTEventListenerProxy implements java.awt.event.AWTEventListener {
-
-    long swiftObject;
-
-    AWTEventListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.AWTEventListener.eventDispatched(java.awt.AWTEvent)
-
-    public native void __eventDispatched( java.awt.AWTEvent event );
-
-    public void eventDispatched( java.awt.AWTEvent event ) {
-        __eventDispatched( event );
-    }
-
-}
diff --git a/src/org/genie/java_awt/ActionListenerProxy.java b/src/org/genie/java_awt/ActionListenerProxy.java
deleted file mode 100644
index 2985983..0000000
--- a/src/org/genie/java_awt/ActionListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.awt.event.ActionListener ///
-
-package org.genie.java_awt;
-
-public class ActionListenerProxy implements java.awt.event.ActionListener {
-
-    long swiftObject;
-
-    ActionListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.ActionListener.actionPerformed(java.awt.event.ActionEvent)
-
-    public native void __actionPerformed( java.awt.event.ActionEvent e );
-
-    public void actionPerformed( java.awt.event.ActionEvent e ) {
-        __actionPerformed( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/AdjustmentListenerProxy.java b/src/org/genie/java_awt/AdjustmentListenerProxy.java
deleted file mode 100644
index 4b3df60..0000000
--- a/src/org/genie/java_awt/AdjustmentListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.awt.event.AdjustmentListener ///
-
-package org.genie.java_awt;
-
-public class AdjustmentListenerProxy implements java.awt.event.AdjustmentListener {
-
-    long swiftObject;
-
-    AdjustmentListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.AdjustmentListener.adjustmentValueChanged(java.awt.event.AdjustmentEvent)
-
-    public native void __adjustmentValueChanged( java.awt.event.AdjustmentEvent e );
-
-    public void adjustmentValueChanged( java.awt.event.AdjustmentEvent e ) {
-        __adjustmentValueChanged( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/CanvasProxy.java b/src/org/genie/java_awt/CanvasProxy.java
deleted file mode 100644
index 071240c..0000000
--- a/src/org/genie/java_awt/CanvasProxy.java
+++ /dev/null
@@ -1,56 +0,0 @@
-
-/// class java.awt.Canvas ///
-
-package org.genie.java_awt;
-
-public class CanvasProxy extends java.awt.Canvas {
-
-    long swiftObject;
-
-    /// public java.awt.Canvas()
-
-    CanvasProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public java.awt.Canvas(java.awt.GraphicsConfiguration)
-
-    CanvasProxy( java.awt.GraphicsConfiguration config , long swiftObject ) {
-        super( config );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void java.awt.Canvas.update(java.awt.Graphics)
-
-    public native void __update( java.awt.Graphics g );
-
-    boolean entered_update_0;
-
-    public void update( java.awt.Graphics g ) {
-        if ( !entered_update_0 ) {
-            entered_update_0 = true;
-            __update( g );
-            entered_update_0 = false;
-        }
-        else
-            super.update( g );
-    }
-
-    /// public void java.awt.Canvas.paint(java.awt.Graphics)
-
-    public native void __paint( java.awt.Graphics g );
-
-    boolean entered_paint_1;
-
-    public void paint( java.awt.Graphics g ) {
-        if ( !entered_paint_1 ) {
-            entered_paint_1 = true;
-            __paint( g );
-            entered_paint_1 = false;
-        }
-        else
-            super.paint( g );
-    }
-
-}
diff --git a/src/org/genie/java_awt/ComponentAdapterProxy.java b/src/org/genie/java_awt/ComponentAdapterProxy.java
deleted file mode 100644
index 0504379..0000000
--- a/src/org/genie/java_awt/ComponentAdapterProxy.java
+++ /dev/null
@@ -1,132 +0,0 @@
-
-/// class java.awt.event.ComponentAdapter ///
-
-package org.genie.java_awt;
-
-public class ComponentAdapterProxy extends java.awt.event.ComponentAdapter {
-
-    long swiftObject;
-
-    /// public java.awt.event.ComponentAdapter()
-
-    ComponentAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void java.awt.event.ComponentAdapter.componentResized(java.awt.event.ComponentEvent)
-
-    public native void __componentResized( java.awt.event.ComponentEvent e );
-
-    boolean entered_componentResized_0;
-
-    public void componentResized( java.awt.event.ComponentEvent e ) {
-        if ( !entered_componentResized_0 ) {
-            entered_componentResized_0 = true;
-            __componentResized( e );
-            entered_componentResized_0 = false;
-        }
-        else
-            super.componentResized( e );
-    }
-
-    /// public void java.awt.event.ComponentAdapter.componentMoved(java.awt.event.ComponentEvent)
-
-    public native void __componentMoved( java.awt.event.ComponentEvent e );
-
-    boolean entered_componentMoved_1;
-
-    public void componentMoved( java.awt.event.ComponentEvent e ) {
-        if ( !entered_componentMoved_1 ) {
-            entered_componentMoved_1 = true;
-            __componentMoved( e );
-            entered_componentMoved_1 = false;
-        }
-        else
-            super.componentMoved( e );
-    }
-
-    /// public void java.awt.event.ComponentAdapter.componentShown(java.awt.event.ComponentEvent)
-
-    public native void __componentShown( java.awt.event.ComponentEvent e );
-
-    boolean entered_componentShown_2;
-
-    public void componentShown( java.awt.event.ComponentEvent e ) {
-        if ( !entered_componentShown_2 ) {
-            entered_componentShown_2 = true;
-            __componentShown( e );
-            entered_componentShown_2 = false;
-        }
-        else
-            super.componentShown( e );
-    }
-
-    /// public void java.awt.event.ComponentAdapter.componentHidden(java.awt.event.ComponentEvent)
-
-    public native void __componentHidden( java.awt.event.ComponentEvent e );
-
-    boolean entered_componentHidden_3;
-
-    public void componentHidden( java.awt.event.ComponentEvent e ) {
-        if ( !entered_componentHidden_3 ) {
-            entered_componentHidden_3 = true;
-            __componentHidden( e );
-            entered_componentHidden_3 = false;
-        }
-        else
-            super.componentHidden( e );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_4;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_4 ) {
-            entered_equals_4 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_4 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_5;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_5 ) {
-            entered_toString_5 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_5 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_6;
-
-    public int hashCode() {
-        if ( !entered_hashCode_6 ) {
-            entered_hashCode_6 = true;
-            int __return = __hashCode( );
-            entered_hashCode_6 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/java_awt/ComponentListenerProxy.java b/src/org/genie/java_awt/ComponentListenerProxy.java
deleted file mode 100644
index de58e5d..0000000
--- a/src/org/genie/java_awt/ComponentListenerProxy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/// interface java.awt.event.ComponentListener ///
-
-package org.genie.java_awt;
-
-public class ComponentListenerProxy implements java.awt.event.ComponentListener {
-
-    long swiftObject;
-
-    ComponentListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.ComponentListener.componentResized(java.awt.event.ComponentEvent)
-
-    public native void __componentResized( java.awt.event.ComponentEvent e );
-
-    public void componentResized( java.awt.event.ComponentEvent e ) {
-        __componentResized( e );
-    }
-
-    /// public abstract void java.awt.event.ComponentListener.componentMoved(java.awt.event.ComponentEvent)
-
-    public native void __componentMoved( java.awt.event.ComponentEvent e );
-
-    public void componentMoved( java.awt.event.ComponentEvent e ) {
-        __componentMoved( e );
-    }
-
-    /// public abstract void java.awt.event.ComponentListener.componentShown(java.awt.event.ComponentEvent)
-
-    public native void __componentShown( java.awt.event.ComponentEvent e );
-
-    public void componentShown( java.awt.event.ComponentEvent e ) {
-        __componentShown( e );
-    }
-
-    /// public abstract void java.awt.event.ComponentListener.componentHidden(java.awt.event.ComponentEvent)
-
-    public native void __componentHidden( java.awt.event.ComponentEvent e );
-
-    public void componentHidden( java.awt.event.ComponentEvent e ) {
-        __componentHidden( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/ContainerListenerProxy.java b/src/org/genie/java_awt/ContainerListenerProxy.java
deleted file mode 100644
index fb611f5..0000000
--- a/src/org/genie/java_awt/ContainerListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface java.awt.event.ContainerListener ///
-
-package org.genie.java_awt;
-
-public class ContainerListenerProxy implements java.awt.event.ContainerListener {
-
-    long swiftObject;
-
-    ContainerListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.ContainerListener.componentAdded(java.awt.event.ContainerEvent)
-
-    public native void __componentAdded( java.awt.event.ContainerEvent e );
-
-    public void componentAdded( java.awt.event.ContainerEvent e ) {
-        __componentAdded( e );
-    }
-
-    /// public abstract void java.awt.event.ContainerListener.componentRemoved(java.awt.event.ContainerEvent)
-
-    public native void __componentRemoved( java.awt.event.ContainerEvent e );
-
-    public void componentRemoved( java.awt.event.ContainerEvent e ) {
-        __componentRemoved( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/DragGestureListenerProxy.java b/src/org/genie/java_awt/DragGestureListenerProxy.java
deleted file mode 100644
index 2b35201..0000000
--- a/src/org/genie/java_awt/DragGestureListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.awt.dnd.DragGestureListener ///
-
-package org.genie.java_awt;
-
-public class DragGestureListenerProxy implements java.awt.dnd.DragGestureListener {
-
-    long swiftObject;
-
-    DragGestureListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.dnd.DragGestureListener.dragGestureRecognized(java.awt.dnd.DragGestureEvent)
-
-    public native void __dragGestureRecognized( java.awt.dnd.DragGestureEvent dge );
-
-    public void dragGestureRecognized( java.awt.dnd.DragGestureEvent dge ) {
-        __dragGestureRecognized( dge );
-    }
-
-}
diff --git a/src/org/genie/java_awt/DragSourceAdapterProxy.java b/src/org/genie/java_awt/DragSourceAdapterProxy.java
deleted file mode 100644
index 6bc82b5..0000000
--- a/src/org/genie/java_awt/DragSourceAdapterProxy.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-/// class java.awt.dnd.DragSourceAdapter ///
-
-package org.genie.java_awt;
-
-public class DragSourceAdapterProxy extends java.awt.dnd.DragSourceAdapter {
-
-    long swiftObject;
-
-    /// public java.awt.dnd.DragSourceAdapter()
-
-    DragSourceAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void java.awt.dnd.DragSourceAdapter.dragEnter(java.awt.dnd.DragSourceDragEvent)
-
-    public native void __dragEnter( java.awt.dnd.DragSourceDragEvent dsde );
-
-    boolean entered_dragEnter_0;
-
-    public void dragEnter( java.awt.dnd.DragSourceDragEvent dsde ) {
-        if ( !entered_dragEnter_0 ) {
-            entered_dragEnter_0 = true;
-            __dragEnter( dsde );
-            entered_dragEnter_0 = false;
-        }
-        else
-            super.dragEnter( dsde );
-    }
-
-    /// public void java.awt.dnd.DragSourceAdapter.dragOver(java.awt.dnd.DragSourceDragEvent)
-
-    public native void __dragOver( java.awt.dnd.DragSourceDragEvent dsde );
-
-    boolean entered_dragOver_1;
-
-    public void dragOver( java.awt.dnd.DragSourceDragEvent dsde ) {
-        if ( !entered_dragOver_1 ) {
-            entered_dragOver_1 = true;
-            __dragOver( dsde );
-            entered_dragOver_1 = false;
-        }
-        else
-            super.dragOver( dsde );
-    }
-
-    /// public void java.awt.dnd.DragSourceAdapter.dropActionChanged(java.awt.dnd.DragSourceDragEvent)
-
-    public native void __dropActionChanged( java.awt.dnd.DragSourceDragEvent dsde );
-
-    boolean entered_dropActionChanged_2;
-
-    public void dropActionChanged( java.awt.dnd.DragSourceDragEvent dsde ) {
-        if ( !entered_dropActionChanged_2 ) {
-            entered_dropActionChanged_2 = true;
-            __dropActionChanged( dsde );
-            entered_dropActionChanged_2 = false;
-        }
-        else
-            super.dropActionChanged( dsde );
-    }
-
-    /// public void java.awt.dnd.DragSourceAdapter.dragExit(java.awt.dnd.DragSourceEvent)
-
-    public native void __dragExit( java.awt.dnd.DragSourceEvent dse );
-
-    boolean entered_dragExit_3;
-
-    public void dragExit( java.awt.dnd.DragSourceEvent dse ) {
-        if ( !entered_dragExit_3 ) {
-            entered_dragExit_3 = true;
-            __dragExit( dse );
-            entered_dragExit_3 = false;
-        }
-        else
-            super.dragExit( dse );
-    }
-
-    /// public void java.awt.dnd.DragSourceAdapter.dragDropEnd(java.awt.dnd.DragSourceDropEvent)
-
-    public native void __dragDropEnd( java.awt.dnd.DragSourceDropEvent dsde );
-
-    boolean entered_dragDropEnd_4;
-
-    public void dragDropEnd( java.awt.dnd.DragSourceDropEvent dsde ) {
-        if ( !entered_dragDropEnd_4 ) {
-            entered_dragDropEnd_4 = true;
-            __dragDropEnd( dsde );
-            entered_dragDropEnd_4 = false;
-        }
-        else
-            super.dragDropEnd( dsde );
-    }
-
-    /// public void java.awt.dnd.DragSourceAdapter.dragMouseMoved(java.awt.dnd.DragSourceDragEvent)
-
-    public native void __dragMouseMoved( java.awt.dnd.DragSourceDragEvent dsde );
-
-    boolean entered_dragMouseMoved_5;
-
-    public void dragMouseMoved( java.awt.dnd.DragSourceDragEvent dsde ) {
-        if ( !entered_dragMouseMoved_5 ) {
-            entered_dragMouseMoved_5 = true;
-            __dragMouseMoved( dsde );
-            entered_dragMouseMoved_5 = false;
-        }
-        else
-            super.dragMouseMoved( dsde );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_6;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_6 ) {
-            entered_equals_6 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_6 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_7;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_7 ) {
-            entered_toString_7 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_7 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_8;
-
-    public int hashCode() {
-        if ( !entered_hashCode_8 ) {
-            entered_hashCode_8 = true;
-            int __return = __hashCode( );
-            entered_hashCode_8 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/java_awt/DragSourceListenerProxy.java b/src/org/genie/java_awt/DragSourceListenerProxy.java
deleted file mode 100644
index 6facde5..0000000
--- a/src/org/genie/java_awt/DragSourceListenerProxy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/// interface java.awt.dnd.DragSourceListener ///
-
-package org.genie.java_awt;
-
-public class DragSourceListenerProxy implements java.awt.dnd.DragSourceListener {
-
-    long swiftObject;
-
-    DragSourceListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.dnd.DragSourceListener.dragEnter(java.awt.dnd.DragSourceDragEvent)
-
-    public native void __dragEnter( java.awt.dnd.DragSourceDragEvent dsde );
-
-    public void dragEnter( java.awt.dnd.DragSourceDragEvent dsde ) {
-        __dragEnter( dsde );
-    }
-
-    /// public abstract void java.awt.dnd.DragSourceListener.dragOver(java.awt.dnd.DragSourceDragEvent)
-
-    public native void __dragOver( java.awt.dnd.DragSourceDragEvent dsde );
-
-    public void dragOver( java.awt.dnd.DragSourceDragEvent dsde ) {
-        __dragOver( dsde );
-    }
-
-    /// public abstract void java.awt.dnd.DragSourceListener.dropActionChanged(java.awt.dnd.DragSourceDragEvent)
-
-    public native void __dropActionChanged( java.awt.dnd.DragSourceDragEvent dsde );
-
-    public void dropActionChanged( java.awt.dnd.DragSourceDragEvent dsde ) {
-        __dropActionChanged( dsde );
-    }
-
-    /// public abstract void java.awt.dnd.DragSourceListener.dragExit(java.awt.dnd.DragSourceEvent)
-
-    public native void __dragExit( java.awt.dnd.DragSourceEvent dse );
-
-    public void dragExit( java.awt.dnd.DragSourceEvent dse ) {
-        __dragExit( dse );
-    }
-
-    /// public abstract void java.awt.dnd.DragSourceListener.dragDropEnd(java.awt.dnd.DragSourceDropEvent)
-
-    public native void __dragDropEnd( java.awt.dnd.DragSourceDropEvent dsde );
-
-    public void dragDropEnd( java.awt.dnd.DragSourceDropEvent dsde ) {
-        __dragDropEnd( dsde );
-    }
-
-}
diff --git a/src/org/genie/java_awt/DragSourceMotionListenerProxy.java b/src/org/genie/java_awt/DragSourceMotionListenerProxy.java
deleted file mode 100644
index a7bb8d9..0000000
--- a/src/org/genie/java_awt/DragSourceMotionListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.awt.dnd.DragSourceMotionListener ///
-
-package org.genie.java_awt;
-
-public class DragSourceMotionListenerProxy implements java.awt.dnd.DragSourceMotionListener {
-
-    long swiftObject;
-
-    DragSourceMotionListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.dnd.DragSourceMotionListener.dragMouseMoved(java.awt.dnd.DragSourceDragEvent)
-
-    public native void __dragMouseMoved( java.awt.dnd.DragSourceDragEvent dsde );
-
-    public void dragMouseMoved( java.awt.dnd.DragSourceDragEvent dsde ) {
-        __dragMouseMoved( dsde );
-    }
-
-}
diff --git a/src/org/genie/java_awt/DropTargetListenerProxy.java b/src/org/genie/java_awt/DropTargetListenerProxy.java
deleted file mode 100644
index db1a6e7..0000000
--- a/src/org/genie/java_awt/DropTargetListenerProxy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/// interface java.awt.dnd.DropTargetListener ///
-
-package org.genie.java_awt;
-
-public class DropTargetListenerProxy implements java.awt.dnd.DropTargetListener {
-
-    long swiftObject;
-
-    DropTargetListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.dnd.DropTargetListener.dragEnter(java.awt.dnd.DropTargetDragEvent)
-
-    public native void __dragEnter( java.awt.dnd.DropTargetDragEvent dtde );
-
-    public void dragEnter( java.awt.dnd.DropTargetDragEvent dtde ) {
-        __dragEnter( dtde );
-    }
-
-    /// public abstract void java.awt.dnd.DropTargetListener.dragOver(java.awt.dnd.DropTargetDragEvent)
-
-    public native void __dragOver( java.awt.dnd.DropTargetDragEvent dtde );
-
-    public void dragOver( java.awt.dnd.DropTargetDragEvent dtde ) {
-        __dragOver( dtde );
-    }
-
-    /// public abstract void java.awt.dnd.DropTargetListener.dropActionChanged(java.awt.dnd.DropTargetDragEvent)
-
-    public native void __dropActionChanged( java.awt.dnd.DropTargetDragEvent dtde );
-
-    public void dropActionChanged( java.awt.dnd.DropTargetDragEvent dtde ) {
-        __dropActionChanged( dtde );
-    }
-
-    /// public abstract void java.awt.dnd.DropTargetListener.dragExit(java.awt.dnd.DropTargetEvent)
-
-    public native void __dragExit( java.awt.dnd.DropTargetEvent dte );
-
-    public void dragExit( java.awt.dnd.DropTargetEvent dte ) {
-        __dragExit( dte );
-    }
-
-    /// public abstract void java.awt.dnd.DropTargetListener.drop(java.awt.dnd.DropTargetDropEvent)
-
-    public native void __drop( java.awt.dnd.DropTargetDropEvent dtde );
-
-    public void drop( java.awt.dnd.DropTargetDropEvent dtde ) {
-        __drop( dtde );
-    }
-
-}
diff --git a/src/org/genie/java_awt/FlavorListenerProxy.java b/src/org/genie/java_awt/FlavorListenerProxy.java
deleted file mode 100644
index b201bd5..0000000
--- a/src/org/genie/java_awt/FlavorListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.awt.datatransfer.FlavorListener ///
-
-package org.genie.java_awt;
-
-public class FlavorListenerProxy implements java.awt.datatransfer.FlavorListener {
-
-    long swiftObject;
-
-    FlavorListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.datatransfer.FlavorListener.flavorsChanged(java.awt.datatransfer.FlavorEvent)
-
-    public native void __flavorsChanged( java.awt.datatransfer.FlavorEvent e );
-
-    public void flavorsChanged( java.awt.datatransfer.FlavorEvent e ) {
-        __flavorsChanged( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/FocusAdapterProxy.java b/src/org/genie/java_awt/FocusAdapterProxy.java
deleted file mode 100644
index 8ebcf36..0000000
--- a/src/org/genie/java_awt/FocusAdapterProxy.java
+++ /dev/null
@@ -1,100 +0,0 @@
-
-/// class java.awt.event.FocusAdapter ///
-
-package org.genie.java_awt;
-
-public class FocusAdapterProxy extends java.awt.event.FocusAdapter {
-
-    long swiftObject;
-
-    /// public java.awt.event.FocusAdapter()
-
-    FocusAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void java.awt.event.FocusAdapter.focusGained(java.awt.event.FocusEvent)
-
-    public native void __focusGained( java.awt.event.FocusEvent e );
-
-    boolean entered_focusGained_0;
-
-    public void focusGained( java.awt.event.FocusEvent e ) {
-        if ( !entered_focusGained_0 ) {
-            entered_focusGained_0 = true;
-            __focusGained( e );
-            entered_focusGained_0 = false;
-        }
-        else
-            super.focusGained( e );
-    }
-
-    /// public void java.awt.event.FocusAdapter.focusLost(java.awt.event.FocusEvent)
-
-    public native void __focusLost( java.awt.event.FocusEvent e );
-
-    boolean entered_focusLost_1;
-
-    public void focusLost( java.awt.event.FocusEvent e ) {
-        if ( !entered_focusLost_1 ) {
-            entered_focusLost_1 = true;
-            __focusLost( e );
-            entered_focusLost_1 = false;
-        }
-        else
-            super.focusLost( e );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_2;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_2 ) {
-            entered_equals_2 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_2 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_3;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_3 ) {
-            entered_toString_3 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_3 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_4;
-
-    public int hashCode() {
-        if ( !entered_hashCode_4 ) {
-            entered_hashCode_4 = true;
-            int __return = __hashCode( );
-            entered_hashCode_4 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/java_awt/FocusListenerProxy.java b/src/org/genie/java_awt/FocusListenerProxy.java
deleted file mode 100644
index a4b0258..0000000
--- a/src/org/genie/java_awt/FocusListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface java.awt.event.FocusListener ///
-
-package org.genie.java_awt;
-
-public class FocusListenerProxy implements java.awt.event.FocusListener {
-
-    long swiftObject;
-
-    FocusListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.FocusListener.focusGained(java.awt.event.FocusEvent)
-
-    public native void __focusGained( java.awt.event.FocusEvent e );
-
-    public void focusGained( java.awt.event.FocusEvent e ) {
-        __focusGained( e );
-    }
-
-    /// public abstract void java.awt.event.FocusListener.focusLost(java.awt.event.FocusEvent)
-
-    public native void __focusLost( java.awt.event.FocusEvent e );
-
-    public void focusLost( java.awt.event.FocusEvent e ) {
-        __focusLost( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/HierarchyBoundsListenerProxy.java b/src/org/genie/java_awt/HierarchyBoundsListenerProxy.java
deleted file mode 100644
index bc965c8..0000000
--- a/src/org/genie/java_awt/HierarchyBoundsListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface java.awt.event.HierarchyBoundsListener ///
-
-package org.genie.java_awt;
-
-public class HierarchyBoundsListenerProxy implements java.awt.event.HierarchyBoundsListener {
-
-    long swiftObject;
-
-    HierarchyBoundsListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.HierarchyBoundsListener.ancestorMoved(java.awt.event.HierarchyEvent)
-
-    public native void __ancestorMoved( java.awt.event.HierarchyEvent e );
-
-    public void ancestorMoved( java.awt.event.HierarchyEvent e ) {
-        __ancestorMoved( e );
-    }
-
-    /// public abstract void java.awt.event.HierarchyBoundsListener.ancestorResized(java.awt.event.HierarchyEvent)
-
-    public native void __ancestorResized( java.awt.event.HierarchyEvent e );
-
-    public void ancestorResized( java.awt.event.HierarchyEvent e ) {
-        __ancestorResized( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/HierarchyListenerProxy.java b/src/org/genie/java_awt/HierarchyListenerProxy.java
deleted file mode 100644
index f3e8996..0000000
--- a/src/org/genie/java_awt/HierarchyListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.awt.event.HierarchyListener ///
-
-package org.genie.java_awt;
-
-public class HierarchyListenerProxy implements java.awt.event.HierarchyListener {
-
-    long swiftObject;
-
-    HierarchyListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.HierarchyListener.hierarchyChanged(java.awt.event.HierarchyEvent)
-
-    public native void __hierarchyChanged( java.awt.event.HierarchyEvent e );
-
-    public void hierarchyChanged( java.awt.event.HierarchyEvent e ) {
-        __hierarchyChanged( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/InputMethodListenerProxy.java b/src/org/genie/java_awt/InputMethodListenerProxy.java
deleted file mode 100644
index fb5429c..0000000
--- a/src/org/genie/java_awt/InputMethodListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface java.awt.event.InputMethodListener ///
-
-package org.genie.java_awt;
-
-public class InputMethodListenerProxy implements java.awt.event.InputMethodListener {
-
-    long swiftObject;
-
-    InputMethodListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.InputMethodListener.inputMethodTextChanged(java.awt.event.InputMethodEvent)
-
-    public native void __inputMethodTextChanged( java.awt.event.InputMethodEvent event );
-
-    public void inputMethodTextChanged( java.awt.event.InputMethodEvent event ) {
-        __inputMethodTextChanged( event );
-    }
-
-    /// public abstract void java.awt.event.InputMethodListener.caretPositionChanged(java.awt.event.InputMethodEvent)
-
-    public native void __caretPositionChanged( java.awt.event.InputMethodEvent event );
-
-    public void caretPositionChanged( java.awt.event.InputMethodEvent event ) {
-        __caretPositionChanged( event );
-    }
-
-}
diff --git a/src/org/genie/java_awt/ItemListenerProxy.java b/src/org/genie/java_awt/ItemListenerProxy.java
deleted file mode 100644
index 5bbb827..0000000
--- a/src/org/genie/java_awt/ItemListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.awt.event.ItemListener ///
-
-package org.genie.java_awt;
-
-public class ItemListenerProxy implements java.awt.event.ItemListener {
-
-    long swiftObject;
-
-    ItemListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.ItemListener.itemStateChanged(java.awt.event.ItemEvent)
-
-    public native void __itemStateChanged( java.awt.event.ItemEvent e );
-
-    public void itemStateChanged( java.awt.event.ItemEvent e ) {
-        __itemStateChanged( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/KeyAdapterProxy.java b/src/org/genie/java_awt/KeyAdapterProxy.java
deleted file mode 100644
index 24388b0..0000000
--- a/src/org/genie/java_awt/KeyAdapterProxy.java
+++ /dev/null
@@ -1,116 +0,0 @@
-
-/// class java.awt.event.KeyAdapter ///
-
-package org.genie.java_awt;
-
-public class KeyAdapterProxy extends java.awt.event.KeyAdapter {
-
-    long swiftObject;
-
-    /// public java.awt.event.KeyAdapter()
-
-    KeyAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void java.awt.event.KeyAdapter.keyTyped(java.awt.event.KeyEvent)
-
-    public native void __keyTyped( java.awt.event.KeyEvent e );
-
-    boolean entered_keyTyped_0;
-
-    public void keyTyped( java.awt.event.KeyEvent e ) {
-        if ( !entered_keyTyped_0 ) {
-            entered_keyTyped_0 = true;
-            __keyTyped( e );
-            entered_keyTyped_0 = false;
-        }
-        else
-            super.keyTyped( e );
-    }
-
-    /// public void java.awt.event.KeyAdapter.keyPressed(java.awt.event.KeyEvent)
-
-    public native void __keyPressed( java.awt.event.KeyEvent e );
-
-    boolean entered_keyPressed_1;
-
-    public void keyPressed( java.awt.event.KeyEvent e ) {
-        if ( !entered_keyPressed_1 ) {
-            entered_keyPressed_1 = true;
-            __keyPressed( e );
-            entered_keyPressed_1 = false;
-        }
-        else
-            super.keyPressed( e );
-    }
-
-    /// public void java.awt.event.KeyAdapter.keyReleased(java.awt.event.KeyEvent)
-
-    public native void __keyReleased( java.awt.event.KeyEvent e );
-
-    boolean entered_keyReleased_2;
-
-    public void keyReleased( java.awt.event.KeyEvent e ) {
-        if ( !entered_keyReleased_2 ) {
-            entered_keyReleased_2 = true;
-            __keyReleased( e );
-            entered_keyReleased_2 = false;
-        }
-        else
-            super.keyReleased( e );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_3;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_3 ) {
-            entered_equals_3 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_3 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_4;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_4 ) {
-            entered_toString_4 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_4 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_5;
-
-    public int hashCode() {
-        if ( !entered_hashCode_5 ) {
-            entered_hashCode_5 = true;
-            int __return = __hashCode( );
-            entered_hashCode_5 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/java_awt/KeyListenerProxy.java b/src/org/genie/java_awt/KeyListenerProxy.java
deleted file mode 100644
index a309dbb..0000000
--- a/src/org/genie/java_awt/KeyListenerProxy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/// interface java.awt.event.KeyListener ///
-
-package org.genie.java_awt;
-
-public class KeyListenerProxy implements java.awt.event.KeyListener {
-
-    long swiftObject;
-
-    KeyListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.KeyListener.keyTyped(java.awt.event.KeyEvent)
-
-    public native void __keyTyped( java.awt.event.KeyEvent e );
-
-    public void keyTyped( java.awt.event.KeyEvent e ) {
-        __keyTyped( e );
-    }
-
-    /// public abstract void java.awt.event.KeyListener.keyPressed(java.awt.event.KeyEvent)
-
-    public native void __keyPressed( java.awt.event.KeyEvent e );
-
-    public void keyPressed( java.awt.event.KeyEvent e ) {
-        __keyPressed( e );
-    }
-
-    /// public abstract void java.awt.event.KeyListener.keyReleased(java.awt.event.KeyEvent)
-
-    public native void __keyReleased( java.awt.event.KeyEvent e );
-
-    public void keyReleased( java.awt.event.KeyEvent e ) {
-        __keyReleased( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/LayoutManagerProxy.java b/src/org/genie/java_awt/LayoutManagerProxy.java
deleted file mode 100644
index 04d32b2..0000000
--- a/src/org/genie/java_awt/LayoutManagerProxy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/// interface java.awt.LayoutManager ///
-
-package org.genie.java_awt;
-
-public class LayoutManagerProxy implements java.awt.LayoutManager {
-
-    long swiftObject;
-
-    LayoutManagerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.LayoutManager.removeLayoutComponent(java.awt.Component)
-
-    public native void __removeLayoutComponent( java.awt.Component comp );
-
-    public void removeLayoutComponent( java.awt.Component comp ) {
-        __removeLayoutComponent( comp );
-    }
-
-    /// public abstract void java.awt.LayoutManager.addLayoutComponent(java.lang.String,java.awt.Component)
-
-    public native void __addLayoutComponent( java.lang.String name, java.awt.Component comp );
-
-    public void addLayoutComponent( java.lang.String name, java.awt.Component comp ) {
-        __addLayoutComponent( name, comp );
-    }
-
-    /// public abstract void java.awt.LayoutManager.layoutContainer(java.awt.Container)
-
-    public native void __layoutContainer( java.awt.Container parent );
-
-    public void layoutContainer( java.awt.Container parent ) {
-        __layoutContainer( parent );
-    }
-
-    /// public abstract java.awt.Dimension java.awt.LayoutManager.preferredLayoutSize(java.awt.Container)
-
-    public native java.awt.Dimension __preferredLayoutSize( java.awt.Container parent );
-
-    public java.awt.Dimension preferredLayoutSize( java.awt.Container parent ) {
-        return __preferredLayoutSize( parent );
-    }
-
-    /// public abstract java.awt.Dimension java.awt.LayoutManager.minimumLayoutSize(java.awt.Container)
-
-    public native java.awt.Dimension __minimumLayoutSize( java.awt.Container parent );
-
-    public java.awt.Dimension minimumLayoutSize( java.awt.Container parent ) {
-        return __minimumLayoutSize( parent );
-    }
-
-}
diff --git a/src/org/genie/java_awt/MouseAdapterProxy.java b/src/org/genie/java_awt/MouseAdapterProxy.java
deleted file mode 100644
index 17b3fa3..0000000
--- a/src/org/genie/java_awt/MouseAdapterProxy.java
+++ /dev/null
@@ -1,196 +0,0 @@
-
-/// class java.awt.event.MouseAdapter ///
-
-package org.genie.java_awt;
-
-public class MouseAdapterProxy extends java.awt.event.MouseAdapter {
-
-    long swiftObject;
-
-    /// public java.awt.event.MouseAdapter()
-
-    MouseAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void java.awt.event.MouseAdapter.mousePressed(java.awt.event.MouseEvent)
-
-    public native void __mousePressed( java.awt.event.MouseEvent e );
-
-    boolean entered_mousePressed_0;
-
-    public void mousePressed( java.awt.event.MouseEvent e ) {
-        if ( !entered_mousePressed_0 ) {
-            entered_mousePressed_0 = true;
-            __mousePressed( e );
-            entered_mousePressed_0 = false;
-        }
-        else
-            super.mousePressed( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseReleased(java.awt.event.MouseEvent)
-
-    public native void __mouseReleased( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseReleased_1;
-
-    public void mouseReleased( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseReleased_1 ) {
-            entered_mouseReleased_1 = true;
-            __mouseReleased( e );
-            entered_mouseReleased_1 = false;
-        }
-        else
-            super.mouseReleased( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseClicked(java.awt.event.MouseEvent)
-
-    public native void __mouseClicked( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseClicked_2;
-
-    public void mouseClicked( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseClicked_2 ) {
-            entered_mouseClicked_2 = true;
-            __mouseClicked( e );
-            entered_mouseClicked_2 = false;
-        }
-        else
-            super.mouseClicked( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseExited(java.awt.event.MouseEvent)
-
-    public native void __mouseExited( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseExited_3;
-
-    public void mouseExited( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseExited_3 ) {
-            entered_mouseExited_3 = true;
-            __mouseExited( e );
-            entered_mouseExited_3 = false;
-        }
-        else
-            super.mouseExited( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseEntered(java.awt.event.MouseEvent)
-
-    public native void __mouseEntered( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseEntered_4;
-
-    public void mouseEntered( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseEntered_4 ) {
-            entered_mouseEntered_4 = true;
-            __mouseEntered( e );
-            entered_mouseEntered_4 = false;
-        }
-        else
-            super.mouseEntered( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseMoved(java.awt.event.MouseEvent)
-
-    public native void __mouseMoved( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseMoved_5;
-
-    public void mouseMoved( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseMoved_5 ) {
-            entered_mouseMoved_5 = true;
-            __mouseMoved( e );
-            entered_mouseMoved_5 = false;
-        }
-        else
-            super.mouseMoved( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseDragged(java.awt.event.MouseEvent)
-
-    public native void __mouseDragged( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseDragged_6;
-
-    public void mouseDragged( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseDragged_6 ) {
-            entered_mouseDragged_6 = true;
-            __mouseDragged( e );
-            entered_mouseDragged_6 = false;
-        }
-        else
-            super.mouseDragged( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseWheelMoved(java.awt.event.MouseWheelEvent)
-
-    public native void __mouseWheelMoved( java.awt.event.MouseWheelEvent e );
-
-    boolean entered_mouseWheelMoved_7;
-
-    public void mouseWheelMoved( java.awt.event.MouseWheelEvent e ) {
-        if ( !entered_mouseWheelMoved_7 ) {
-            entered_mouseWheelMoved_7 = true;
-            __mouseWheelMoved( e );
-            entered_mouseWheelMoved_7 = false;
-        }
-        else
-            super.mouseWheelMoved( e );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_8;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_8 ) {
-            entered_equals_8 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_8 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_9;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_9 ) {
-            entered_toString_9 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_9 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_10;
-
-    public int hashCode() {
-        if ( !entered_hashCode_10 ) {
-            entered_hashCode_10 = true;
-            int __return = __hashCode( );
-            entered_hashCode_10 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/java_awt/MouseListenerProxy.java b/src/org/genie/java_awt/MouseListenerProxy.java
deleted file mode 100644
index 9ad30d5..0000000
--- a/src/org/genie/java_awt/MouseListenerProxy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/// interface java.awt.event.MouseListener ///
-
-package org.genie.java_awt;
-
-public class MouseListenerProxy implements java.awt.event.MouseListener {
-
-    long swiftObject;
-
-    MouseListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.MouseListener.mousePressed(java.awt.event.MouseEvent)
-
-    public native void __mousePressed( java.awt.event.MouseEvent e );
-
-    public void mousePressed( java.awt.event.MouseEvent e ) {
-        __mousePressed( e );
-    }
-
-    /// public abstract void java.awt.event.MouseListener.mouseReleased(java.awt.event.MouseEvent)
-
-    public native void __mouseReleased( java.awt.event.MouseEvent e );
-
-    public void mouseReleased( java.awt.event.MouseEvent e ) {
-        __mouseReleased( e );
-    }
-
-    /// public abstract void java.awt.event.MouseListener.mouseClicked(java.awt.event.MouseEvent)
-
-    public native void __mouseClicked( java.awt.event.MouseEvent e );
-
-    public void mouseClicked( java.awt.event.MouseEvent e ) {
-        __mouseClicked( e );
-    }
-
-    /// public abstract void java.awt.event.MouseListener.mouseExited(java.awt.event.MouseEvent)
-
-    public native void __mouseExited( java.awt.event.MouseEvent e );
-
-    public void mouseExited( java.awt.event.MouseEvent e ) {
-        __mouseExited( e );
-    }
-
-    /// public abstract void java.awt.event.MouseListener.mouseEntered(java.awt.event.MouseEvent)
-
-    public native void __mouseEntered( java.awt.event.MouseEvent e );
-
-    public void mouseEntered( java.awt.event.MouseEvent e ) {
-        __mouseEntered( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/MouseMotionAdapterProxy.java b/src/org/genie/java_awt/MouseMotionAdapterProxy.java
deleted file mode 100644
index 13f53ac..0000000
--- a/src/org/genie/java_awt/MouseMotionAdapterProxy.java
+++ /dev/null
@@ -1,100 +0,0 @@
-
-/// class java.awt.event.MouseMotionAdapter ///
-
-package org.genie.java_awt;
-
-public class MouseMotionAdapterProxy extends java.awt.event.MouseMotionAdapter {
-
-    long swiftObject;
-
-    /// public java.awt.event.MouseMotionAdapter()
-
-    MouseMotionAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void java.awt.event.MouseMotionAdapter.mouseMoved(java.awt.event.MouseEvent)
-
-    public native void __mouseMoved( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseMoved_0;
-
-    public void mouseMoved( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseMoved_0 ) {
-            entered_mouseMoved_0 = true;
-            __mouseMoved( e );
-            entered_mouseMoved_0 = false;
-        }
-        else
-            super.mouseMoved( e );
-    }
-
-    /// public void java.awt.event.MouseMotionAdapter.mouseDragged(java.awt.event.MouseEvent)
-
-    public native void __mouseDragged( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseDragged_1;
-
-    public void mouseDragged( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseDragged_1 ) {
-            entered_mouseDragged_1 = true;
-            __mouseDragged( e );
-            entered_mouseDragged_1 = false;
-        }
-        else
-            super.mouseDragged( e );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_2;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_2 ) {
-            entered_equals_2 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_2 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_3;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_3 ) {
-            entered_toString_3 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_3 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_4;
-
-    public int hashCode() {
-        if ( !entered_hashCode_4 ) {
-            entered_hashCode_4 = true;
-            int __return = __hashCode( );
-            entered_hashCode_4 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/java_awt/MouseMotionListenerProxy.java b/src/org/genie/java_awt/MouseMotionListenerProxy.java
deleted file mode 100644
index 8420a17..0000000
--- a/src/org/genie/java_awt/MouseMotionListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface java.awt.event.MouseMotionListener ///
-
-package org.genie.java_awt;
-
-public class MouseMotionListenerProxy implements java.awt.event.MouseMotionListener {
-
-    long swiftObject;
-
-    MouseMotionListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.MouseMotionListener.mouseMoved(java.awt.event.MouseEvent)
-
-    public native void __mouseMoved( java.awt.event.MouseEvent e );
-
-    public void mouseMoved( java.awt.event.MouseEvent e ) {
-        __mouseMoved( e );
-    }
-
-    /// public abstract void java.awt.event.MouseMotionListener.mouseDragged(java.awt.event.MouseEvent)
-
-    public native void __mouseDragged( java.awt.event.MouseEvent e );
-
-    public void mouseDragged( java.awt.event.MouseEvent e ) {
-        __mouseDragged( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/MouseWheelListenerProxy.java b/src/org/genie/java_awt/MouseWheelListenerProxy.java
deleted file mode 100644
index 8639553..0000000
--- a/src/org/genie/java_awt/MouseWheelListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.awt.event.MouseWheelListener ///
-
-package org.genie.java_awt;
-
-public class MouseWheelListenerProxy implements java.awt.event.MouseWheelListener {
-
-    long swiftObject;
-
-    MouseWheelListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.MouseWheelListener.mouseWheelMoved(java.awt.event.MouseWheelEvent)
-
-    public native void __mouseWheelMoved( java.awt.event.MouseWheelEvent e );
-
-    public void mouseWheelMoved( java.awt.event.MouseWheelEvent e ) {
-        __mouseWheelMoved( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/TextListenerProxy.java b/src/org/genie/java_awt/TextListenerProxy.java
deleted file mode 100644
index bb6f922..0000000
--- a/src/org/genie/java_awt/TextListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.awt.event.TextListener ///
-
-package org.genie.java_awt;
-
-public class TextListenerProxy implements java.awt.event.TextListener {
-
-    long swiftObject;
-
-    TextListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.TextListener.textValueChanged(java.awt.event.TextEvent)
-
-    public native void __textValueChanged( java.awt.event.TextEvent e );
-
-    public void textValueChanged( java.awt.event.TextEvent e ) {
-        __textValueChanged( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/WindowAdapterProxy.java b/src/org/genie/java_awt/WindowAdapterProxy.java
deleted file mode 100644
index f5bba85..0000000
--- a/src/org/genie/java_awt/WindowAdapterProxy.java
+++ /dev/null
@@ -1,228 +0,0 @@
-
-/// class java.awt.event.WindowAdapter ///
-
-package org.genie.java_awt;
-
-public class WindowAdapterProxy extends java.awt.event.WindowAdapter {
-
-    long swiftObject;
-
-    /// public java.awt.event.WindowAdapter()
-
-    WindowAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void java.awt.event.WindowAdapter.windowOpened(java.awt.event.WindowEvent)
-
-    public native void __windowOpened( java.awt.event.WindowEvent e );
-
-    boolean entered_windowOpened_0;
-
-    public void windowOpened( java.awt.event.WindowEvent e ) {
-        if ( !entered_windowOpened_0 ) {
-            entered_windowOpened_0 = true;
-            __windowOpened( e );
-            entered_windowOpened_0 = false;
-        }
-        else
-            super.windowOpened( e );
-    }
-
-    /// public void java.awt.event.WindowAdapter.windowClosing(java.awt.event.WindowEvent)
-
-    public native void __windowClosing( java.awt.event.WindowEvent e );
-
-    boolean entered_windowClosing_1;
-
-    public void windowClosing( java.awt.event.WindowEvent e ) {
-        if ( !entered_windowClosing_1 ) {
-            entered_windowClosing_1 = true;
-            __windowClosing( e );
-            entered_windowClosing_1 = false;
-        }
-        else
-            super.windowClosing( e );
-    }
-
-    /// public void java.awt.event.WindowAdapter.windowClosed(java.awt.event.WindowEvent)
-
-    public native void __windowClosed( java.awt.event.WindowEvent e );
-
-    boolean entered_windowClosed_2;
-
-    public void windowClosed( java.awt.event.WindowEvent e ) {
-        if ( !entered_windowClosed_2 ) {
-            entered_windowClosed_2 = true;
-            __windowClosed( e );
-            entered_windowClosed_2 = false;
-        }
-        else
-            super.windowClosed( e );
-    }
-
-    /// public void java.awt.event.WindowAdapter.windowIconified(java.awt.event.WindowEvent)
-
-    public native void __windowIconified( java.awt.event.WindowEvent e );
-
-    boolean entered_windowIconified_3;
-
-    public void windowIconified( java.awt.event.WindowEvent e ) {
-        if ( !entered_windowIconified_3 ) {
-            entered_windowIconified_3 = true;
-            __windowIconified( e );
-            entered_windowIconified_3 = false;
-        }
-        else
-            super.windowIconified( e );
-    }
-
-    /// public void java.awt.event.WindowAdapter.windowDeiconified(java.awt.event.WindowEvent)
-
-    public native void __windowDeiconified( java.awt.event.WindowEvent e );
-
-    boolean entered_windowDeiconified_4;
-
-    public void windowDeiconified( java.awt.event.WindowEvent e ) {
-        if ( !entered_windowDeiconified_4 ) {
-            entered_windowDeiconified_4 = true;
-            __windowDeiconified( e );
-            entered_windowDeiconified_4 = false;
-        }
-        else
-            super.windowDeiconified( e );
-    }
-
-    /// public void java.awt.event.WindowAdapter.windowActivated(java.awt.event.WindowEvent)
-
-    public native void __windowActivated( java.awt.event.WindowEvent e );
-
-    boolean entered_windowActivated_5;
-
-    public void windowActivated( java.awt.event.WindowEvent e ) {
-        if ( !entered_windowActivated_5 ) {
-            entered_windowActivated_5 = true;
-            __windowActivated( e );
-            entered_windowActivated_5 = false;
-        }
-        else
-            super.windowActivated( e );
-    }
-
-    /// public void java.awt.event.WindowAdapter.windowDeactivated(java.awt.event.WindowEvent)
-
-    public native void __windowDeactivated( java.awt.event.WindowEvent e );
-
-    boolean entered_windowDeactivated_6;
-
-    public void windowDeactivated( java.awt.event.WindowEvent e ) {
-        if ( !entered_windowDeactivated_6 ) {
-            entered_windowDeactivated_6 = true;
-            __windowDeactivated( e );
-            entered_windowDeactivated_6 = false;
-        }
-        else
-            super.windowDeactivated( e );
-    }
-
-    /// public void java.awt.event.WindowAdapter.windowGainedFocus(java.awt.event.WindowEvent)
-
-    public native void __windowGainedFocus( java.awt.event.WindowEvent e );
-
-    boolean entered_windowGainedFocus_7;
-
-    public void windowGainedFocus( java.awt.event.WindowEvent e ) {
-        if ( !entered_windowGainedFocus_7 ) {
-            entered_windowGainedFocus_7 = true;
-            __windowGainedFocus( e );
-            entered_windowGainedFocus_7 = false;
-        }
-        else
-            super.windowGainedFocus( e );
-    }
-
-    /// public void java.awt.event.WindowAdapter.windowLostFocus(java.awt.event.WindowEvent)
-
-    public native void __windowLostFocus( java.awt.event.WindowEvent e );
-
-    boolean entered_windowLostFocus_8;
-
-    public void windowLostFocus( java.awt.event.WindowEvent e ) {
-        if ( !entered_windowLostFocus_8 ) {
-            entered_windowLostFocus_8 = true;
-            __windowLostFocus( e );
-            entered_windowLostFocus_8 = false;
-        }
-        else
-            super.windowLostFocus( e );
-    }
-
-    /// public void java.awt.event.WindowAdapter.windowStateChanged(java.awt.event.WindowEvent)
-
-    public native void __windowStateChanged( java.awt.event.WindowEvent e );
-
-    boolean entered_windowStateChanged_9;
-
-    public void windowStateChanged( java.awt.event.WindowEvent e ) {
-        if ( !entered_windowStateChanged_9 ) {
-            entered_windowStateChanged_9 = true;
-            __windowStateChanged( e );
-            entered_windowStateChanged_9 = false;
-        }
-        else
-            super.windowStateChanged( e );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_10;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_10 ) {
-            entered_equals_10 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_10 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_11;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_11 ) {
-            entered_toString_11 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_11 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_12;
-
-    public int hashCode() {
-        if ( !entered_hashCode_12 ) {
-            entered_hashCode_12 = true;
-            int __return = __hashCode( );
-            entered_hashCode_12 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/java_awt/WindowFocusListenerProxy.java b/src/org/genie/java_awt/WindowFocusListenerProxy.java
deleted file mode 100644
index 36286e9..0000000
--- a/src/org/genie/java_awt/WindowFocusListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface java.awt.event.WindowFocusListener ///
-
-package org.genie.java_awt;
-
-public class WindowFocusListenerProxy implements java.awt.event.WindowFocusListener {
-
-    long swiftObject;
-
-    WindowFocusListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.WindowFocusListener.windowGainedFocus(java.awt.event.WindowEvent)
-
-    public native void __windowGainedFocus( java.awt.event.WindowEvent e );
-
-    public void windowGainedFocus( java.awt.event.WindowEvent e ) {
-        __windowGainedFocus( e );
-    }
-
-    /// public abstract void java.awt.event.WindowFocusListener.windowLostFocus(java.awt.event.WindowEvent)
-
-    public native void __windowLostFocus( java.awt.event.WindowEvent e );
-
-    public void windowLostFocus( java.awt.event.WindowEvent e ) {
-        __windowLostFocus( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/WindowListenerProxy.java b/src/org/genie/java_awt/WindowListenerProxy.java
deleted file mode 100644
index 59c3223..0000000
--- a/src/org/genie/java_awt/WindowListenerProxy.java
+++ /dev/null
@@ -1,70 +0,0 @@
-
-/// interface java.awt.event.WindowListener ///
-
-package org.genie.java_awt;
-
-public class WindowListenerProxy implements java.awt.event.WindowListener {
-
-    long swiftObject;
-
-    WindowListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.WindowListener.windowOpened(java.awt.event.WindowEvent)
-
-    public native void __windowOpened( java.awt.event.WindowEvent e );
-
-    public void windowOpened( java.awt.event.WindowEvent e ) {
-        __windowOpened( e );
-    }
-
-    /// public abstract void java.awt.event.WindowListener.windowClosing(java.awt.event.WindowEvent)
-
-    public native void __windowClosing( java.awt.event.WindowEvent e );
-
-    public void windowClosing( java.awt.event.WindowEvent e ) {
-        __windowClosing( e );
-    }
-
-    /// public abstract void java.awt.event.WindowListener.windowClosed(java.awt.event.WindowEvent)
-
-    public native void __windowClosed( java.awt.event.WindowEvent e );
-
-    public void windowClosed( java.awt.event.WindowEvent e ) {
-        __windowClosed( e );
-    }
-
-    /// public abstract void java.awt.event.WindowListener.windowIconified(java.awt.event.WindowEvent)
-
-    public native void __windowIconified( java.awt.event.WindowEvent e );
-
-    public void windowIconified( java.awt.event.WindowEvent e ) {
-        __windowIconified( e );
-    }
-
-    /// public abstract void java.awt.event.WindowListener.windowDeiconified(java.awt.event.WindowEvent)
-
-    public native void __windowDeiconified( java.awt.event.WindowEvent e );
-
-    public void windowDeiconified( java.awt.event.WindowEvent e ) {
-        __windowDeiconified( e );
-    }
-
-    /// public abstract void java.awt.event.WindowListener.windowActivated(java.awt.event.WindowEvent)
-
-    public native void __windowActivated( java.awt.event.WindowEvent e );
-
-    public void windowActivated( java.awt.event.WindowEvent e ) {
-        __windowActivated( e );
-    }
-
-    /// public abstract void java.awt.event.WindowListener.windowDeactivated(java.awt.event.WindowEvent)
-
-    public native void __windowDeactivated( java.awt.event.WindowEvent e );
-
-    public void windowDeactivated( java.awt.event.WindowEvent e ) {
-        __windowDeactivated( e );
-    }
-
-}
diff --git a/src/org/genie/java_awt/WindowStateListenerProxy.java b/src/org/genie/java_awt/WindowStateListenerProxy.java
deleted file mode 100644
index 3aa3c4f..0000000
--- a/src/org/genie/java_awt/WindowStateListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.awt.event.WindowStateListener ///
-
-package org.genie.java_awt;
-
-public class WindowStateListenerProxy implements java.awt.event.WindowStateListener {
-
-    long swiftObject;
-
-    WindowStateListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.WindowStateListener.windowStateChanged(java.awt.event.WindowEvent)
-
-    public native void __windowStateChanged( java.awt.event.WindowEvent e );
-
-    public void windowStateChanged( java.awt.event.WindowEvent e ) {
-        __windowStateChanged( e );
-    }
-
-}
diff --git a/src/org/genie/java_lang/InvocationHandlerProxy.java b/src/org/genie/java_lang/InvocationHandlerProxy.java
deleted file mode 100644
index 2590dc5..0000000
--- a/src/org/genie/java_lang/InvocationHandlerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.lang.reflect.InvocationHandler ///
-
-package org.genie.java_lang;
-
-public class InvocationHandlerProxy implements java.lang.reflect.InvocationHandler {
-
-    long swiftObject;
-
-    InvocationHandlerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract java.lang.Object java.lang.reflect.InvocationHandler.invoke(java.lang.Object,java.lang.reflect.Method,java.lang.Object[]) throws java.lang.Throwable
-
-    public native java.lang.Object __invoke( java.lang.Object proxy, java.lang.reflect.Method method, java.lang.Object[] args );
-
-    public java.lang.Object invoke( java.lang.Object proxy, java.lang.reflect.Method method, java.lang.Object[] args ) throws java.lang.Throwable {
-        return __invoke( proxy, method, args );
-    }
-
-}
diff --git a/src/org/genie/java_lang/RunnableProxy.java b/src/org/genie/java_lang/RunnableProxy.java
deleted file mode 100644
index 8bf6969..0000000
--- a/src/org/genie/java_lang/RunnableProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.lang.Runnable ///
-
-package org.genie.java_lang;
-
-public class RunnableProxy implements java.lang.Runnable {
-
-    long swiftObject;
-
-    RunnableProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.lang.Runnable.run()
-
-    public native void __run();
-
-    public void run() {
-        __run( );
-    }
-
-}
diff --git a/src/org/genie/java_lang/Thread_UncaughtExceptionHandlerProxy.java b/src/org/genie/java_lang/Thread_UncaughtExceptionHandlerProxy.java
deleted file mode 100644
index 7f1a2b3..0000000
--- a/src/org/genie/java_lang/Thread_UncaughtExceptionHandlerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.lang.Thread$UncaughtExceptionHandler ///
-
-package org.genie.java_lang;
-
-public class Thread_UncaughtExceptionHandlerProxy implements java.lang.Thread.UncaughtExceptionHandler {
-
-    long swiftObject;
-
-    Thread_UncaughtExceptionHandlerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.lang.Thread$UncaughtExceptionHandler.uncaughtException(java.lang.Thread,java.lang.Throwable)
-
-    public native void __uncaughtException( java.lang.Thread arg0, java.lang.Throwable arg1 );
-
-    public void uncaughtException( java.lang.Thread arg0, java.lang.Throwable arg1 ) {
-        __uncaughtException( arg0, arg1 );
-    }
-
-}
diff --git a/src/org/genie/java_util/EventListenerProxy.java b/src/org/genie/java_util/EventListenerProxy.java
deleted file mode 100644
index 8fcdbf0..0000000
--- a/src/org/genie/java_util/EventListenerProxy.java
+++ /dev/null
@@ -1,14 +0,0 @@
-
-/// interface java.util.EventListener ///
-
-package org.genie.java_util;
-
-public class EventListenerProxy implements java.util.EventListener {
-
-    long swiftObject;
-
-    EventListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-}
diff --git a/src/org/genie/java_util/NodeChangeListenerProxy.java b/src/org/genie/java_util/NodeChangeListenerProxy.java
deleted file mode 100644
index 2c7ff89..0000000
--- a/src/org/genie/java_util/NodeChangeListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface java.util.prefs.NodeChangeListener ///
-
-package org.genie.java_util;
-
-public class NodeChangeListenerProxy implements java.util.prefs.NodeChangeListener {
-
-    long swiftObject;
-
-    NodeChangeListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.util.prefs.NodeChangeListener.childAdded(java.util.prefs.NodeChangeEvent)
-
-    public native void __childAdded( java.util.prefs.NodeChangeEvent evt );
-
-    public void childAdded( java.util.prefs.NodeChangeEvent evt ) {
-        __childAdded( evt );
-    }
-
-    /// public abstract void java.util.prefs.NodeChangeListener.childRemoved(java.util.prefs.NodeChangeEvent)
-
-    public native void __childRemoved( java.util.prefs.NodeChangeEvent evt );
-
-    public void childRemoved( java.util.prefs.NodeChangeEvent evt ) {
-        __childRemoved( evt );
-    }
-
-}
diff --git a/src/org/genie/java_util/PreferenceChangeListenerProxy.java b/src/org/genie/java_util/PreferenceChangeListenerProxy.java
deleted file mode 100644
index 760dd3a..0000000
--- a/src/org/genie/java_util/PreferenceChangeListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.util.prefs.PreferenceChangeListener ///
-
-package org.genie.java_util;
-
-public class PreferenceChangeListenerProxy implements java.util.prefs.PreferenceChangeListener {
-
-    long swiftObject;
-
-    PreferenceChangeListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.util.prefs.PreferenceChangeListener.preferenceChange(java.util.prefs.PreferenceChangeEvent)
-
-    public native void __preferenceChange( java.util.prefs.PreferenceChangeEvent evt );
-
-    public void preferenceChange( java.util.prefs.PreferenceChangeEvent evt ) {
-        __preferenceChange( evt );
-    }
-
-}
diff --git a/src/org/genie/java_util/RejectedExecutionHandlerProxy.java b/src/org/genie/java_util/RejectedExecutionHandlerProxy.java
deleted file mode 100644
index 1aef2f3..0000000
--- a/src/org/genie/java_util/RejectedExecutionHandlerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface java.util.concurrent.RejectedExecutionHandler ///
-
-package org.genie.java_util;
-
-public class RejectedExecutionHandlerProxy implements java.util.concurrent.RejectedExecutionHandler {
-
-    long swiftObject;
-
-    RejectedExecutionHandlerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.util.concurrent.RejectedExecutionHandler.rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)
-
-    public native void __rejectedExecution( java.lang.Runnable r, java.util.concurrent.ThreadPoolExecutor executor );
-
-    public void rejectedExecution( java.lang.Runnable r, java.util.concurrent.ThreadPoolExecutor executor ) {
-        __rejectedExecution( r, executor );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/AncestorListenerProxy.java b/src/org/genie/javax_swing/AncestorListenerProxy.java
deleted file mode 100644
index de3b438..0000000
--- a/src/org/genie/javax_swing/AncestorListenerProxy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/// interface javax.swing.event.AncestorListener ///
-
-package org.genie.javax_swing;
-
-public class AncestorListenerProxy implements javax.swing.event.AncestorListener {
-
-    long swiftObject;
-
-    AncestorListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.AncestorListener.ancestorAdded(javax.swing.event.AncestorEvent)
-
-    public native void __ancestorAdded( javax.swing.event.AncestorEvent event );
-
-    public void ancestorAdded( javax.swing.event.AncestorEvent event ) {
-        __ancestorAdded( event );
-    }
-
-    /// public abstract void javax.swing.event.AncestorListener.ancestorRemoved(javax.swing.event.AncestorEvent)
-
-    public native void __ancestorRemoved( javax.swing.event.AncestorEvent event );
-
-    public void ancestorRemoved( javax.swing.event.AncestorEvent event ) {
-        __ancestorRemoved( event );
-    }
-
-    /// public abstract void javax.swing.event.AncestorListener.ancestorMoved(javax.swing.event.AncestorEvent)
-
-    public native void __ancestorMoved( javax.swing.event.AncestorEvent event );
-
-    public void ancestorMoved( javax.swing.event.AncestorEvent event ) {
-        __ancestorMoved( event );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/CaretListenerProxy.java b/src/org/genie/javax_swing/CaretListenerProxy.java
deleted file mode 100644
index 912204b..0000000
--- a/src/org/genie/javax_swing/CaretListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface javax.swing.event.CaretListener ///
-
-package org.genie.javax_swing;
-
-public class CaretListenerProxy implements javax.swing.event.CaretListener {
-
-    long swiftObject;
-
-    CaretListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.CaretListener.caretUpdate(javax.swing.event.CaretEvent)
-
-    public native void __caretUpdate( javax.swing.event.CaretEvent e );
-
-    public void caretUpdate( javax.swing.event.CaretEvent e ) {
-        __caretUpdate( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/CellEditorListenerProxy.java b/src/org/genie/javax_swing/CellEditorListenerProxy.java
deleted file mode 100644
index fb6f3db..0000000
--- a/src/org/genie/javax_swing/CellEditorListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface javax.swing.event.CellEditorListener ///
-
-package org.genie.javax_swing;
-
-public class CellEditorListenerProxy implements javax.swing.event.CellEditorListener {
-
-    long swiftObject;
-
-    CellEditorListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.CellEditorListener.editingStopped(javax.swing.event.ChangeEvent)
-
-    public native void __editingStopped( javax.swing.event.ChangeEvent e );
-
-    public void editingStopped( javax.swing.event.ChangeEvent e ) {
-        __editingStopped( e );
-    }
-
-    /// public abstract void javax.swing.event.CellEditorListener.editingCanceled(javax.swing.event.ChangeEvent)
-
-    public native void __editingCanceled( javax.swing.event.ChangeEvent e );
-
-    public void editingCanceled( javax.swing.event.ChangeEvent e ) {
-        __editingCanceled( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/ChangeListenerProxy.java b/src/org/genie/javax_swing/ChangeListenerProxy.java
deleted file mode 100644
index 8b7b1e3..0000000
--- a/src/org/genie/javax_swing/ChangeListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface javax.swing.event.ChangeListener ///
-
-package org.genie.javax_swing;
-
-public class ChangeListenerProxy implements javax.swing.event.ChangeListener {
-
-    long swiftObject;
-
-    ChangeListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.ChangeListener.stateChanged(javax.swing.event.ChangeEvent)
-
-    public native void __stateChanged( javax.swing.event.ChangeEvent e );
-
-    public void stateChanged( javax.swing.event.ChangeEvent e ) {
-        __stateChanged( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/DocumentListenerProxy.java b/src/org/genie/javax_swing/DocumentListenerProxy.java
deleted file mode 100644
index 9208687..0000000
--- a/src/org/genie/javax_swing/DocumentListenerProxy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/// interface javax.swing.event.DocumentListener ///
-
-package org.genie.javax_swing;
-
-public class DocumentListenerProxy implements javax.swing.event.DocumentListener {
-
-    long swiftObject;
-
-    DocumentListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.DocumentListener.insertUpdate(javax.swing.event.DocumentEvent)
-
-    public native void __insertUpdate( javax.swing.event.DocumentEvent e );
-
-    public void insertUpdate( javax.swing.event.DocumentEvent e ) {
-        __insertUpdate( e );
-    }
-
-    /// public abstract void javax.swing.event.DocumentListener.removeUpdate(javax.swing.event.DocumentEvent)
-
-    public native void __removeUpdate( javax.swing.event.DocumentEvent e );
-
-    public void removeUpdate( javax.swing.event.DocumentEvent e ) {
-        __removeUpdate( e );
-    }
-
-    /// public abstract void javax.swing.event.DocumentListener.changedUpdate(javax.swing.event.DocumentEvent)
-
-    public native void __changedUpdate( javax.swing.event.DocumentEvent e );
-
-    public void changedUpdate( javax.swing.event.DocumentEvent e ) {
-        __changedUpdate( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/HyperlinkListenerProxy.java b/src/org/genie/javax_swing/HyperlinkListenerProxy.java
deleted file mode 100644
index 625c87b..0000000
--- a/src/org/genie/javax_swing/HyperlinkListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface javax.swing.event.HyperlinkListener ///
-
-package org.genie.javax_swing;
-
-public class HyperlinkListenerProxy implements javax.swing.event.HyperlinkListener {
-
-    long swiftObject;
-
-    HyperlinkListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.HyperlinkListener.hyperlinkUpdate(javax.swing.event.HyperlinkEvent)
-
-    public native void __hyperlinkUpdate( javax.swing.event.HyperlinkEvent e );
-
-    public void hyperlinkUpdate( javax.swing.event.HyperlinkEvent e ) {
-        __hyperlinkUpdate( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/InternalFrameAdapterProxy.java b/src/org/genie/javax_swing/InternalFrameAdapterProxy.java
deleted file mode 100644
index f1587ca..0000000
--- a/src/org/genie/javax_swing/InternalFrameAdapterProxy.java
+++ /dev/null
@@ -1,180 +0,0 @@
-
-/// class javax.swing.event.InternalFrameAdapter ///
-
-package org.genie.javax_swing;
-
-public class InternalFrameAdapterProxy extends javax.swing.event.InternalFrameAdapter {
-
-    long swiftObject;
-
-    /// public javax.swing.event.InternalFrameAdapter()
-
-    InternalFrameAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void javax.swing.event.InternalFrameAdapter.internalFrameOpened(javax.swing.event.InternalFrameEvent)
-
-    public native void __internalFrameOpened( javax.swing.event.InternalFrameEvent e );
-
-    boolean entered_internalFrameOpened_0;
-
-    public void internalFrameOpened( javax.swing.event.InternalFrameEvent e ) {
-        if ( !entered_internalFrameOpened_0 ) {
-            entered_internalFrameOpened_0 = true;
-            __internalFrameOpened( e );
-            entered_internalFrameOpened_0 = false;
-        }
-        else
-            super.internalFrameOpened( e );
-    }
-
-    /// public void javax.swing.event.InternalFrameAdapter.internalFrameClosing(javax.swing.event.InternalFrameEvent)
-
-    public native void __internalFrameClosing( javax.swing.event.InternalFrameEvent e );
-
-    boolean entered_internalFrameClosing_1;
-
-    public void internalFrameClosing( javax.swing.event.InternalFrameEvent e ) {
-        if ( !entered_internalFrameClosing_1 ) {
-            entered_internalFrameClosing_1 = true;
-            __internalFrameClosing( e );
-            entered_internalFrameClosing_1 = false;
-        }
-        else
-            super.internalFrameClosing( e );
-    }
-
-    /// public void javax.swing.event.InternalFrameAdapter.internalFrameClosed(javax.swing.event.InternalFrameEvent)
-
-    public native void __internalFrameClosed( javax.swing.event.InternalFrameEvent e );
-
-    boolean entered_internalFrameClosed_2;
-
-    public void internalFrameClosed( javax.swing.event.InternalFrameEvent e ) {
-        if ( !entered_internalFrameClosed_2 ) {
-            entered_internalFrameClosed_2 = true;
-            __internalFrameClosed( e );
-            entered_internalFrameClosed_2 = false;
-        }
-        else
-            super.internalFrameClosed( e );
-    }
-
-    /// public void javax.swing.event.InternalFrameAdapter.internalFrameIconified(javax.swing.event.InternalFrameEvent)
-
-    public native void __internalFrameIconified( javax.swing.event.InternalFrameEvent e );
-
-    boolean entered_internalFrameIconified_3;
-
-    public void internalFrameIconified( javax.swing.event.InternalFrameEvent e ) {
-        if ( !entered_internalFrameIconified_3 ) {
-            entered_internalFrameIconified_3 = true;
-            __internalFrameIconified( e );
-            entered_internalFrameIconified_3 = false;
-        }
-        else
-            super.internalFrameIconified( e );
-    }
-
-    /// public void javax.swing.event.InternalFrameAdapter.internalFrameDeiconified(javax.swing.event.InternalFrameEvent)
-
-    public native void __internalFrameDeiconified( javax.swing.event.InternalFrameEvent e );
-
-    boolean entered_internalFrameDeiconified_4;
-
-    public void internalFrameDeiconified( javax.swing.event.InternalFrameEvent e ) {
-        if ( !entered_internalFrameDeiconified_4 ) {
-            entered_internalFrameDeiconified_4 = true;
-            __internalFrameDeiconified( e );
-            entered_internalFrameDeiconified_4 = false;
-        }
-        else
-            super.internalFrameDeiconified( e );
-    }
-
-    /// public void javax.swing.event.InternalFrameAdapter.internalFrameActivated(javax.swing.event.InternalFrameEvent)
-
-    public native void __internalFrameActivated( javax.swing.event.InternalFrameEvent e );
-
-    boolean entered_internalFrameActivated_5;
-
-    public void internalFrameActivated( javax.swing.event.InternalFrameEvent e ) {
-        if ( !entered_internalFrameActivated_5 ) {
-            entered_internalFrameActivated_5 = true;
-            __internalFrameActivated( e );
-            entered_internalFrameActivated_5 = false;
-        }
-        else
-            super.internalFrameActivated( e );
-    }
-
-    /// public void javax.swing.event.InternalFrameAdapter.internalFrameDeactivated(javax.swing.event.InternalFrameEvent)
-
-    public native void __internalFrameDeactivated( javax.swing.event.InternalFrameEvent e );
-
-    boolean entered_internalFrameDeactivated_6;
-
-    public void internalFrameDeactivated( javax.swing.event.InternalFrameEvent e ) {
-        if ( !entered_internalFrameDeactivated_6 ) {
-            entered_internalFrameDeactivated_6 = true;
-            __internalFrameDeactivated( e );
-            entered_internalFrameDeactivated_6 = false;
-        }
-        else
-            super.internalFrameDeactivated( e );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_7;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_7 ) {
-            entered_equals_7 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_7 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_8;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_8 ) {
-            entered_toString_8 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_8 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_9;
-
-    public int hashCode() {
-        if ( !entered_hashCode_9 ) {
-            entered_hashCode_9 = true;
-            int __return = __hashCode( );
-            entered_hashCode_9 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/JComboBox_KeySelectionManagerProxy.java b/src/org/genie/javax_swing/JComboBox_KeySelectionManagerProxy.java
deleted file mode 100644
index b5d5fe6..0000000
--- a/src/org/genie/javax_swing/JComboBox_KeySelectionManagerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface javax.swing.JComboBox$KeySelectionManager ///
-
-package org.genie.javax_swing;
-
-public class JComboBox_KeySelectionManagerProxy implements javax.swing.JComboBox.KeySelectionManager {
-
-    long swiftObject;
-
-    JComboBox_KeySelectionManagerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract int javax.swing.JComboBox$KeySelectionManager.selectionForKey(char,javax.swing.ComboBoxModel)
-
-    public native int __selectionForKey( char aKey, javax.swing.ComboBoxModel aModel );
-
-    public int selectionForKey( char aKey, javax.swing.ComboBoxModel aModel ) {
-        return __selectionForKey( aKey, aModel );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/JWindowProxy.java b/src/org/genie/javax_swing/JWindowProxy.java
deleted file mode 100644
index 906df96..0000000
--- a/src/org/genie/javax_swing/JWindowProxy.java
+++ /dev/null
@@ -1,61 +0,0 @@
-
-/// class javax.swing.JWindow ///
-
-package org.genie.javax_swing;
-
-public class JWindowProxy extends javax.swing.JWindow {
-
-    long swiftObject;
-
-    /// public javax.swing.JWindow(java.awt.Window,java.awt.GraphicsConfiguration)
-
-    JWindowProxy( java.awt.Window owner, java.awt.GraphicsConfiguration gc , long swiftObject ) {
-        super( owner, gc );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public javax.swing.JWindow(java.awt.Window)
-
-    JWindowProxy( java.awt.Window owner , long swiftObject ) {
-        super( owner );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public javax.swing.JWindow(java.awt.Frame)
-
-    JWindowProxy( java.awt.Frame owner , long swiftObject ) {
-        super( owner );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public javax.swing.JWindow(java.awt.GraphicsConfiguration)
-
-    JWindowProxy( java.awt.GraphicsConfiguration gc , long swiftObject ) {
-        super( gc );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public javax.swing.JWindow()
-
-    JWindowProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void java.awt.Window.paint(java.awt.Graphics)
-
-    public native void __paint( java.awt.Graphics arg0 );
-
-    boolean entered_paint_0;
-
-    public void paint( java.awt.Graphics arg0 ) {
-        if ( !entered_paint_0 ) {
-            entered_paint_0 = true;
-            __paint( arg0 );
-            entered_paint_0 = false;
-        }
-        else
-            super.paint( arg0 );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/ListDataListenerProxy.java b/src/org/genie/javax_swing/ListDataListenerProxy.java
deleted file mode 100644
index 081d353..0000000
--- a/src/org/genie/javax_swing/ListDataListenerProxy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/// interface javax.swing.event.ListDataListener ///
-
-package org.genie.javax_swing;
-
-public class ListDataListenerProxy implements javax.swing.event.ListDataListener {
-
-    long swiftObject;
-
-    ListDataListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.ListDataListener.contentsChanged(javax.swing.event.ListDataEvent)
-
-    public native void __contentsChanged( javax.swing.event.ListDataEvent e );
-
-    public void contentsChanged( javax.swing.event.ListDataEvent e ) {
-        __contentsChanged( e );
-    }
-
-    /// public abstract void javax.swing.event.ListDataListener.intervalAdded(javax.swing.event.ListDataEvent)
-
-    public native void __intervalAdded( javax.swing.event.ListDataEvent e );
-
-    public void intervalAdded( javax.swing.event.ListDataEvent e ) {
-        __intervalAdded( e );
-    }
-
-    /// public abstract void javax.swing.event.ListDataListener.intervalRemoved(javax.swing.event.ListDataEvent)
-
-    public native void __intervalRemoved( javax.swing.event.ListDataEvent e );
-
-    public void intervalRemoved( javax.swing.event.ListDataEvent e ) {
-        __intervalRemoved( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/ListSelectionListenerProxy.java b/src/org/genie/javax_swing/ListSelectionListenerProxy.java
deleted file mode 100644
index 10c8524..0000000
--- a/src/org/genie/javax_swing/ListSelectionListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface javax.swing.event.ListSelectionListener ///
-
-package org.genie.javax_swing;
-
-public class ListSelectionListenerProxy implements javax.swing.event.ListSelectionListener {
-
-    long swiftObject;
-
-    ListSelectionListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.ListSelectionListener.valueChanged(javax.swing.event.ListSelectionEvent)
-
-    public native void __valueChanged( javax.swing.event.ListSelectionEvent e );
-
-    public void valueChanged( javax.swing.event.ListSelectionEvent e ) {
-        __valueChanged( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/MenuDragMouseListenerProxy.java b/src/org/genie/javax_swing/MenuDragMouseListenerProxy.java
deleted file mode 100644
index 8fcd1f7..0000000
--- a/src/org/genie/javax_swing/MenuDragMouseListenerProxy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/// interface javax.swing.event.MenuDragMouseListener ///
-
-package org.genie.javax_swing;
-
-public class MenuDragMouseListenerProxy implements javax.swing.event.MenuDragMouseListener {
-
-    long swiftObject;
-
-    MenuDragMouseListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.MenuDragMouseListener.menuDragMouseEntered(javax.swing.event.MenuDragMouseEvent)
-
-    public native void __menuDragMouseEntered( javax.swing.event.MenuDragMouseEvent e );
-
-    public void menuDragMouseEntered( javax.swing.event.MenuDragMouseEvent e ) {
-        __menuDragMouseEntered( e );
-    }
-
-    /// public abstract void javax.swing.event.MenuDragMouseListener.menuDragMouseExited(javax.swing.event.MenuDragMouseEvent)
-
-    public native void __menuDragMouseExited( javax.swing.event.MenuDragMouseEvent e );
-
-    public void menuDragMouseExited( javax.swing.event.MenuDragMouseEvent e ) {
-        __menuDragMouseExited( e );
-    }
-
-    /// public abstract void javax.swing.event.MenuDragMouseListener.menuDragMouseDragged(javax.swing.event.MenuDragMouseEvent)
-
-    public native void __menuDragMouseDragged( javax.swing.event.MenuDragMouseEvent e );
-
-    public void menuDragMouseDragged( javax.swing.event.MenuDragMouseEvent e ) {
-        __menuDragMouseDragged( e );
-    }
-
-    /// public abstract void javax.swing.event.MenuDragMouseListener.menuDragMouseReleased(javax.swing.event.MenuDragMouseEvent)
-
-    public native void __menuDragMouseReleased( javax.swing.event.MenuDragMouseEvent e );
-
-    public void menuDragMouseReleased( javax.swing.event.MenuDragMouseEvent e ) {
-        __menuDragMouseReleased( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/MenuKeyListenerProxy.java b/src/org/genie/javax_swing/MenuKeyListenerProxy.java
deleted file mode 100644
index a365263..0000000
--- a/src/org/genie/javax_swing/MenuKeyListenerProxy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/// interface javax.swing.event.MenuKeyListener ///
-
-package org.genie.javax_swing;
-
-public class MenuKeyListenerProxy implements javax.swing.event.MenuKeyListener {
-
-    long swiftObject;
-
-    MenuKeyListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.MenuKeyListener.menuKeyPressed(javax.swing.event.MenuKeyEvent)
-
-    public native void __menuKeyPressed( javax.swing.event.MenuKeyEvent e );
-
-    public void menuKeyPressed( javax.swing.event.MenuKeyEvent e ) {
-        __menuKeyPressed( e );
-    }
-
-    /// public abstract void javax.swing.event.MenuKeyListener.menuKeyReleased(javax.swing.event.MenuKeyEvent)
-
-    public native void __menuKeyReleased( javax.swing.event.MenuKeyEvent e );
-
-    public void menuKeyReleased( javax.swing.event.MenuKeyEvent e ) {
-        __menuKeyReleased( e );
-    }
-
-    /// public abstract void javax.swing.event.MenuKeyListener.menuKeyTyped(javax.swing.event.MenuKeyEvent)
-
-    public native void __menuKeyTyped( javax.swing.event.MenuKeyEvent e );
-
-    public void menuKeyTyped( javax.swing.event.MenuKeyEvent e ) {
-        __menuKeyTyped( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/MenuListenerProxy.java b/src/org/genie/javax_swing/MenuListenerProxy.java
deleted file mode 100644
index 5b41b0e..0000000
--- a/src/org/genie/javax_swing/MenuListenerProxy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/// interface javax.swing.event.MenuListener ///
-
-package org.genie.javax_swing;
-
-public class MenuListenerProxy implements javax.swing.event.MenuListener {
-
-    long swiftObject;
-
-    MenuListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.MenuListener.menuSelected(javax.swing.event.MenuEvent)
-
-    public native void __menuSelected( javax.swing.event.MenuEvent e );
-
-    public void menuSelected( javax.swing.event.MenuEvent e ) {
-        __menuSelected( e );
-    }
-
-    /// public abstract void javax.swing.event.MenuListener.menuDeselected(javax.swing.event.MenuEvent)
-
-    public native void __menuDeselected( javax.swing.event.MenuEvent e );
-
-    public void menuDeselected( javax.swing.event.MenuEvent e ) {
-        __menuDeselected( e );
-    }
-
-    /// public abstract void javax.swing.event.MenuListener.menuCanceled(javax.swing.event.MenuEvent)
-
-    public native void __menuCanceled( javax.swing.event.MenuEvent e );
-
-    public void menuCanceled( javax.swing.event.MenuEvent e ) {
-        __menuCanceled( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/MouseInputAdapterProxy.java b/src/org/genie/javax_swing/MouseInputAdapterProxy.java
deleted file mode 100644
index 63b5b83..0000000
--- a/src/org/genie/javax_swing/MouseInputAdapterProxy.java
+++ /dev/null
@@ -1,196 +0,0 @@
-
-/// class javax.swing.event.MouseInputAdapter ///
-
-package org.genie.javax_swing;
-
-public class MouseInputAdapterProxy extends javax.swing.event.MouseInputAdapter {
-
-    long swiftObject;
-
-    /// public javax.swing.event.MouseInputAdapter()
-
-    MouseInputAdapterProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
-    }
-
-    /// public void java.awt.event.MouseAdapter.mousePressed(java.awt.event.MouseEvent)
-
-    public native void __mousePressed( java.awt.event.MouseEvent e );
-
-    boolean entered_mousePressed_0;
-
-    public void mousePressed( java.awt.event.MouseEvent e ) {
-        if ( !entered_mousePressed_0 ) {
-            entered_mousePressed_0 = true;
-            __mousePressed( e );
-            entered_mousePressed_0 = false;
-        }
-        else
-            super.mousePressed( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseReleased(java.awt.event.MouseEvent)
-
-    public native void __mouseReleased( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseReleased_1;
-
-    public void mouseReleased( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseReleased_1 ) {
-            entered_mouseReleased_1 = true;
-            __mouseReleased( e );
-            entered_mouseReleased_1 = false;
-        }
-        else
-            super.mouseReleased( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseClicked(java.awt.event.MouseEvent)
-
-    public native void __mouseClicked( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseClicked_2;
-
-    public void mouseClicked( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseClicked_2 ) {
-            entered_mouseClicked_2 = true;
-            __mouseClicked( e );
-            entered_mouseClicked_2 = false;
-        }
-        else
-            super.mouseClicked( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseExited(java.awt.event.MouseEvent)
-
-    public native void __mouseExited( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseExited_3;
-
-    public void mouseExited( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseExited_3 ) {
-            entered_mouseExited_3 = true;
-            __mouseExited( e );
-            entered_mouseExited_3 = false;
-        }
-        else
-            super.mouseExited( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseEntered(java.awt.event.MouseEvent)
-
-    public native void __mouseEntered( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseEntered_4;
-
-    public void mouseEntered( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseEntered_4 ) {
-            entered_mouseEntered_4 = true;
-            __mouseEntered( e );
-            entered_mouseEntered_4 = false;
-        }
-        else
-            super.mouseEntered( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseMoved(java.awt.event.MouseEvent)
-
-    public native void __mouseMoved( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseMoved_5;
-
-    public void mouseMoved( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseMoved_5 ) {
-            entered_mouseMoved_5 = true;
-            __mouseMoved( e );
-            entered_mouseMoved_5 = false;
-        }
-        else
-            super.mouseMoved( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseDragged(java.awt.event.MouseEvent)
-
-    public native void __mouseDragged( java.awt.event.MouseEvent e );
-
-    boolean entered_mouseDragged_6;
-
-    public void mouseDragged( java.awt.event.MouseEvent e ) {
-        if ( !entered_mouseDragged_6 ) {
-            entered_mouseDragged_6 = true;
-            __mouseDragged( e );
-            entered_mouseDragged_6 = false;
-        }
-        else
-            super.mouseDragged( e );
-    }
-
-    /// public void java.awt.event.MouseAdapter.mouseWheelMoved(java.awt.event.MouseWheelEvent)
-
-    public native void __mouseWheelMoved( java.awt.event.MouseWheelEvent e );
-
-    boolean entered_mouseWheelMoved_7;
-
-    public void mouseWheelMoved( java.awt.event.MouseWheelEvent e ) {
-        if ( !entered_mouseWheelMoved_7 ) {
-            entered_mouseWheelMoved_7 = true;
-            __mouseWheelMoved( e );
-            entered_mouseWheelMoved_7 = false;
-        }
-        else
-            super.mouseWheelMoved( e );
-    }
-
-    /// public boolean java.lang.Object.equals(java.lang.Object)
-
-    public native boolean __equals( java.lang.Object arg0 );
-
-    boolean entered_equals_8;
-
-    public boolean equals( java.lang.Object arg0 ) {
-        if ( !entered_equals_8 ) {
-            entered_equals_8 = true;
-            boolean __return = __equals( arg0 );
-            entered_equals_8 = false;
-            return __return;
-        }
-        else
-            return super.equals( arg0 );
-    }
-
-    /// public java.lang.String java.lang.Object.toString()
-
-    public native java.lang.String __toString();
-
-    boolean entered_toString_9;
-
-    public java.lang.String toString() {
-        if ( !entered_toString_9 ) {
-            entered_toString_9 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_9 = false;
-            return __return;
-        }
-        else
-            return super.toString( );
-    }
-
-    /// public native int java.lang.Object.hashCode()
-
-    public native int __hashCode();
-
-    boolean entered_hashCode_10;
-
-    public int hashCode() {
-        if ( !entered_hashCode_10 ) {
-            entered_hashCode_10 = true;
-            int __return = __hashCode( );
-            entered_hashCode_10 = false;
-            return __return;
-        }
-        else
-            return super.hashCode( );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/MouseInputListenerProxy.java b/src/org/genie/javax_swing/MouseInputListenerProxy.java
deleted file mode 100644
index a28518d..0000000
--- a/src/org/genie/javax_swing/MouseInputListenerProxy.java
+++ /dev/null
@@ -1,70 +0,0 @@
-
-/// interface javax.swing.event.MouseInputListener ///
-
-package org.genie.javax_swing;
-
-public class MouseInputListenerProxy implements javax.swing.event.MouseInputListener {
-
-    long swiftObject;
-
-    MouseInputListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void java.awt.event.MouseListener.mousePressed(java.awt.event.MouseEvent)
-
-    public native void __mousePressed( java.awt.event.MouseEvent e );
-
-    public void mousePressed( java.awt.event.MouseEvent e ) {
-        __mousePressed( e );
-    }
-
-    /// public abstract void java.awt.event.MouseListener.mouseReleased(java.awt.event.MouseEvent)
-
-    public native void __mouseReleased( java.awt.event.MouseEvent e );
-
-    public void mouseReleased( java.awt.event.MouseEvent e ) {
-        __mouseReleased( e );
-    }
-
-    /// public abstract void java.awt.event.MouseListener.mouseClicked(java.awt.event.MouseEvent)
-
-    public native void __mouseClicked( java.awt.event.MouseEvent e );
-
-    public void mouseClicked( java.awt.event.MouseEvent e ) {
-        __mouseClicked( e );
-    }
-
-    /// public abstract void java.awt.event.MouseListener.mouseExited(java.awt.event.MouseEvent)
-
-    public native void __mouseExited( java.awt.event.MouseEvent e );
-
-    public void mouseExited( java.awt.event.MouseEvent e ) {
-        __mouseExited( e );
-    }
-
-    /// public abstract void java.awt.event.MouseListener.mouseEntered(java.awt.event.MouseEvent)
-
-    public native void __mouseEntered( java.awt.event.MouseEvent e );
-
-    public void mouseEntered( java.awt.event.MouseEvent e ) {
-        __mouseEntered( e );
-    }
-
-    /// public abstract void java.awt.event.MouseMotionListener.mouseMoved(java.awt.event.MouseEvent)
-
-    public native void __mouseMoved( java.awt.event.MouseEvent e );
-
-    public void mouseMoved( java.awt.event.MouseEvent e ) {
-        __mouseMoved( e );
-    }
-
-    /// public abstract void java.awt.event.MouseMotionListener.mouseDragged(java.awt.event.MouseEvent)
-
-    public native void __mouseDragged( java.awt.event.MouseEvent e );
-
-    public void mouseDragged( java.awt.event.MouseEvent e ) {
-        __mouseDragged( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/PopupMenuListenerProxy.java b/src/org/genie/javax_swing/PopupMenuListenerProxy.java
deleted file mode 100644
index 46836a6..0000000
--- a/src/org/genie/javax_swing/PopupMenuListenerProxy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/// interface javax.swing.event.PopupMenuListener ///
-
-package org.genie.javax_swing;
-
-public class PopupMenuListenerProxy implements javax.swing.event.PopupMenuListener {
-
-    long swiftObject;
-
-    PopupMenuListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.PopupMenuListener.popupMenuWillBecomeVisible(javax.swing.event.PopupMenuEvent)
-
-    public native void __popupMenuWillBecomeVisible( javax.swing.event.PopupMenuEvent e );
-
-    public void popupMenuWillBecomeVisible( javax.swing.event.PopupMenuEvent e ) {
-        __popupMenuWillBecomeVisible( e );
-    }
-
-    /// public abstract void javax.swing.event.PopupMenuListener.popupMenuWillBecomeInvisible(javax.swing.event.PopupMenuEvent)
-
-    public native void __popupMenuWillBecomeInvisible( javax.swing.event.PopupMenuEvent e );
-
-    public void popupMenuWillBecomeInvisible( javax.swing.event.PopupMenuEvent e ) {
-        __popupMenuWillBecomeInvisible( e );
-    }
-
-    /// public abstract void javax.swing.event.PopupMenuListener.popupMenuCanceled(javax.swing.event.PopupMenuEvent)
-
-    public native void __popupMenuCanceled( javax.swing.event.PopupMenuEvent e );
-
-    public void popupMenuCanceled( javax.swing.event.PopupMenuEvent e ) {
-        __popupMenuCanceled( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/RowSorterListenerProxy.java b/src/org/genie/javax_swing/RowSorterListenerProxy.java
deleted file mode 100644
index 5e5cac5..0000000
--- a/src/org/genie/javax_swing/RowSorterListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface javax.swing.event.RowSorterListener ///
-
-package org.genie.javax_swing;
-
-public class RowSorterListenerProxy implements javax.swing.event.RowSorterListener {
-
-    long swiftObject;
-
-    RowSorterListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.RowSorterListener.sorterChanged(javax.swing.event.RowSorterEvent)
-
-    public native void __sorterChanged( javax.swing.event.RowSorterEvent e );
-
-    public void sorterChanged( javax.swing.event.RowSorterEvent e ) {
-        __sorterChanged( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/TableModelListenerProxy.java b/src/org/genie/javax_swing/TableModelListenerProxy.java
deleted file mode 100644
index 888857f..0000000
--- a/src/org/genie/javax_swing/TableModelListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface javax.swing.event.TableModelListener ///
-
-package org.genie.javax_swing;
-
-public class TableModelListenerProxy implements javax.swing.event.TableModelListener {
-
-    long swiftObject;
-
-    TableModelListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.TableModelListener.tableChanged(javax.swing.event.TableModelEvent)
-
-    public native void __tableChanged( javax.swing.event.TableModelEvent e );
-
-    public void tableChanged( javax.swing.event.TableModelEvent e ) {
-        __tableChanged( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/TreeExpansionListenerProxy.java b/src/org/genie/javax_swing/TreeExpansionListenerProxy.java
deleted file mode 100644
index 44e4ff0..0000000
--- a/src/org/genie/javax_swing/TreeExpansionListenerProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/// interface javax.swing.event.TreeExpansionListener ///
-
-package org.genie.javax_swing;
-
-public class TreeExpansionListenerProxy implements javax.swing.event.TreeExpansionListener {
-
-    long swiftObject;
-
-    TreeExpansionListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.TreeExpansionListener.treeExpanded(javax.swing.event.TreeExpansionEvent)
-
-    public native void __treeExpanded( javax.swing.event.TreeExpansionEvent event );
-
-    public void treeExpanded( javax.swing.event.TreeExpansionEvent event ) {
-        __treeExpanded( event );
-    }
-
-    /// public abstract void javax.swing.event.TreeExpansionListener.treeCollapsed(javax.swing.event.TreeExpansionEvent)
-
-    public native void __treeCollapsed( javax.swing.event.TreeExpansionEvent event );
-
-    public void treeCollapsed( javax.swing.event.TreeExpansionEvent event ) {
-        __treeCollapsed( event );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/TreeModelListenerProxy.java b/src/org/genie/javax_swing/TreeModelListenerProxy.java
deleted file mode 100644
index de71925..0000000
--- a/src/org/genie/javax_swing/TreeModelListenerProxy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/// interface javax.swing.event.TreeModelListener ///
-
-package org.genie.javax_swing;
-
-public class TreeModelListenerProxy implements javax.swing.event.TreeModelListener {
-
-    long swiftObject;
-
-    TreeModelListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.TreeModelListener.treeNodesChanged(javax.swing.event.TreeModelEvent)
-
-    public native void __treeNodesChanged( javax.swing.event.TreeModelEvent e );
-
-    public void treeNodesChanged( javax.swing.event.TreeModelEvent e ) {
-        __treeNodesChanged( e );
-    }
-
-    /// public abstract void javax.swing.event.TreeModelListener.treeNodesInserted(javax.swing.event.TreeModelEvent)
-
-    public native void __treeNodesInserted( javax.swing.event.TreeModelEvent e );
-
-    public void treeNodesInserted( javax.swing.event.TreeModelEvent e ) {
-        __treeNodesInserted( e );
-    }
-
-    /// public abstract void javax.swing.event.TreeModelListener.treeNodesRemoved(javax.swing.event.TreeModelEvent)
-
-    public native void __treeNodesRemoved( javax.swing.event.TreeModelEvent e );
-
-    public void treeNodesRemoved( javax.swing.event.TreeModelEvent e ) {
-        __treeNodesRemoved( e );
-    }
-
-    /// public abstract void javax.swing.event.TreeModelListener.treeStructureChanged(javax.swing.event.TreeModelEvent)
-
-    public native void __treeStructureChanged( javax.swing.event.TreeModelEvent e );
-
-    public void treeStructureChanged( javax.swing.event.TreeModelEvent e ) {
-        __treeStructureChanged( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/TreeSelectionListenerProxy.java b/src/org/genie/javax_swing/TreeSelectionListenerProxy.java
deleted file mode 100644
index 0576d3e..0000000
--- a/src/org/genie/javax_swing/TreeSelectionListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface javax.swing.event.TreeSelectionListener ///
-
-package org.genie.javax_swing;
-
-public class TreeSelectionListenerProxy implements javax.swing.event.TreeSelectionListener {
-
-    long swiftObject;
-
-    TreeSelectionListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.TreeSelectionListener.valueChanged(javax.swing.event.TreeSelectionEvent)
-
-    public native void __valueChanged( javax.swing.event.TreeSelectionEvent e );
-
-    public void valueChanged( javax.swing.event.TreeSelectionEvent e ) {
-        __valueChanged( e );
-    }
-
-}
diff --git a/src/org/genie/javax_swing/UndoableEditListenerProxy.java b/src/org/genie/javax_swing/UndoableEditListenerProxy.java
deleted file mode 100644
index 9314306..0000000
--- a/src/org/genie/javax_swing/UndoableEditListenerProxy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/// interface javax.swing.event.UndoableEditListener ///
-
-package org.genie.javax_swing;
-
-public class UndoableEditListenerProxy implements javax.swing.event.UndoableEditListener {
-
-    long swiftObject;
-
-    UndoableEditListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
-    }
-
-    /// public abstract void javax.swing.event.UndoableEditListener.undoableEditHappened(javax.swing.event.UndoableEditEvent)
-
-    public native void __undoableEditHappened( javax.swing.event.UndoableEditEvent e );
-
-    public void undoableEditHappened( javax.swing.event.UndoableEditEvent e ) {
-        __undoableEditHappened( e );
-    }
-
-}
diff --git a/src/org/genie/SwiftTest.java b/src/org/swiftjava/SwiftTest.java
similarity index 66%
rename from src/org/genie/SwiftTest.java
rename to src/org/swiftjava/SwiftTest.java
index de9baab..c4b6581 100644
--- a/src/org/genie/SwiftTest.java
+++ b/src/org/swiftjava/SwiftTest.java
@@ -1,8 +1,14 @@
 
-package org.genie;
+package org.swiftjava;
+
+// auto generated by ../../../gentests.rb
+
+import com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener;
 
 public class SwiftTest {
 
+    public TestListener loopback;
+
     public SwiftTest() {
     }
 
@@ -14,7 +20,7 @@ public static boolean booleanMethodStatic( boolean arg ) {
     }
 
     public boolean booleanMethod( boolean arg ) {
-        return arg;
+        return loopback != null ? loopback.booleanMethod( arg ) : arg;
     }
 
     public static boolean booleanArrayFieldStatic[];
@@ -25,7 +31,7 @@ public static boolean[] booleanArrayMethodStatic( boolean arg[] ) {
     }
 
     public boolean[] booleanArrayMethod( boolean arg[] ) {
-        return arg;
+        return loopback != null ? loopback.booleanArrayMethod( arg ) : arg;
     }
 
     public static boolean boolean2dArrayFieldStatic[][];
@@ -36,7 +42,7 @@ public static boolean[][] boolean2dArrayMethodStatic( boolean arg[][] ) {
     }
 
     public boolean[][] boolean2dArrayMethod( boolean arg[][] ) {
-        return arg;
+        return loopback != null ? loopback.boolean2dArrayMethod( arg ) : arg;
     }
 
     public static byte byteFieldStatic;
@@ -47,7 +53,7 @@ public static byte byteMethodStatic( byte arg ) {
     }
 
     public byte byteMethod( byte arg ) {
-        return arg;
+        return loopback != null ? loopback.byteMethod( arg ) : arg;
     }
 
     public static byte byteArrayFieldStatic[];
@@ -58,7 +64,7 @@ public static byte[] byteArrayMethodStatic( byte arg[] ) {
     }
 
     public byte[] byteArrayMethod( byte arg[] ) {
-        return arg;
+        return loopback != null ? loopback.byteArrayMethod( arg ) : arg;
     }
 
     public static byte byte2dArrayFieldStatic[][];
@@ -69,7 +75,7 @@ public static byte[][] byte2dArrayMethodStatic( byte arg[][] ) {
     }
 
     public byte[][] byte2dArrayMethod( byte arg[][] ) {
-        return arg;
+        return loopback != null ? loopback.byte2dArrayMethod( arg ) : arg;
     }
 
     public static char charFieldStatic;
@@ -80,7 +86,7 @@ public static char charMethodStatic( char arg ) {
     }
 
     public char charMethod( char arg ) {
-        return arg;
+        return loopback != null ? loopback.charMethod( arg ) : arg;
     }
 
     public static char charArrayFieldStatic[];
@@ -91,7 +97,7 @@ public static char[] charArrayMethodStatic( char arg[] ) {
     }
 
     public char[] charArrayMethod( char arg[] ) {
-        return arg;
+        return loopback != null ? loopback.charArrayMethod( arg ) : arg;
     }
 
     public static char char2dArrayFieldStatic[][];
@@ -102,7 +108,7 @@ public static char[][] char2dArrayMethodStatic( char arg[][] ) {
     }
 
     public char[][] char2dArrayMethod( char arg[][] ) {
-        return arg;
+        return loopback != null ? loopback.char2dArrayMethod( arg ) : arg;
     }
 
     public static short shortFieldStatic;
@@ -113,7 +119,7 @@ public static short shortMethodStatic( short arg ) {
     }
 
     public short shortMethod( short arg ) {
-        return arg;
+        return loopback != null ? loopback.shortMethod( arg ) : arg;
     }
 
     public static short shortArrayFieldStatic[];
@@ -124,7 +130,7 @@ public static short[] shortArrayMethodStatic( short arg[] ) {
     }
 
     public short[] shortArrayMethod( short arg[] ) {
-        return arg;
+        return loopback != null ? loopback.shortArrayMethod( arg ) : arg;
     }
 
     public static short short2dArrayFieldStatic[][];
@@ -135,7 +141,7 @@ public static short[][] short2dArrayMethodStatic( short arg[][] ) {
     }
 
     public short[][] short2dArrayMethod( short arg[][] ) {
-        return arg;
+        return loopback != null ? loopback.short2dArrayMethod( arg ) : arg;
     }
 
     public static int intFieldStatic;
@@ -146,7 +152,7 @@ public static int intMethodStatic( int arg ) {
     }
 
     public int intMethod( int arg ) {
-        return arg;
+        return loopback != null ? loopback.intMethod( arg ) : arg;
     }
 
     public static int intArrayFieldStatic[];
@@ -157,7 +163,7 @@ public static int[] intArrayMethodStatic( int arg[] ) {
     }
 
     public int[] intArrayMethod( int arg[] ) {
-        return arg;
+        return loopback != null ? loopback.intArrayMethod( arg ) : arg;
     }
 
     public static int int2dArrayFieldStatic[][];
@@ -168,7 +174,7 @@ public static int[][] int2dArrayMethodStatic( int arg[][] ) {
     }
 
     public int[][] int2dArrayMethod( int arg[][] ) {
-        return arg;
+        return loopback != null ? loopback.int2dArrayMethod( arg ) : arg;
     }
 
     public static long longFieldStatic;
@@ -179,7 +185,7 @@ public static long longMethodStatic( long arg ) {
     }
 
     public long longMethod( long arg ) {
-        return arg;
+        return loopback != null ? loopback.longMethod( arg ) : arg;
     }
 
     public static long longArrayFieldStatic[];
@@ -190,7 +196,7 @@ public static long[] longArrayMethodStatic( long arg[] ) {
     }
 
     public long[] longArrayMethod( long arg[] ) {
-        return arg;
+        return loopback != null ? loopback.longArrayMethod( arg ) : arg;
     }
 
     public static long long2dArrayFieldStatic[][];
@@ -201,7 +207,7 @@ public static long[][] long2dArrayMethodStatic( long arg[][] ) {
     }
 
     public long[][] long2dArrayMethod( long arg[][] ) {
-        return arg;
+        return loopback != null ? loopback.long2dArrayMethod( arg ) : arg;
     }
 
     public static float floatFieldStatic;
@@ -212,7 +218,7 @@ public static float floatMethodStatic( float arg ) {
     }
 
     public float floatMethod( float arg ) {
-        return arg;
+        return loopback != null ? loopback.floatMethod( arg ) : arg;
     }
 
     public static float floatArrayFieldStatic[];
@@ -223,7 +229,7 @@ public static float[] floatArrayMethodStatic( float arg[] ) {
     }
 
     public float[] floatArrayMethod( float arg[] ) {
-        return arg;
+        return loopback != null ? loopback.floatArrayMethod( arg ) : arg;
     }
 
     public static float float2dArrayFieldStatic[][];
@@ -234,7 +240,7 @@ public static float[][] float2dArrayMethodStatic( float arg[][] ) {
     }
 
     public float[][] float2dArrayMethod( float arg[][] ) {
-        return arg;
+        return loopback != null ? loopback.float2dArrayMethod( arg ) : arg;
     }
 
     public static double doubleFieldStatic;
@@ -245,7 +251,7 @@ public static double doubleMethodStatic( double arg ) {
     }
 
     public double doubleMethod( double arg ) {
-        return arg;
+        return loopback != null ? loopback.doubleMethod( arg ) : arg;
     }
 
     public static double doubleArrayFieldStatic[];
@@ -256,7 +262,7 @@ public static double[] doubleArrayMethodStatic( double arg[] ) {
     }
 
     public double[] doubleArrayMethod( double arg[] ) {
-        return arg;
+        return loopback != null ? loopback.doubleArrayMethod( arg ) : arg;
     }
 
     public static double double2dArrayFieldStatic[][];
@@ -267,7 +273,7 @@ public static double[][] double2dArrayMethodStatic( double arg[][] ) {
     }
 
     public double[][] double2dArrayMethod( double arg[][] ) {
-        return arg;
+        return loopback != null ? loopback.double2dArrayMethod( arg ) : arg;
     }
 
     public static String StringFieldStatic;
@@ -278,7 +284,7 @@ public static String StringMethodStatic( String arg ) {
     }
 
     public String StringMethod( String arg ) {
-        return arg;
+        return loopback != null ? loopback.StringMethod( arg ) : arg;
     }
 
     public static String StringArrayFieldStatic[];
@@ -289,7 +295,7 @@ public static String[] StringArrayMethodStatic( String arg[] ) {
     }
 
     public String[] StringArrayMethod( String arg[] ) {
-        return arg;
+        return loopback != null ? loopback.StringArrayMethod( arg ) : arg;
     }
 
     public static String String2dArrayFieldStatic[][];
@@ -300,7 +306,40 @@ public static String[][] String2dArrayMethodStatic( String arg[][] ) {
     }
 
     public String[][] String2dArrayMethod( String arg[][] ) {
+        return loopback != null ? loopback.String2dArrayMethod( arg ) : arg;
+    }
+
+    public static TestListener TestListenerFieldStatic;
+    public TestListener TestListenerField;
+
+    public static TestListener TestListenerMethodStatic( TestListener arg ) {
         return arg;
     }
 
+    public TestListener TestListenerMethod( TestListener arg ) {
+        return loopback != null ? loopback.TestListenerMethod( arg ) : arg;
+    }
+
+    public static TestListener TestListenerArrayFieldStatic[];
+    public TestListener TestListenerArrayField[];
+
+    public static TestListener[] TestListenerArrayMethodStatic( TestListener arg[] ) {
+        return arg;
+    }
+
+    public TestListener[] TestListenerArrayMethod( TestListener arg[] ) {
+        return loopback != null ? loopback.TestListenerArrayMethod( arg ) : arg;
+    }
+
+    public static TestListener TestListener2dArrayFieldStatic[][];
+    public TestListener TestListener2dArrayField[][];
+
+    public static TestListener[][] TestListener2dArrayMethodStatic( TestListener arg[][] ) {
+        return arg;
+    }
+
+    public TestListener[][] TestListener2dArrayMethod( TestListener arg[][] ) {
+        return loopback != null ? loopback.TestListener2dArrayMethod( arg ) : arg;
+    }
+
 }
diff --git a/src/org/swiftjava/com_apple/AboutHandlerProxy.java b/src/org/swiftjava/com_apple/AboutHandlerProxy.java
new file mode 100644
index 0000000..959c11c
--- /dev/null
+++ b/src/org/swiftjava/com_apple/AboutHandlerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.AboutHandler ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class AboutHandlerProxy implements com.apple.eawt.AboutHandler {
+
+    // address of proxy object
+    long __swiftObject;
+
+    AboutHandlerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.AboutHandler.handleAbout(com.apple.eawt.AppEvent$AboutEvent)
+
+    public native void __handleAbout( long __swiftObject, com.apple.eawt.AppEvent.AboutEvent arg0 );
+
+    public void handleAbout( com.apple.eawt.AppEvent.AboutEvent arg0 ) {
+        __handleAbout( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/AppEventListenerProxy.java b/src/org/swiftjava/com_apple/AppEventListenerProxy.java
new file mode 100644
index 0000000..149d890
--- /dev/null
+++ b/src/org/swiftjava/com_apple/AppEventListenerProxy.java
@@ -0,0 +1,24 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.AppEventListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class AppEventListenerProxy implements com.apple.eawt.AppEventListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    AppEventListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/AppForegroundListenerProxy.java b/src/org/swiftjava/com_apple/AppForegroundListenerProxy.java
new file mode 100644
index 0000000..eac1aa4
--- /dev/null
+++ b/src/org/swiftjava/com_apple/AppForegroundListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.AppForegroundListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class AppForegroundListenerProxy implements com.apple.eawt.AppForegroundListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    AppForegroundListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.AppForegroundListener.appMovedToBackground(com.apple.eawt.AppEvent$AppForegroundEvent)
+
+    public native void __appMovedToBackground( long __swiftObject, com.apple.eawt.AppEvent.AppForegroundEvent arg0 );
+
+    public void appMovedToBackground( com.apple.eawt.AppEvent.AppForegroundEvent arg0 ) {
+        __appMovedToBackground( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.AppForegroundListener.appRaisedToForeground(com.apple.eawt.AppEvent$AppForegroundEvent)
+
+    public native void __appRaisedToForeground( long __swiftObject, com.apple.eawt.AppEvent.AppForegroundEvent arg0 );
+
+    public void appRaisedToForeground( com.apple.eawt.AppEvent.AppForegroundEvent arg0 ) {
+        __appRaisedToForeground( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/AppHiddenListenerProxy.java b/src/org/swiftjava/com_apple/AppHiddenListenerProxy.java
new file mode 100644
index 0000000..431dfee
--- /dev/null
+++ b/src/org/swiftjava/com_apple/AppHiddenListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.AppHiddenListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class AppHiddenListenerProxy implements com.apple.eawt.AppHiddenListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    AppHiddenListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.AppHiddenListener.appHidden(com.apple.eawt.AppEvent$AppHiddenEvent)
+
+    public native void __appHidden( long __swiftObject, com.apple.eawt.AppEvent.AppHiddenEvent arg0 );
+
+    public void appHidden( com.apple.eawt.AppEvent.AppHiddenEvent arg0 ) {
+        __appHidden( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.AppHiddenListener.appUnhidden(com.apple.eawt.AppEvent$AppHiddenEvent)
+
+    public native void __appUnhidden( long __swiftObject, com.apple.eawt.AppEvent.AppHiddenEvent arg0 );
+
+    public void appUnhidden( com.apple.eawt.AppEvent.AppHiddenEvent arg0 ) {
+        __appUnhidden( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/AppReOpenedListenerProxy.java b/src/org/swiftjava/com_apple/AppReOpenedListenerProxy.java
new file mode 100644
index 0000000..6f36ee4
--- /dev/null
+++ b/src/org/swiftjava/com_apple/AppReOpenedListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.AppReOpenedListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class AppReOpenedListenerProxy implements com.apple.eawt.AppReOpenedListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    AppReOpenedListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.AppReOpenedListener.appReOpened(com.apple.eawt.AppEvent$AppReOpenedEvent)
+
+    public native void __appReOpened( long __swiftObject, com.apple.eawt.AppEvent.AppReOpenedEvent arg0 );
+
+    public void appReOpened( com.apple.eawt.AppEvent.AppReOpenedEvent arg0 ) {
+        __appReOpened( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/ApplicationAdapterProxy.java b/src/org/swiftjava/com_apple/ApplicationAdapterProxy.java
new file mode 100644
index 0000000..8de94a0
--- /dev/null
+++ b/src/org/swiftjava/com_apple/ApplicationAdapterProxy.java
@@ -0,0 +1,190 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class com.apple.eawt.ApplicationAdapter ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class ApplicationAdapterProxy extends com.apple.eawt.ApplicationAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public com.apple.eawt.ApplicationAdapter()
+
+    ApplicationAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_0;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_0 ) {
+            entered_equals_0 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_0 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public void com.apple.eawt.ApplicationAdapter.handleAbout(com.apple.eawt.ApplicationEvent)
+
+    public native void __handleAbout( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
+
+    boolean entered_handleAbout_1;
+
+    public void handleAbout( com.apple.eawt.ApplicationEvent arg0 ) {
+        if ( !entered_handleAbout_1 ) {
+            entered_handleAbout_1 = true;
+            __handleAbout( __swiftObject, arg0);
+            entered_handleAbout_1 = false;
+        }
+        else
+            super.handleAbout( arg0 );
+    }
+
+    /// public void com.apple.eawt.ApplicationAdapter.handleOpenApplication(com.apple.eawt.ApplicationEvent)
+
+    public native void __handleOpenApplication( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
+
+    boolean entered_handleOpenApplication_2;
+
+    public void handleOpenApplication( com.apple.eawt.ApplicationEvent arg0 ) {
+        if ( !entered_handleOpenApplication_2 ) {
+            entered_handleOpenApplication_2 = true;
+            __handleOpenApplication( __swiftObject, arg0);
+            entered_handleOpenApplication_2 = false;
+        }
+        else
+            super.handleOpenApplication( arg0 );
+    }
+
+    /// public void com.apple.eawt.ApplicationAdapter.handleOpenFile(com.apple.eawt.ApplicationEvent)
+
+    public native void __handleOpenFile( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
+
+    boolean entered_handleOpenFile_3;
+
+    public void handleOpenFile( com.apple.eawt.ApplicationEvent arg0 ) {
+        if ( !entered_handleOpenFile_3 ) {
+            entered_handleOpenFile_3 = true;
+            __handleOpenFile( __swiftObject, arg0);
+            entered_handleOpenFile_3 = false;
+        }
+        else
+            super.handleOpenFile( arg0 );
+    }
+
+    /// public void com.apple.eawt.ApplicationAdapter.handlePreferences(com.apple.eawt.ApplicationEvent)
+
+    public native void __handlePreferences( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
+
+    boolean entered_handlePreferences_4;
+
+    public void handlePreferences( com.apple.eawt.ApplicationEvent arg0 ) {
+        if ( !entered_handlePreferences_4 ) {
+            entered_handlePreferences_4 = true;
+            __handlePreferences( __swiftObject, arg0);
+            entered_handlePreferences_4 = false;
+        }
+        else
+            super.handlePreferences( arg0 );
+    }
+
+    /// public void com.apple.eawt.ApplicationAdapter.handlePrintFile(com.apple.eawt.ApplicationEvent)
+
+    public native void __handlePrintFile( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
+
+    boolean entered_handlePrintFile_5;
+
+    public void handlePrintFile( com.apple.eawt.ApplicationEvent arg0 ) {
+        if ( !entered_handlePrintFile_5 ) {
+            entered_handlePrintFile_5 = true;
+            __handlePrintFile( __swiftObject, arg0);
+            entered_handlePrintFile_5 = false;
+        }
+        else
+            super.handlePrintFile( arg0 );
+    }
+
+    /// public void com.apple.eawt.ApplicationAdapter.handleQuit(com.apple.eawt.ApplicationEvent)
+
+    public native void __handleQuit( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
+
+    boolean entered_handleQuit_6;
+
+    public void handleQuit( com.apple.eawt.ApplicationEvent arg0 ) {
+        if ( !entered_handleQuit_6 ) {
+            entered_handleQuit_6 = true;
+            __handleQuit( __swiftObject, arg0);
+            entered_handleQuit_6 = false;
+        }
+        else
+            super.handleQuit( arg0 );
+    }
+
+    /// public void com.apple.eawt.ApplicationAdapter.handleReOpenApplication(com.apple.eawt.ApplicationEvent)
+
+    public native void __handleReOpenApplication( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
+
+    boolean entered_handleReOpenApplication_7;
+
+    public void handleReOpenApplication( com.apple.eawt.ApplicationEvent arg0 ) {
+        if ( !entered_handleReOpenApplication_7 ) {
+            entered_handleReOpenApplication_7 = true;
+            __handleReOpenApplication( __swiftObject, arg0);
+            entered_handleReOpenApplication_7 = false;
+        }
+        else
+            super.handleReOpenApplication( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_8;
+
+    public int hashCode() {
+        if ( !entered_hashCode_8 ) {
+            entered_hashCode_8 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_8 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_9;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_9 ) {
+            entered_toString_9 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_9 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/com_apple/ApplicationListenerProxy.java b/src/org/swiftjava/com_apple/ApplicationListenerProxy.java
similarity index 50%
rename from src/org/genie/com_apple/ApplicationListenerProxy.java
rename to src/org/swiftjava/com_apple/ApplicationListenerProxy.java
index 1071667..ae64196 100644
--- a/src/org/genie/com_apple/ApplicationListenerProxy.java
+++ b/src/org/swiftjava/com_apple/ApplicationListenerProxy.java
@@ -1,70 +1,80 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// interface com.apple.eawt.ApplicationListener ///
 
-package org.genie.com_apple;
+package org.swiftjava.com_apple;
 
+@SuppressWarnings("JniMissingFunction")
 public class ApplicationListenerProxy implements com.apple.eawt.ApplicationListener {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
-    ApplicationListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
+    ApplicationListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
     }
 
     /// public abstract void com.apple.eawt.ApplicationListener.handleAbout(com.apple.eawt.ApplicationEvent)
 
-    public native void __handleAbout( com.apple.eawt.ApplicationEvent arg0 );
+    public native void __handleAbout( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
 
     public void handleAbout( com.apple.eawt.ApplicationEvent arg0 ) {
-        __handleAbout( arg0 );
-    }
-
-    /// public abstract void com.apple.eawt.ApplicationListener.handlePreferences(com.apple.eawt.ApplicationEvent)
-
-    public native void __handlePreferences( com.apple.eawt.ApplicationEvent arg0 );
-
-    public void handlePreferences( com.apple.eawt.ApplicationEvent arg0 ) {
-        __handlePreferences( arg0 );
+        __handleAbout( __swiftObject, arg0 );
     }
 
     /// public abstract void com.apple.eawt.ApplicationListener.handleOpenApplication(com.apple.eawt.ApplicationEvent)
 
-    public native void __handleOpenApplication( com.apple.eawt.ApplicationEvent arg0 );
+    public native void __handleOpenApplication( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
 
     public void handleOpenApplication( com.apple.eawt.ApplicationEvent arg0 ) {
-        __handleOpenApplication( arg0 );
+        __handleOpenApplication( __swiftObject, arg0 );
     }
 
     /// public abstract void com.apple.eawt.ApplicationListener.handleOpenFile(com.apple.eawt.ApplicationEvent)
 
-    public native void __handleOpenFile( com.apple.eawt.ApplicationEvent arg0 );
+    public native void __handleOpenFile( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
 
     public void handleOpenFile( com.apple.eawt.ApplicationEvent arg0 ) {
-        __handleOpenFile( arg0 );
+        __handleOpenFile( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.ApplicationListener.handlePreferences(com.apple.eawt.ApplicationEvent)
+
+    public native void __handlePreferences( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
+
+    public void handlePreferences( com.apple.eawt.ApplicationEvent arg0 ) {
+        __handlePreferences( __swiftObject, arg0 );
     }
 
     /// public abstract void com.apple.eawt.ApplicationListener.handlePrintFile(com.apple.eawt.ApplicationEvent)
 
-    public native void __handlePrintFile( com.apple.eawt.ApplicationEvent arg0 );
+    public native void __handlePrintFile( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
 
     public void handlePrintFile( com.apple.eawt.ApplicationEvent arg0 ) {
-        __handlePrintFile( arg0 );
+        __handlePrintFile( __swiftObject, arg0 );
     }
 
     /// public abstract void com.apple.eawt.ApplicationListener.handleQuit(com.apple.eawt.ApplicationEvent)
 
-    public native void __handleQuit( com.apple.eawt.ApplicationEvent arg0 );
+    public native void __handleQuit( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
 
     public void handleQuit( com.apple.eawt.ApplicationEvent arg0 ) {
-        __handleQuit( arg0 );
+        __handleQuit( __swiftObject, arg0 );
     }
 
     /// public abstract void com.apple.eawt.ApplicationListener.handleReOpenApplication(com.apple.eawt.ApplicationEvent)
 
-    public native void __handleReOpenApplication( com.apple.eawt.ApplicationEvent arg0 );
+    public native void __handleReOpenApplication( long __swiftObject, com.apple.eawt.ApplicationEvent arg0 );
 
     public void handleReOpenApplication( com.apple.eawt.ApplicationEvent arg0 ) {
-        __handleReOpenApplication( arg0 );
+        __handleReOpenApplication( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
     }
 
 }
diff --git a/src/org/swiftjava/com_apple/FullScreenAdapterProxy.java b/src/org/swiftjava/com_apple/FullScreenAdapterProxy.java
new file mode 100644
index 0000000..4feed5b
--- /dev/null
+++ b/src/org/swiftjava/com_apple/FullScreenAdapterProxy.java
@@ -0,0 +1,142 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class com.apple.eawt.FullScreenAdapter ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class FullScreenAdapterProxy extends com.apple.eawt.FullScreenAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public com.apple.eawt.FullScreenAdapter()
+
+    FullScreenAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_0;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_0 ) {
+            entered_equals_0 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_0 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_1;
+
+    public int hashCode() {
+        if ( !entered_hashCode_1 ) {
+            entered_hashCode_1 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_1 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_2;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_2 ) {
+            entered_toString_2 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_2 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    /// public void com.apple.eawt.FullScreenAdapter.windowEnteredFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
+
+    public native void __windowEnteredFullScreen( long __swiftObject, com.apple.eawt.AppEvent.FullScreenEvent arg0 );
+
+    boolean entered_windowEnteredFullScreen_3;
+
+    public void windowEnteredFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
+        if ( !entered_windowEnteredFullScreen_3 ) {
+            entered_windowEnteredFullScreen_3 = true;
+            __windowEnteredFullScreen( __swiftObject, arg0);
+            entered_windowEnteredFullScreen_3 = false;
+        }
+        else
+            super.windowEnteredFullScreen( arg0 );
+    }
+
+    /// public void com.apple.eawt.FullScreenAdapter.windowEnteringFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
+
+    public native void __windowEnteringFullScreen( long __swiftObject, com.apple.eawt.AppEvent.FullScreenEvent arg0 );
+
+    boolean entered_windowEnteringFullScreen_4;
+
+    public void windowEnteringFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
+        if ( !entered_windowEnteringFullScreen_4 ) {
+            entered_windowEnteringFullScreen_4 = true;
+            __windowEnteringFullScreen( __swiftObject, arg0);
+            entered_windowEnteringFullScreen_4 = false;
+        }
+        else
+            super.windowEnteringFullScreen( arg0 );
+    }
+
+    /// public void com.apple.eawt.FullScreenAdapter.windowExitedFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
+
+    public native void __windowExitedFullScreen( long __swiftObject, com.apple.eawt.AppEvent.FullScreenEvent arg0 );
+
+    boolean entered_windowExitedFullScreen_5;
+
+    public void windowExitedFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
+        if ( !entered_windowExitedFullScreen_5 ) {
+            entered_windowExitedFullScreen_5 = true;
+            __windowExitedFullScreen( __swiftObject, arg0);
+            entered_windowExitedFullScreen_5 = false;
+        }
+        else
+            super.windowExitedFullScreen( arg0 );
+    }
+
+    /// public void com.apple.eawt.FullScreenAdapter.windowExitingFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
+
+    public native void __windowExitingFullScreen( long __swiftObject, com.apple.eawt.AppEvent.FullScreenEvent arg0 );
+
+    boolean entered_windowExitingFullScreen_6;
+
+    public void windowExitingFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
+        if ( !entered_windowExitingFullScreen_6 ) {
+            entered_windowExitingFullScreen_6 = true;
+            __windowExitingFullScreen( __swiftObject, arg0);
+            entered_windowExitingFullScreen_6 = false;
+        }
+        else
+            super.windowExitingFullScreen( arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/FullScreenListenerProxy.java b/src/org/swiftjava/com_apple/FullScreenListenerProxy.java
new file mode 100644
index 0000000..345bdae
--- /dev/null
+++ b/src/org/swiftjava/com_apple/FullScreenListenerProxy.java
@@ -0,0 +1,56 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.FullScreenListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class FullScreenListenerProxy implements com.apple.eawt.FullScreenListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    FullScreenListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.FullScreenListener.windowEnteredFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
+
+    public native void __windowEnteredFullScreen( long __swiftObject, com.apple.eawt.AppEvent.FullScreenEvent arg0 );
+
+    public void windowEnteredFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
+        __windowEnteredFullScreen( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.FullScreenListener.windowEnteringFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
+
+    public native void __windowEnteringFullScreen( long __swiftObject, com.apple.eawt.AppEvent.FullScreenEvent arg0 );
+
+    public void windowEnteringFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
+        __windowEnteringFullScreen( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.FullScreenListener.windowExitedFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
+
+    public native void __windowExitedFullScreen( long __swiftObject, com.apple.eawt.AppEvent.FullScreenEvent arg0 );
+
+    public void windowExitedFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
+        __windowExitedFullScreen( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.FullScreenListener.windowExitingFullScreen(com.apple.eawt.AppEvent$FullScreenEvent)
+
+    public native void __windowExitingFullScreen( long __swiftObject, com.apple.eawt.AppEvent.FullScreenEvent arg0 );
+
+    public void windowExitingFullScreen( com.apple.eawt.AppEvent.FullScreenEvent arg0 ) {
+        __windowExitingFullScreen( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/GestureAdapterProxy.java b/src/org/swiftjava/com_apple/GestureAdapterProxy.java
new file mode 100644
index 0000000..d096144
--- /dev/null
+++ b/src/org/swiftjava/com_apple/GestureAdapterProxy.java
@@ -0,0 +1,206 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class com.apple.eawt.event.GestureAdapter ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class GestureAdapterProxy extends com.apple.eawt.event.GestureAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public com.apple.eawt.event.GestureAdapter()
+
+    GestureAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_0;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_0 ) {
+            entered_equals_0 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_0 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public void com.apple.eawt.event.GestureAdapter.gestureBegan(com.apple.eawt.event.GesturePhaseEvent)
+
+    public native void __gestureBegan( long __swiftObject, com.apple.eawt.event.GesturePhaseEvent arg0 );
+
+    boolean entered_gestureBegan_1;
+
+    public void gestureBegan( com.apple.eawt.event.GesturePhaseEvent arg0 ) {
+        if ( !entered_gestureBegan_1 ) {
+            entered_gestureBegan_1 = true;
+            __gestureBegan( __swiftObject, arg0);
+            entered_gestureBegan_1 = false;
+        }
+        else
+            super.gestureBegan( arg0 );
+    }
+
+    /// public void com.apple.eawt.event.GestureAdapter.gestureEnded(com.apple.eawt.event.GesturePhaseEvent)
+
+    public native void __gestureEnded( long __swiftObject, com.apple.eawt.event.GesturePhaseEvent arg0 );
+
+    boolean entered_gestureEnded_2;
+
+    public void gestureEnded( com.apple.eawt.event.GesturePhaseEvent arg0 ) {
+        if ( !entered_gestureEnded_2 ) {
+            entered_gestureEnded_2 = true;
+            __gestureEnded( __swiftObject, arg0);
+            entered_gestureEnded_2 = false;
+        }
+        else
+            super.gestureEnded( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_3;
+
+    public int hashCode() {
+        if ( !entered_hashCode_3 ) {
+            entered_hashCode_3 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_3 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public void com.apple.eawt.event.GestureAdapter.magnify(com.apple.eawt.event.MagnificationEvent)
+
+    public native void __magnify( long __swiftObject, com.apple.eawt.event.MagnificationEvent arg0 );
+
+    boolean entered_magnify_4;
+
+    public void magnify( com.apple.eawt.event.MagnificationEvent arg0 ) {
+        if ( !entered_magnify_4 ) {
+            entered_magnify_4 = true;
+            __magnify( __swiftObject, arg0);
+            entered_magnify_4 = false;
+        }
+        else
+            super.magnify( arg0 );
+    }
+
+    /// public void com.apple.eawt.event.GestureAdapter.rotate(com.apple.eawt.event.RotationEvent)
+
+    public native void __rotate( long __swiftObject, com.apple.eawt.event.RotationEvent arg0 );
+
+    boolean entered_rotate_5;
+
+    public void rotate( com.apple.eawt.event.RotationEvent arg0 ) {
+        if ( !entered_rotate_5 ) {
+            entered_rotate_5 = true;
+            __rotate( __swiftObject, arg0);
+            entered_rotate_5 = false;
+        }
+        else
+            super.rotate( arg0 );
+    }
+
+    /// public void com.apple.eawt.event.GestureAdapter.swipedDown(com.apple.eawt.event.SwipeEvent)
+
+    public native void __swipedDown( long __swiftObject, com.apple.eawt.event.SwipeEvent arg0 );
+
+    boolean entered_swipedDown_6;
+
+    public void swipedDown( com.apple.eawt.event.SwipeEvent arg0 ) {
+        if ( !entered_swipedDown_6 ) {
+            entered_swipedDown_6 = true;
+            __swipedDown( __swiftObject, arg0);
+            entered_swipedDown_6 = false;
+        }
+        else
+            super.swipedDown( arg0 );
+    }
+
+    /// public void com.apple.eawt.event.GestureAdapter.swipedLeft(com.apple.eawt.event.SwipeEvent)
+
+    public native void __swipedLeft( long __swiftObject, com.apple.eawt.event.SwipeEvent arg0 );
+
+    boolean entered_swipedLeft_7;
+
+    public void swipedLeft( com.apple.eawt.event.SwipeEvent arg0 ) {
+        if ( !entered_swipedLeft_7 ) {
+            entered_swipedLeft_7 = true;
+            __swipedLeft( __swiftObject, arg0);
+            entered_swipedLeft_7 = false;
+        }
+        else
+            super.swipedLeft( arg0 );
+    }
+
+    /// public void com.apple.eawt.event.GestureAdapter.swipedRight(com.apple.eawt.event.SwipeEvent)
+
+    public native void __swipedRight( long __swiftObject, com.apple.eawt.event.SwipeEvent arg0 );
+
+    boolean entered_swipedRight_8;
+
+    public void swipedRight( com.apple.eawt.event.SwipeEvent arg0 ) {
+        if ( !entered_swipedRight_8 ) {
+            entered_swipedRight_8 = true;
+            __swipedRight( __swiftObject, arg0);
+            entered_swipedRight_8 = false;
+        }
+        else
+            super.swipedRight( arg0 );
+    }
+
+    /// public void com.apple.eawt.event.GestureAdapter.swipedUp(com.apple.eawt.event.SwipeEvent)
+
+    public native void __swipedUp( long __swiftObject, com.apple.eawt.event.SwipeEvent arg0 );
+
+    boolean entered_swipedUp_9;
+
+    public void swipedUp( com.apple.eawt.event.SwipeEvent arg0 ) {
+        if ( !entered_swipedUp_9 ) {
+            entered_swipedUp_9 = true;
+            __swipedUp( __swiftObject, arg0);
+            entered_swipedUp_9 = false;
+        }
+        else
+            super.swipedUp( arg0 );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_10;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_10 ) {
+            entered_toString_10 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_10 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/GestureListenerProxy.java b/src/org/swiftjava/com_apple/GestureListenerProxy.java
new file mode 100644
index 0000000..34548f3
--- /dev/null
+++ b/src/org/swiftjava/com_apple/GestureListenerProxy.java
@@ -0,0 +1,24 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.event.GestureListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class GestureListenerProxy implements com.apple.eawt.event.GestureListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    GestureListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/GesturePhaseListenerProxy.java b/src/org/swiftjava/com_apple/GesturePhaseListenerProxy.java
new file mode 100644
index 0000000..dc17c04
--- /dev/null
+++ b/src/org/swiftjava/com_apple/GesturePhaseListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.event.GesturePhaseListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class GesturePhaseListenerProxy implements com.apple.eawt.event.GesturePhaseListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    GesturePhaseListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.event.GesturePhaseListener.gestureBegan(com.apple.eawt.event.GesturePhaseEvent)
+
+    public native void __gestureBegan( long __swiftObject, com.apple.eawt.event.GesturePhaseEvent arg0 );
+
+    public void gestureBegan( com.apple.eawt.event.GesturePhaseEvent arg0 ) {
+        __gestureBegan( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.event.GesturePhaseListener.gestureEnded(com.apple.eawt.event.GesturePhaseEvent)
+
+    public native void __gestureEnded( long __swiftObject, com.apple.eawt.event.GesturePhaseEvent arg0 );
+
+    public void gestureEnded( com.apple.eawt.event.GesturePhaseEvent arg0 ) {
+        __gestureEnded( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/MagnificationListenerProxy.java b/src/org/swiftjava/com_apple/MagnificationListenerProxy.java
new file mode 100644
index 0000000..59a1138
--- /dev/null
+++ b/src/org/swiftjava/com_apple/MagnificationListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.event.MagnificationListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class MagnificationListenerProxy implements com.apple.eawt.event.MagnificationListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    MagnificationListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.event.MagnificationListener.magnify(com.apple.eawt.event.MagnificationEvent)
+
+    public native void __magnify( long __swiftObject, com.apple.eawt.event.MagnificationEvent arg0 );
+
+    public void magnify( com.apple.eawt.event.MagnificationEvent arg0 ) {
+        __magnify( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/OpenFilesHandlerProxy.java b/src/org/swiftjava/com_apple/OpenFilesHandlerProxy.java
new file mode 100644
index 0000000..1f02e04
--- /dev/null
+++ b/src/org/swiftjava/com_apple/OpenFilesHandlerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.OpenFilesHandler ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class OpenFilesHandlerProxy implements com.apple.eawt.OpenFilesHandler {
+
+    // address of proxy object
+    long __swiftObject;
+
+    OpenFilesHandlerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.OpenFilesHandler.openFiles(com.apple.eawt.AppEvent$OpenFilesEvent)
+
+    public native void __openFiles( long __swiftObject, com.apple.eawt.AppEvent.OpenFilesEvent arg0 );
+
+    public void openFiles( com.apple.eawt.AppEvent.OpenFilesEvent arg0 ) {
+        __openFiles( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/OpenURIHandlerProxy.java b/src/org/swiftjava/com_apple/OpenURIHandlerProxy.java
new file mode 100644
index 0000000..871506b
--- /dev/null
+++ b/src/org/swiftjava/com_apple/OpenURIHandlerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.OpenURIHandler ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class OpenURIHandlerProxy implements com.apple.eawt.OpenURIHandler {
+
+    // address of proxy object
+    long __swiftObject;
+
+    OpenURIHandlerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.OpenURIHandler.openURI(com.apple.eawt.AppEvent$OpenURIEvent)
+
+    public native void __openURI( long __swiftObject, com.apple.eawt.AppEvent.OpenURIEvent arg0 );
+
+    public void openURI( com.apple.eawt.AppEvent.OpenURIEvent arg0 ) {
+        __openURI( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/PreferencesHandlerProxy.java b/src/org/swiftjava/com_apple/PreferencesHandlerProxy.java
new file mode 100644
index 0000000..2e8acaa
--- /dev/null
+++ b/src/org/swiftjava/com_apple/PreferencesHandlerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.PreferencesHandler ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class PreferencesHandlerProxy implements com.apple.eawt.PreferencesHandler {
+
+    // address of proxy object
+    long __swiftObject;
+
+    PreferencesHandlerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.PreferencesHandler.handlePreferences(com.apple.eawt.AppEvent$PreferencesEvent)
+
+    public native void __handlePreferences( long __swiftObject, com.apple.eawt.AppEvent.PreferencesEvent arg0 );
+
+    public void handlePreferences( com.apple.eawt.AppEvent.PreferencesEvent arg0 ) {
+        __handlePreferences( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/PrintFilesHandlerProxy.java b/src/org/swiftjava/com_apple/PrintFilesHandlerProxy.java
new file mode 100644
index 0000000..4aedc88
--- /dev/null
+++ b/src/org/swiftjava/com_apple/PrintFilesHandlerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.PrintFilesHandler ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class PrintFilesHandlerProxy implements com.apple.eawt.PrintFilesHandler {
+
+    // address of proxy object
+    long __swiftObject;
+
+    PrintFilesHandlerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.PrintFilesHandler.printFiles(com.apple.eawt.AppEvent$PrintFilesEvent)
+
+    public native void __printFiles( long __swiftObject, com.apple.eawt.AppEvent.PrintFilesEvent arg0 );
+
+    public void printFiles( com.apple.eawt.AppEvent.PrintFilesEvent arg0 ) {
+        __printFiles( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/QuitHandlerProxy.java b/src/org/swiftjava/com_apple/QuitHandlerProxy.java
new file mode 100644
index 0000000..bb2b1e1
--- /dev/null
+++ b/src/org/swiftjava/com_apple/QuitHandlerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.QuitHandler ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class QuitHandlerProxy implements com.apple.eawt.QuitHandler {
+
+    // address of proxy object
+    long __swiftObject;
+
+    QuitHandlerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.QuitHandler.handleQuitRequestWith(com.apple.eawt.AppEvent$QuitEvent,com.apple.eawt.QuitResponse)
+
+    public native void __handleQuitRequestWith( long __swiftObject, com.apple.eawt.AppEvent.QuitEvent arg0, com.apple.eawt.QuitResponse arg1 );
+
+    public void handleQuitRequestWith( com.apple.eawt.AppEvent.QuitEvent arg0, com.apple.eawt.QuitResponse arg1 ) {
+        __handleQuitRequestWith( __swiftObject, arg0, arg1 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/RotationListenerProxy.java b/src/org/swiftjava/com_apple/RotationListenerProxy.java
new file mode 100644
index 0000000..363fbf2
--- /dev/null
+++ b/src/org/swiftjava/com_apple/RotationListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.event.RotationListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class RotationListenerProxy implements com.apple.eawt.event.RotationListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    RotationListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.event.RotationListener.rotate(com.apple.eawt.event.RotationEvent)
+
+    public native void __rotate( long __swiftObject, com.apple.eawt.event.RotationEvent arg0 );
+
+    public void rotate( com.apple.eawt.event.RotationEvent arg0 ) {
+        __rotate( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/ScreenSleepListenerProxy.java b/src/org/swiftjava/com_apple/ScreenSleepListenerProxy.java
new file mode 100644
index 0000000..9d5ad28
--- /dev/null
+++ b/src/org/swiftjava/com_apple/ScreenSleepListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.ScreenSleepListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class ScreenSleepListenerProxy implements com.apple.eawt.ScreenSleepListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    ScreenSleepListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.ScreenSleepListener.screenAboutToSleep(com.apple.eawt.AppEvent$ScreenSleepEvent)
+
+    public native void __screenAboutToSleep( long __swiftObject, com.apple.eawt.AppEvent.ScreenSleepEvent arg0 );
+
+    public void screenAboutToSleep( com.apple.eawt.AppEvent.ScreenSleepEvent arg0 ) {
+        __screenAboutToSleep( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.ScreenSleepListener.screenAwoke(com.apple.eawt.AppEvent$ScreenSleepEvent)
+
+    public native void __screenAwoke( long __swiftObject, com.apple.eawt.AppEvent.ScreenSleepEvent arg0 );
+
+    public void screenAwoke( com.apple.eawt.AppEvent.ScreenSleepEvent arg0 ) {
+        __screenAwoke( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/SwipeListenerProxy.java b/src/org/swiftjava/com_apple/SwipeListenerProxy.java
new file mode 100644
index 0000000..c1e4bee
--- /dev/null
+++ b/src/org/swiftjava/com_apple/SwipeListenerProxy.java
@@ -0,0 +1,56 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.event.SwipeListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class SwipeListenerProxy implements com.apple.eawt.event.SwipeListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    SwipeListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.event.SwipeListener.swipedDown(com.apple.eawt.event.SwipeEvent)
+
+    public native void __swipedDown( long __swiftObject, com.apple.eawt.event.SwipeEvent arg0 );
+
+    public void swipedDown( com.apple.eawt.event.SwipeEvent arg0 ) {
+        __swipedDown( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.event.SwipeListener.swipedLeft(com.apple.eawt.event.SwipeEvent)
+
+    public native void __swipedLeft( long __swiftObject, com.apple.eawt.event.SwipeEvent arg0 );
+
+    public void swipedLeft( com.apple.eawt.event.SwipeEvent arg0 ) {
+        __swipedLeft( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.event.SwipeListener.swipedRight(com.apple.eawt.event.SwipeEvent)
+
+    public native void __swipedRight( long __swiftObject, com.apple.eawt.event.SwipeEvent arg0 );
+
+    public void swipedRight( com.apple.eawt.event.SwipeEvent arg0 ) {
+        __swipedRight( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.event.SwipeListener.swipedUp(com.apple.eawt.event.SwipeEvent)
+
+    public native void __swipedUp( long __swiftObject, com.apple.eawt.event.SwipeEvent arg0 );
+
+    public void swipedUp( com.apple.eawt.event.SwipeEvent arg0 ) {
+        __swipedUp( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/SystemSleepListenerProxy.java b/src/org/swiftjava/com_apple/SystemSleepListenerProxy.java
new file mode 100644
index 0000000..8e9e36c
--- /dev/null
+++ b/src/org/swiftjava/com_apple/SystemSleepListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.SystemSleepListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class SystemSleepListenerProxy implements com.apple.eawt.SystemSleepListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    SystemSleepListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.SystemSleepListener.systemAboutToSleep(com.apple.eawt.AppEvent$SystemSleepEvent)
+
+    public native void __systemAboutToSleep( long __swiftObject, com.apple.eawt.AppEvent.SystemSleepEvent arg0 );
+
+    public void systemAboutToSleep( com.apple.eawt.AppEvent.SystemSleepEvent arg0 ) {
+        __systemAboutToSleep( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.SystemSleepListener.systemAwoke(com.apple.eawt.AppEvent$SystemSleepEvent)
+
+    public native void __systemAwoke( long __swiftObject, com.apple.eawt.AppEvent.SystemSleepEvent arg0 );
+
+    public void systemAwoke( com.apple.eawt.AppEvent.SystemSleepEvent arg0 ) {
+        __systemAwoke( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_apple/UserSessionListenerProxy.java b/src/org/swiftjava/com_apple/UserSessionListenerProxy.java
new file mode 100644
index 0000000..e45b504
--- /dev/null
+++ b/src/org/swiftjava/com_apple/UserSessionListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.apple.eawt.UserSessionListener ///
+
+package org.swiftjava.com_apple;
+
+@SuppressWarnings("JniMissingFunction")
+public class UserSessionListenerProxy implements com.apple.eawt.UserSessionListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    UserSessionListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.apple.eawt.UserSessionListener.userSessionActivated(com.apple.eawt.AppEvent$UserSessionEvent)
+
+    public native void __userSessionActivated( long __swiftObject, com.apple.eawt.AppEvent.UserSessionEvent arg0 );
+
+    public void userSessionActivated( com.apple.eawt.AppEvent.UserSessionEvent arg0 ) {
+        __userSessionActivated( __swiftObject, arg0 );
+    }
+
+    /// public abstract void com.apple.eawt.UserSessionListener.userSessionDeactivated(com.apple.eawt.AppEvent$UserSessionEvent)
+
+    public native void __userSessionDeactivated( long __swiftObject, com.apple.eawt.AppEvent.UserSessionEvent arg0 );
+
+    public void userSessionDeactivated( com.apple.eawt.AppEvent.UserSessionEvent arg0 ) {
+        __userSessionDeactivated( __swiftObject, arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_johnholdsworth/SwiftHelloBinding_ListenerProxy.java b/src/org/swiftjava/com_johnholdsworth/SwiftHelloBinding_ListenerProxy.java
new file mode 100644
index 0000000..3d6a43d
--- /dev/null
+++ b/src/org/swiftjava/com_johnholdsworth/SwiftHelloBinding_ListenerProxy.java
@@ -0,0 +1,96 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener ///
+
+package org.swiftjava.com_johnholdsworth;
+
+@SuppressWarnings("JniMissingFunction")
+public class SwiftHelloBinding_ListenerProxy implements com.johnholdsworth.swiftbindings.SwiftHelloBinding.Listener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    SwiftHelloBinding_ListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processNumber(double)
+
+    public native void __processNumber( long __swiftObject, double number );
+
+    public void processNumber( double number ) {
+        __processNumber( __swiftObject, number );
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processStringMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMap)
+
+    public native void __processStringMap( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTypes.StringMap map );
+
+    public void processStringMap( com.johnholdsworth.swiftbindings.SwiftHelloTypes.StringMap map ) {
+        __processStringMap( __swiftObject, map );
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processStringMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$StringMapList)
+
+    public native void __processStringMapList( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTypes.StringMapList map );
+
+    public void processStringMapList( com.johnholdsworth.swiftbindings.SwiftHelloTypes.StringMapList map ) {
+        __processStringMapList( __swiftObject, map );
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processText(java.lang.String)
+
+    public native void __processText( long __swiftObject, java.lang.String text );
+
+    public void processText( java.lang.String text ) {
+        __processText( __swiftObject, text );
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processedMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    public native void __processedMap( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap map );
+
+    public void processedMap( com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap map ) {
+        __processedMap( __swiftObject, map );
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.processedMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    public native void __processedMapList( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList map );
+
+    public void processedMapList( com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList map ) {
+        __processedMapList( __swiftObject, map );
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.setCacheDir(java.lang.String)
+
+    public native void __setCacheDir( long __swiftObject, java.lang.String cacheDir );
+
+    public void setCacheDir( java.lang.String cacheDir ) {
+        __setCacheDir( __swiftObject, cacheDir );
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.testResponder(int)
+
+    public native com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener __testResponder( long __swiftObject, int loopback );
+
+    public com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener testResponder( int loopback ) {
+        return __testResponder( __swiftObject, loopback );
+    }
+
+    /// public abstract double com.johnholdsworth.swiftbindings.SwiftHelloBinding$Listener.throwException() throws java.lang.Exception
+
+    public native double __throwException( long __swiftObject );
+
+    public double throwException() throws java.lang.Exception {
+        return __throwException( __swiftObject  );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_johnholdsworth/SwiftHelloTest_TestListenerProxy.java b/src/org/swiftjava/com_johnholdsworth/SwiftHelloTest_TestListenerProxy.java
new file mode 100644
index 0000000..1701a5b
--- /dev/null
+++ b/src/org/swiftjava/com_johnholdsworth/SwiftHelloTest_TestListenerProxy.java
@@ -0,0 +1,288 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener ///
+
+package org.swiftjava.com_johnholdsworth;
+
+@SuppressWarnings("JniMissingFunction")
+public class SwiftHelloTest_TestListenerProxy implements com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    SwiftHelloTest_TestListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract java.lang.String[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.String2dArrayMethod(java.lang.String[][])
+
+    public native java.lang.String[][] __String2dArrayMethod( long __swiftObject, java.lang.String[][] arg );
+
+    public java.lang.String[][] String2dArrayMethod( java.lang.String[][] arg ) {
+        return __String2dArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract java.lang.String[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.StringArrayMethod(java.lang.String[])
+
+    public native java.lang.String[] __StringArrayMethod( long __swiftObject, java.lang.String[] arg );
+
+    public java.lang.String[] StringArrayMethod( java.lang.String[] arg ) {
+        return __StringArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract java.lang.String com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.StringMethod(java.lang.String)
+
+    public native java.lang.String __StringMethod( long __swiftObject, java.lang.String arg );
+
+    public java.lang.String StringMethod( java.lang.String arg ) {
+        return __StringMethod( __swiftObject, arg );
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListener2dArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][])
+
+    public native com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[][] __TestListener2dArrayMethod( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[][] arg );
+
+    public com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[][] TestListener2dArrayMethod( com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[][] arg ) {
+        return __TestListener2dArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListenerArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[])
+
+    public native com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[] __TestListenerArrayMethod( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[] arg );
+
+    public com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[] TestListenerArrayMethod( com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[] arg ) {
+        return __TestListenerArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.TestListenerMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    public native com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener __TestListenerMethod( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener arg );
+
+    public com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener TestListenerMethod( com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener arg ) {
+        return __TestListenerMethod( __swiftObject, arg );
+    }
+
+    /// public abstract boolean[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.boolean2dArrayMethod(boolean[][])
+
+    public native boolean[][] __boolean2dArrayMethod( long __swiftObject, boolean[][] arg );
+
+    public boolean[][] boolean2dArrayMethod( boolean[][] arg ) {
+        return __boolean2dArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract boolean[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.booleanArrayMethod(boolean[])
+
+    public native boolean[] __booleanArrayMethod( long __swiftObject, boolean[] arg );
+
+    public boolean[] booleanArrayMethod( boolean[] arg ) {
+        return __booleanArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract boolean com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.booleanMethod(boolean)
+
+    public native boolean __booleanMethod( long __swiftObject, boolean arg );
+
+    public boolean booleanMethod( boolean arg ) {
+        return __booleanMethod( __swiftObject, arg );
+    }
+
+    /// public abstract byte[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byte2dArrayMethod(byte[][])
+
+    public native byte[][] __byte2dArrayMethod( long __swiftObject, byte[][] arg );
+
+    public byte[][] byte2dArrayMethod( byte[][] arg ) {
+        return __byte2dArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract byte[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byteArrayMethod(byte[])
+
+    public native byte[] __byteArrayMethod( long __swiftObject, byte[] arg );
+
+    public byte[] byteArrayMethod( byte[] arg ) {
+        return __byteArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract byte com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.byteMethod(byte)
+
+    public native byte __byteMethod( long __swiftObject, byte arg );
+
+    public byte byteMethod( byte arg ) {
+        return __byteMethod( __swiftObject, arg );
+    }
+
+    /// public abstract char[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.char2dArrayMethod(char[][])
+
+    public native char[][] __char2dArrayMethod( long __swiftObject, char[][] arg );
+
+    public char[][] char2dArrayMethod( char[][] arg ) {
+        return __char2dArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract char[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.charArrayMethod(char[])
+
+    public native char[] __charArrayMethod( long __swiftObject, char[] arg );
+
+    public char[] charArrayMethod( char[] arg ) {
+        return __charArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract char com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.charMethod(char)
+
+    public native char __charMethod( long __swiftObject, char arg );
+
+    public char charMethod( char arg ) {
+        return __charMethod( __swiftObject, arg );
+    }
+
+    /// public abstract double[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.double2dArrayMethod(double[][])
+
+    public native double[][] __double2dArrayMethod( long __swiftObject, double[][] arg );
+
+    public double[][] double2dArrayMethod( double[][] arg ) {
+        return __double2dArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract double[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.doubleArrayMethod(double[])
+
+    public native double[] __doubleArrayMethod( long __swiftObject, double[] arg );
+
+    public double[] doubleArrayMethod( double[] arg ) {
+        return __doubleArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract double com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.doubleMethod(double)
+
+    public native double __doubleMethod( long __swiftObject, double arg );
+
+    public double doubleMethod( double arg ) {
+        return __doubleMethod( __swiftObject, arg );
+    }
+
+    /// public abstract float[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.float2dArrayMethod(float[][])
+
+    public native float[][] __float2dArrayMethod( long __swiftObject, float[][] arg );
+
+    public float[][] float2dArrayMethod( float[][] arg ) {
+        return __float2dArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract float[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.floatArrayMethod(float[])
+
+    public native float[] __floatArrayMethod( long __swiftObject, float[] arg );
+
+    public float[] floatArrayMethod( float[] arg ) {
+        return __floatArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract float com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.floatMethod(float)
+
+    public native float __floatMethod( long __swiftObject, float arg );
+
+    public float floatMethod( float arg ) {
+        return __floatMethod( __swiftObject, arg );
+    }
+
+    /// public abstract int[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.int2dArrayMethod(int[][])
+
+    public native int[][] __int2dArrayMethod( long __swiftObject, int[][] arg );
+
+    public int[][] int2dArrayMethod( int[][] arg ) {
+        return __int2dArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract int[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.intArrayMethod(int[])
+
+    public native int[] __intArrayMethod( long __swiftObject, int[] arg );
+
+    public int[] intArrayMethod( int[] arg ) {
+        return __intArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract int com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.intMethod(int)
+
+    public native int __intMethod( long __swiftObject, int arg );
+
+    public int intMethod( int arg ) {
+        return __intMethod( __swiftObject, arg );
+    }
+
+    /// public abstract long[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.long2dArrayMethod(long[][])
+
+    public native long[][] __long2dArrayMethod( long __swiftObject, long[][] arg );
+
+    public long[][] long2dArrayMethod( long[][] arg ) {
+        return __long2dArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract long[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.longArrayMethod(long[])
+
+    public native long[] __longArrayMethod( long __swiftObject, long[] arg );
+
+    public long[] longArrayMethod( long[] arg ) {
+        return __longArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract long com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.longMethod(long)
+
+    public native long __longMethod( long __swiftObject, long arg );
+
+    public long longMethod( long arg ) {
+        return __longMethod( __swiftObject, arg );
+    }
+
+    /// public abstract void com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.setLoopback(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    public native void __setLoopback( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener loopback );
+
+    public void setLoopback( com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener loopback ) {
+        __setLoopback( __swiftObject, loopback );
+    }
+
+    /// public abstract short[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.short2dArrayMethod(short[][])
+
+    public native short[][] __short2dArrayMethod( long __swiftObject, short[][] arg );
+
+    public short[][] short2dArrayMethod( short[][] arg ) {
+        return __short2dArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract short[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.shortArrayMethod(short[])
+
+    public native short[] __shortArrayMethod( long __swiftObject, short[] arg );
+
+    public short[] shortArrayMethod( short[] arg ) {
+        return __shortArrayMethod( __swiftObject, arg );
+    }
+
+    /// public abstract short com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.shortMethod(short)
+
+    public native short __shortMethod( long __swiftObject, short arg );
+
+    public short shortMethod( short arg ) {
+        return __shortMethod( __swiftObject, arg );
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.testMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    public native com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap __testMap( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap arg );
+
+    public com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap testMap( com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap arg ) {
+        return __testMap( __swiftObject, arg );
+    }
+
+    /// public abstract com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener.testMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    public native com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList __testMapList( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList arg );
+
+    public com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList testMapList( com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList arg ) {
+        return __testMapList( __swiftObject, arg );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_johnholdsworth/SwiftHelloTest_TestResponderAdapterProxy.java b/src/org/swiftjava/com_johnholdsworth/SwiftHelloTest_TestResponderAdapterProxy.java
new file mode 100644
index 0000000..8b501a3
--- /dev/null
+++ b/src/org/swiftjava/com_johnholdsworth/SwiftHelloTest_TestResponderAdapterProxy.java
@@ -0,0 +1,638 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter ///
+
+package org.swiftjava.com_johnholdsworth;
+
+@SuppressWarnings("JniMissingFunction")
+public class SwiftHelloTest_TestResponderAdapterProxy extends com.johnholdsworth.swiftbindings.SwiftHelloTest.TestResponderAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter()
+
+    SwiftHelloTest_TestResponderAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public java.lang.String[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.String2dArrayMethod(java.lang.String[][])
+
+    public native java.lang.String[][] __String2dArrayMethod( long __swiftObject, java.lang.String[][] arg );
+
+    boolean entered_String2dArrayMethod_0;
+
+    public java.lang.String[][] String2dArrayMethod( java.lang.String[][] arg ) {
+        if ( !entered_String2dArrayMethod_0 ) {
+            entered_String2dArrayMethod_0 = true;
+            java.lang.String[][] __return = __String2dArrayMethod( __swiftObject, arg);
+            entered_String2dArrayMethod_0 = false;
+            return __return;
+        }
+        else
+            return super.String2dArrayMethod( arg );
+    }
+
+    /// public java.lang.String[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.StringArrayMethod(java.lang.String[])
+
+    public native java.lang.String[] __StringArrayMethod( long __swiftObject, java.lang.String[] arg );
+
+    boolean entered_StringArrayMethod_1;
+
+    public java.lang.String[] StringArrayMethod( java.lang.String[] arg ) {
+        if ( !entered_StringArrayMethod_1 ) {
+            entered_StringArrayMethod_1 = true;
+            java.lang.String[] __return = __StringArrayMethod( __swiftObject, arg);
+            entered_StringArrayMethod_1 = false;
+            return __return;
+        }
+        else
+            return super.StringArrayMethod( arg );
+    }
+
+    /// public java.lang.String com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.StringMethod(java.lang.String)
+
+    public native java.lang.String __StringMethod( long __swiftObject, java.lang.String arg );
+
+    boolean entered_StringMethod_2;
+
+    public java.lang.String StringMethod( java.lang.String arg ) {
+        if ( !entered_StringMethod_2 ) {
+            entered_StringMethod_2 = true;
+            java.lang.String __return = __StringMethod( __swiftObject, arg);
+            entered_StringMethod_2 = false;
+            return __return;
+        }
+        else
+            return super.StringMethod( arg );
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.TestListener2dArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[][])
+
+    public native com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[][] __TestListener2dArrayMethod( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[][] arg );
+
+    boolean entered_TestListener2dArrayMethod_3;
+
+    public com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[][] TestListener2dArrayMethod( com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[][] arg ) {
+        if ( !entered_TestListener2dArrayMethod_3 ) {
+            entered_TestListener2dArrayMethod_3 = true;
+            com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[][] __return = __TestListener2dArrayMethod( __swiftObject, arg);
+            entered_TestListener2dArrayMethod_3 = false;
+            return __return;
+        }
+        else
+            return super.TestListener2dArrayMethod( arg );
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.TestListenerArrayMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener[])
+
+    public native com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[] __TestListenerArrayMethod( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[] arg );
+
+    boolean entered_TestListenerArrayMethod_4;
+
+    public com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[] TestListenerArrayMethod( com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[] arg ) {
+        if ( !entered_TestListenerArrayMethod_4 ) {
+            entered_TestListenerArrayMethod_4 = true;
+            com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener[] __return = __TestListenerArrayMethod( __swiftObject, arg);
+            entered_TestListenerArrayMethod_4 = false;
+            return __return;
+        }
+        else
+            return super.TestListenerArrayMethod( arg );
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.TestListenerMethod(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    public native com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener __TestListenerMethod( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener arg );
+
+    boolean entered_TestListenerMethod_5;
+
+    public com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener TestListenerMethod( com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener arg ) {
+        if ( !entered_TestListenerMethod_5 ) {
+            entered_TestListenerMethod_5 = true;
+            com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener __return = __TestListenerMethod( __swiftObject, arg);
+            entered_TestListenerMethod_5 = false;
+            return __return;
+        }
+        else
+            return super.TestListenerMethod( arg );
+    }
+
+    /// public boolean[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.boolean2dArrayMethod(boolean[][])
+
+    public native boolean[][] __boolean2dArrayMethod( long __swiftObject, boolean[][] arg );
+
+    boolean entered_boolean2dArrayMethod_6;
+
+    public boolean[][] boolean2dArrayMethod( boolean[][] arg ) {
+        if ( !entered_boolean2dArrayMethod_6 ) {
+            entered_boolean2dArrayMethod_6 = true;
+            boolean[][] __return = __boolean2dArrayMethod( __swiftObject, arg);
+            entered_boolean2dArrayMethod_6 = false;
+            return __return;
+        }
+        else
+            return super.boolean2dArrayMethod( arg );
+    }
+
+    /// public boolean[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.booleanArrayMethod(boolean[])
+
+    public native boolean[] __booleanArrayMethod( long __swiftObject, boolean[] arg );
+
+    boolean entered_booleanArrayMethod_7;
+
+    public boolean[] booleanArrayMethod( boolean[] arg ) {
+        if ( !entered_booleanArrayMethod_7 ) {
+            entered_booleanArrayMethod_7 = true;
+            boolean[] __return = __booleanArrayMethod( __swiftObject, arg);
+            entered_booleanArrayMethod_7 = false;
+            return __return;
+        }
+        else
+            return super.booleanArrayMethod( arg );
+    }
+
+    /// public boolean com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.booleanMethod(boolean)
+
+    public native boolean __booleanMethod( long __swiftObject, boolean arg );
+
+    boolean entered_booleanMethod_8;
+
+    public boolean booleanMethod( boolean arg ) {
+        if ( !entered_booleanMethod_8 ) {
+            entered_booleanMethod_8 = true;
+            boolean __return = __booleanMethod( __swiftObject, arg);
+            entered_booleanMethod_8 = false;
+            return __return;
+        }
+        else
+            return super.booleanMethod( arg );
+    }
+
+    /// public byte[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.byte2dArrayMethod(byte[][])
+
+    public native byte[][] __byte2dArrayMethod( long __swiftObject, byte[][] arg );
+
+    boolean entered_byte2dArrayMethod_9;
+
+    public byte[][] byte2dArrayMethod( byte[][] arg ) {
+        if ( !entered_byte2dArrayMethod_9 ) {
+            entered_byte2dArrayMethod_9 = true;
+            byte[][] __return = __byte2dArrayMethod( __swiftObject, arg);
+            entered_byte2dArrayMethod_9 = false;
+            return __return;
+        }
+        else
+            return super.byte2dArrayMethod( arg );
+    }
+
+    /// public byte[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.byteArrayMethod(byte[])
+
+    public native byte[] __byteArrayMethod( long __swiftObject, byte[] arg );
+
+    boolean entered_byteArrayMethod_10;
+
+    public byte[] byteArrayMethod( byte[] arg ) {
+        if ( !entered_byteArrayMethod_10 ) {
+            entered_byteArrayMethod_10 = true;
+            byte[] __return = __byteArrayMethod( __swiftObject, arg);
+            entered_byteArrayMethod_10 = false;
+            return __return;
+        }
+        else
+            return super.byteArrayMethod( arg );
+    }
+
+    /// public byte com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.byteMethod(byte)
+
+    public native byte __byteMethod( long __swiftObject, byte arg );
+
+    boolean entered_byteMethod_11;
+
+    public byte byteMethod( byte arg ) {
+        if ( !entered_byteMethod_11 ) {
+            entered_byteMethod_11 = true;
+            byte __return = __byteMethod( __swiftObject, arg);
+            entered_byteMethod_11 = false;
+            return __return;
+        }
+        else
+            return super.byteMethod( arg );
+    }
+
+    /// public char[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.char2dArrayMethod(char[][])
+
+    public native char[][] __char2dArrayMethod( long __swiftObject, char[][] arg );
+
+    boolean entered_char2dArrayMethod_12;
+
+    public char[][] char2dArrayMethod( char[][] arg ) {
+        if ( !entered_char2dArrayMethod_12 ) {
+            entered_char2dArrayMethod_12 = true;
+            char[][] __return = __char2dArrayMethod( __swiftObject, arg);
+            entered_char2dArrayMethod_12 = false;
+            return __return;
+        }
+        else
+            return super.char2dArrayMethod( arg );
+    }
+
+    /// public char[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.charArrayMethod(char[])
+
+    public native char[] __charArrayMethod( long __swiftObject, char[] arg );
+
+    boolean entered_charArrayMethod_13;
+
+    public char[] charArrayMethod( char[] arg ) {
+        if ( !entered_charArrayMethod_13 ) {
+            entered_charArrayMethod_13 = true;
+            char[] __return = __charArrayMethod( __swiftObject, arg);
+            entered_charArrayMethod_13 = false;
+            return __return;
+        }
+        else
+            return super.charArrayMethod( arg );
+    }
+
+    /// public char com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.charMethod(char)
+
+    public native char __charMethod( long __swiftObject, char arg );
+
+    boolean entered_charMethod_14;
+
+    public char charMethod( char arg ) {
+        if ( !entered_charMethod_14 ) {
+            entered_charMethod_14 = true;
+            char __return = __charMethod( __swiftObject, arg);
+            entered_charMethod_14 = false;
+            return __return;
+        }
+        else
+            return super.charMethod( arg );
+    }
+
+    /// public double[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.double2dArrayMethod(double[][])
+
+    public native double[][] __double2dArrayMethod( long __swiftObject, double[][] arg );
+
+    boolean entered_double2dArrayMethod_15;
+
+    public double[][] double2dArrayMethod( double[][] arg ) {
+        if ( !entered_double2dArrayMethod_15 ) {
+            entered_double2dArrayMethod_15 = true;
+            double[][] __return = __double2dArrayMethod( __swiftObject, arg);
+            entered_double2dArrayMethod_15 = false;
+            return __return;
+        }
+        else
+            return super.double2dArrayMethod( arg );
+    }
+
+    /// public double[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.doubleArrayMethod(double[])
+
+    public native double[] __doubleArrayMethod( long __swiftObject, double[] arg );
+
+    boolean entered_doubleArrayMethod_16;
+
+    public double[] doubleArrayMethod( double[] arg ) {
+        if ( !entered_doubleArrayMethod_16 ) {
+            entered_doubleArrayMethod_16 = true;
+            double[] __return = __doubleArrayMethod( __swiftObject, arg);
+            entered_doubleArrayMethod_16 = false;
+            return __return;
+        }
+        else
+            return super.doubleArrayMethod( arg );
+    }
+
+    /// public double com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.doubleMethod(double)
+
+    public native double __doubleMethod( long __swiftObject, double arg );
+
+    boolean entered_doubleMethod_17;
+
+    public double doubleMethod( double arg ) {
+        if ( !entered_doubleMethod_17 ) {
+            entered_doubleMethod_17 = true;
+            double __return = __doubleMethod( __swiftObject, arg);
+            entered_doubleMethod_17 = false;
+            return __return;
+        }
+        else
+            return super.doubleMethod( arg );
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_18;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_18 ) {
+            entered_equals_18 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_18 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public float[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.float2dArrayMethod(float[][])
+
+    public native float[][] __float2dArrayMethod( long __swiftObject, float[][] arg );
+
+    boolean entered_float2dArrayMethod_19;
+
+    public float[][] float2dArrayMethod( float[][] arg ) {
+        if ( !entered_float2dArrayMethod_19 ) {
+            entered_float2dArrayMethod_19 = true;
+            float[][] __return = __float2dArrayMethod( __swiftObject, arg);
+            entered_float2dArrayMethod_19 = false;
+            return __return;
+        }
+        else
+            return super.float2dArrayMethod( arg );
+    }
+
+    /// public float[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.floatArrayMethod(float[])
+
+    public native float[] __floatArrayMethod( long __swiftObject, float[] arg );
+
+    boolean entered_floatArrayMethod_20;
+
+    public float[] floatArrayMethod( float[] arg ) {
+        if ( !entered_floatArrayMethod_20 ) {
+            entered_floatArrayMethod_20 = true;
+            float[] __return = __floatArrayMethod( __swiftObject, arg);
+            entered_floatArrayMethod_20 = false;
+            return __return;
+        }
+        else
+            return super.floatArrayMethod( arg );
+    }
+
+    /// public float com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.floatMethod(float)
+
+    public native float __floatMethod( long __swiftObject, float arg );
+
+    boolean entered_floatMethod_21;
+
+    public float floatMethod( float arg ) {
+        if ( !entered_floatMethod_21 ) {
+            entered_floatMethod_21 = true;
+            float __return = __floatMethod( __swiftObject, arg);
+            entered_floatMethod_21 = false;
+            return __return;
+        }
+        else
+            return super.floatMethod( arg );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_22;
+
+    public int hashCode() {
+        if ( !entered_hashCode_22 ) {
+            entered_hashCode_22 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_22 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public int[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.int2dArrayMethod(int[][])
+
+    public native int[][] __int2dArrayMethod( long __swiftObject, int[][] arg );
+
+    boolean entered_int2dArrayMethod_23;
+
+    public int[][] int2dArrayMethod( int[][] arg ) {
+        if ( !entered_int2dArrayMethod_23 ) {
+            entered_int2dArrayMethod_23 = true;
+            int[][] __return = __int2dArrayMethod( __swiftObject, arg);
+            entered_int2dArrayMethod_23 = false;
+            return __return;
+        }
+        else
+            return super.int2dArrayMethod( arg );
+    }
+
+    /// public int[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.intArrayMethod(int[])
+
+    public native int[] __intArrayMethod( long __swiftObject, int[] arg );
+
+    boolean entered_intArrayMethod_24;
+
+    public int[] intArrayMethod( int[] arg ) {
+        if ( !entered_intArrayMethod_24 ) {
+            entered_intArrayMethod_24 = true;
+            int[] __return = __intArrayMethod( __swiftObject, arg);
+            entered_intArrayMethod_24 = false;
+            return __return;
+        }
+        else
+            return super.intArrayMethod( arg );
+    }
+
+    /// public int com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.intMethod(int)
+
+    public native int __intMethod( long __swiftObject, int arg );
+
+    boolean entered_intMethod_25;
+
+    public int intMethod( int arg ) {
+        if ( !entered_intMethod_25 ) {
+            entered_intMethod_25 = true;
+            int __return = __intMethod( __swiftObject, arg);
+            entered_intMethod_25 = false;
+            return __return;
+        }
+        else
+            return super.intMethod( arg );
+    }
+
+    /// public long[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.long2dArrayMethod(long[][])
+
+    public native long[][] __long2dArrayMethod( long __swiftObject, long[][] arg );
+
+    boolean entered_long2dArrayMethod_26;
+
+    public long[][] long2dArrayMethod( long[][] arg ) {
+        if ( !entered_long2dArrayMethod_26 ) {
+            entered_long2dArrayMethod_26 = true;
+            long[][] __return = __long2dArrayMethod( __swiftObject, arg);
+            entered_long2dArrayMethod_26 = false;
+            return __return;
+        }
+        else
+            return super.long2dArrayMethod( arg );
+    }
+
+    /// public long[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.longArrayMethod(long[])
+
+    public native long[] __longArrayMethod( long __swiftObject, long[] arg );
+
+    boolean entered_longArrayMethod_27;
+
+    public long[] longArrayMethod( long[] arg ) {
+        if ( !entered_longArrayMethod_27 ) {
+            entered_longArrayMethod_27 = true;
+            long[] __return = __longArrayMethod( __swiftObject, arg);
+            entered_longArrayMethod_27 = false;
+            return __return;
+        }
+        else
+            return super.longArrayMethod( arg );
+    }
+
+    /// public long com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.longMethod(long)
+
+    public native long __longMethod( long __swiftObject, long arg );
+
+    boolean entered_longMethod_28;
+
+    public long longMethod( long arg ) {
+        if ( !entered_longMethod_28 ) {
+            entered_longMethod_28 = true;
+            long __return = __longMethod( __swiftObject, arg);
+            entered_longMethod_28 = false;
+            return __return;
+        }
+        else
+            return super.longMethod( arg );
+    }
+
+    /// public void com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.setLoopback(com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener)
+
+    public native void __setLoopback( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener loopback );
+
+    boolean entered_setLoopback_29;
+
+    public void setLoopback( com.johnholdsworth.swiftbindings.SwiftHelloTest.TestListener loopback ) {
+        if ( !entered_setLoopback_29 ) {
+            entered_setLoopback_29 = true;
+            __setLoopback( __swiftObject, loopback);
+            entered_setLoopback_29 = false;
+        }
+        else
+            super.setLoopback( loopback );
+    }
+
+    /// public short[][] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.short2dArrayMethod(short[][])
+
+    public native short[][] __short2dArrayMethod( long __swiftObject, short[][] arg );
+
+    boolean entered_short2dArrayMethod_30;
+
+    public short[][] short2dArrayMethod( short[][] arg ) {
+        if ( !entered_short2dArrayMethod_30 ) {
+            entered_short2dArrayMethod_30 = true;
+            short[][] __return = __short2dArrayMethod( __swiftObject, arg);
+            entered_short2dArrayMethod_30 = false;
+            return __return;
+        }
+        else
+            return super.short2dArrayMethod( arg );
+    }
+
+    /// public short[] com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.shortArrayMethod(short[])
+
+    public native short[] __shortArrayMethod( long __swiftObject, short[] arg );
+
+    boolean entered_shortArrayMethod_31;
+
+    public short[] shortArrayMethod( short[] arg ) {
+        if ( !entered_shortArrayMethod_31 ) {
+            entered_shortArrayMethod_31 = true;
+            short[] __return = __shortArrayMethod( __swiftObject, arg);
+            entered_shortArrayMethod_31 = false;
+            return __return;
+        }
+        else
+            return super.shortArrayMethod( arg );
+    }
+
+    /// public short com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.shortMethod(short)
+
+    public native short __shortMethod( long __swiftObject, short arg );
+
+    boolean entered_shortMethod_32;
+
+    public short shortMethod( short arg ) {
+        if ( !entered_shortMethod_32 ) {
+            entered_shortMethod_32 = true;
+            short __return = __shortMethod( __swiftObject, arg);
+            entered_shortMethod_32 = false;
+            return __return;
+        }
+        else
+            return super.shortMethod( arg );
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.testMap(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMap)
+
+    public native com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap __testMap( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap arg );
+
+    boolean entered_testMap_33;
+
+    public com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap testMap( com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap arg ) {
+        if ( !entered_testMap_33 ) {
+            entered_testMap_33 = true;
+            com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMap __return = __testMap( __swiftObject, arg);
+            entered_testMap_33 = false;
+            return __return;
+        }
+        else
+            return super.testMap( arg );
+    }
+
+    /// public com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList com.johnholdsworth.swiftbindings.SwiftHelloTest$TestResponderAdapter.testMapList(com.johnholdsworth.swiftbindings.SwiftHelloTypes$ListenerMapList)
+
+    public native com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList __testMapList( long __swiftObject, com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList arg );
+
+    boolean entered_testMapList_34;
+
+    public com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList testMapList( com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList arg ) {
+        if ( !entered_testMapList_34 ) {
+            entered_testMapList_34 = true;
+            com.johnholdsworth.swiftbindings.SwiftHelloTypes.ListenerMapList __return = __testMapList( __swiftObject, arg);
+            entered_testMapList_34 = false;
+            return __return;
+        }
+        else
+            return super.testMapList( arg );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_35;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_35 ) {
+            entered_toString_35 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_35 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/com_johnholdsworth/SwiftHelloTypes_TextListenerProxy.java b/src/org/swiftjava/com_johnholdsworth/SwiftHelloTypes_TextListenerProxy.java
new file mode 100644
index 0000000..255f1fa
--- /dev/null
+++ b/src/org/swiftjava/com_johnholdsworth/SwiftHelloTypes_TextListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener ///
+
+package org.swiftjava.com_johnholdsworth;
+
+@SuppressWarnings("JniMissingFunction")
+public class SwiftHelloTypes_TextListenerProxy implements com.johnholdsworth.swiftbindings.SwiftHelloTypes.TextListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    SwiftHelloTypes_TextListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract java.lang.String com.johnholdsworth.swiftbindings.SwiftHelloTypes$TextListener.getText()
+
+    public native java.lang.String __getText( long __swiftObject );
+
+    public java.lang.String getText() {
+        return __getText( __swiftObject  );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/AWTEventListenerProxy.java b/src/org/swiftjava/java_awt/AWTEventListenerProxy.java
new file mode 100644
index 0000000..953961d
--- /dev/null
+++ b/src/org/swiftjava/java_awt/AWTEventListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.AWTEventListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class AWTEventListenerProxy implements java.awt.event.AWTEventListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    AWTEventListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.AWTEventListener.eventDispatched(java.awt.AWTEvent)
+
+    public native void __eventDispatched( long __swiftObject, java.awt.AWTEvent event );
+
+    public void eventDispatched( java.awt.AWTEvent event ) {
+        __eventDispatched( __swiftObject, event );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/ActionListenerProxy.java b/src/org/swiftjava/java_awt/ActionListenerProxy.java
new file mode 100644
index 0000000..64b0398
--- /dev/null
+++ b/src/org/swiftjava/java_awt/ActionListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.ActionListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class ActionListenerProxy implements java.awt.event.ActionListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    ActionListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.ActionListener.actionPerformed(java.awt.event.ActionEvent)
+
+    public native void __actionPerformed( long __swiftObject, java.awt.event.ActionEvent e );
+
+    public void actionPerformed( java.awt.event.ActionEvent e ) {
+        __actionPerformed( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/AdjustmentListenerProxy.java b/src/org/swiftjava/java_awt/AdjustmentListenerProxy.java
new file mode 100644
index 0000000..9a57a90
--- /dev/null
+++ b/src/org/swiftjava/java_awt/AdjustmentListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.AdjustmentListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class AdjustmentListenerProxy implements java.awt.event.AdjustmentListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    AdjustmentListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.AdjustmentListener.adjustmentValueChanged(java.awt.event.AdjustmentEvent)
+
+    public native void __adjustmentValueChanged( long __swiftObject, java.awt.event.AdjustmentEvent e );
+
+    public void adjustmentValueChanged( java.awt.event.AdjustmentEvent e ) {
+        __adjustmentValueChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/CanvasProxy.java b/src/org/swiftjava/java_awt/CanvasProxy.java
new file mode 100644
index 0000000..7a0f072
--- /dev/null
+++ b/src/org/swiftjava/java_awt/CanvasProxy.java
@@ -0,0 +1,66 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class java.awt.Canvas ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class CanvasProxy extends java.awt.Canvas {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public java.awt.Canvas()
+
+    CanvasProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public java.awt.Canvas(java.awt.GraphicsConfiguration)
+
+    CanvasProxy( java.awt.GraphicsConfiguration config , long __swiftObject ) {
+        super( config );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public void java.awt.Canvas.paint(java.awt.Graphics)
+
+    public native void __paint( long __swiftObject, java.awt.Graphics g );
+
+    boolean entered_paint_0;
+
+    public void paint( java.awt.Graphics g ) {
+        if ( !entered_paint_0 ) {
+            entered_paint_0 = true;
+            __paint( __swiftObject, g);
+            entered_paint_0 = false;
+        }
+        else
+            super.paint( g );
+    }
+
+    /// public void java.awt.Canvas.update(java.awt.Graphics)
+
+    public native void __update( long __swiftObject, java.awt.Graphics g );
+
+    boolean entered_update_1;
+
+    public void update( java.awt.Graphics g ) {
+        if ( !entered_update_1 ) {
+            entered_update_1 = true;
+            __update( __swiftObject, g);
+            entered_update_1 = false;
+        }
+        else
+            super.update( g );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/ComponentAdapterProxy.java b/src/org/swiftjava/java_awt/ComponentAdapterProxy.java
new file mode 100644
index 0000000..3b01658
--- /dev/null
+++ b/src/org/swiftjava/java_awt/ComponentAdapterProxy.java
@@ -0,0 +1,142 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class java.awt.event.ComponentAdapter ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class ComponentAdapterProxy extends java.awt.event.ComponentAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public java.awt.event.ComponentAdapter()
+
+    ComponentAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public void java.awt.event.ComponentAdapter.componentHidden(java.awt.event.ComponentEvent)
+
+    public native void __componentHidden( long __swiftObject, java.awt.event.ComponentEvent e );
+
+    boolean entered_componentHidden_0;
+
+    public void componentHidden( java.awt.event.ComponentEvent e ) {
+        if ( !entered_componentHidden_0 ) {
+            entered_componentHidden_0 = true;
+            __componentHidden( __swiftObject, e);
+            entered_componentHidden_0 = false;
+        }
+        else
+            super.componentHidden( e );
+    }
+
+    /// public void java.awt.event.ComponentAdapter.componentMoved(java.awt.event.ComponentEvent)
+
+    public native void __componentMoved( long __swiftObject, java.awt.event.ComponentEvent e );
+
+    boolean entered_componentMoved_1;
+
+    public void componentMoved( java.awt.event.ComponentEvent e ) {
+        if ( !entered_componentMoved_1 ) {
+            entered_componentMoved_1 = true;
+            __componentMoved( __swiftObject, e);
+            entered_componentMoved_1 = false;
+        }
+        else
+            super.componentMoved( e );
+    }
+
+    /// public void java.awt.event.ComponentAdapter.componentResized(java.awt.event.ComponentEvent)
+
+    public native void __componentResized( long __swiftObject, java.awt.event.ComponentEvent e );
+
+    boolean entered_componentResized_2;
+
+    public void componentResized( java.awt.event.ComponentEvent e ) {
+        if ( !entered_componentResized_2 ) {
+            entered_componentResized_2 = true;
+            __componentResized( __swiftObject, e);
+            entered_componentResized_2 = false;
+        }
+        else
+            super.componentResized( e );
+    }
+
+    /// public void java.awt.event.ComponentAdapter.componentShown(java.awt.event.ComponentEvent)
+
+    public native void __componentShown( long __swiftObject, java.awt.event.ComponentEvent e );
+
+    boolean entered_componentShown_3;
+
+    public void componentShown( java.awt.event.ComponentEvent e ) {
+        if ( !entered_componentShown_3 ) {
+            entered_componentShown_3 = true;
+            __componentShown( __swiftObject, e);
+            entered_componentShown_3 = false;
+        }
+        else
+            super.componentShown( e );
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_4;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_4 ) {
+            entered_equals_4 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_4 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_5;
+
+    public int hashCode() {
+        if ( !entered_hashCode_5 ) {
+            entered_hashCode_5 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_5 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_6;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_6 ) {
+            entered_toString_6 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_6 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/ComponentListenerProxy.java b/src/org/swiftjava/java_awt/ComponentListenerProxy.java
new file mode 100644
index 0000000..d5ff19b
--- /dev/null
+++ b/src/org/swiftjava/java_awt/ComponentListenerProxy.java
@@ -0,0 +1,56 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.ComponentListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class ComponentListenerProxy implements java.awt.event.ComponentListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    ComponentListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.ComponentListener.componentHidden(java.awt.event.ComponentEvent)
+
+    public native void __componentHidden( long __swiftObject, java.awt.event.ComponentEvent e );
+
+    public void componentHidden( java.awt.event.ComponentEvent e ) {
+        __componentHidden( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.ComponentListener.componentMoved(java.awt.event.ComponentEvent)
+
+    public native void __componentMoved( long __swiftObject, java.awt.event.ComponentEvent e );
+
+    public void componentMoved( java.awt.event.ComponentEvent e ) {
+        __componentMoved( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.ComponentListener.componentResized(java.awt.event.ComponentEvent)
+
+    public native void __componentResized( long __swiftObject, java.awt.event.ComponentEvent e );
+
+    public void componentResized( java.awt.event.ComponentEvent e ) {
+        __componentResized( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.ComponentListener.componentShown(java.awt.event.ComponentEvent)
+
+    public native void __componentShown( long __swiftObject, java.awt.event.ComponentEvent e );
+
+    public void componentShown( java.awt.event.ComponentEvent e ) {
+        __componentShown( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/java_awt/ContainerAdapterProxy.java b/src/org/swiftjava/java_awt/ContainerAdapterProxy.java
similarity index 55%
rename from src/org/genie/java_awt/ContainerAdapterProxy.java
rename to src/org/swiftjava/java_awt/ContainerAdapterProxy.java
index c42662d..cbe61e8 100644
--- a/src/org/genie/java_awt/ContainerAdapterProxy.java
+++ b/src/org/swiftjava/java_awt/ContainerAdapterProxy.java
@@ -1,29 +1,33 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class java.awt.event.ContainerAdapter ///
 
-package org.genie.java_awt;
+package org.swiftjava.java_awt;
 
+@SuppressWarnings("JniMissingFunction")
 public class ContainerAdapterProxy extends java.awt.event.ContainerAdapter {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public java.awt.event.ContainerAdapter()
 
-    ContainerAdapterProxy( long swiftObject ) {
+    ContainerAdapterProxy( long __swiftObject ) {
         super( );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public void java.awt.event.ContainerAdapter.componentAdded(java.awt.event.ContainerEvent)
 
-    public native void __componentAdded( java.awt.event.ContainerEvent e );
+    public native void __componentAdded( long __swiftObject, java.awt.event.ContainerEvent e );
 
     boolean entered_componentAdded_0;
 
     public void componentAdded( java.awt.event.ContainerEvent e ) {
         if ( !entered_componentAdded_0 ) {
             entered_componentAdded_0 = true;
-            __componentAdded( e );
+            __componentAdded( __swiftObject, e);
             entered_componentAdded_0 = false;
         }
         else
@@ -32,14 +36,14 @@ public void componentAdded( java.awt.event.ContainerEvent e ) {
 
     /// public void java.awt.event.ContainerAdapter.componentRemoved(java.awt.event.ContainerEvent)
 
-    public native void __componentRemoved( java.awt.event.ContainerEvent e );
+    public native void __componentRemoved( long __swiftObject, java.awt.event.ContainerEvent e );
 
     boolean entered_componentRemoved_1;
 
     public void componentRemoved( java.awt.event.ContainerEvent e ) {
         if ( !entered_componentRemoved_1 ) {
             entered_componentRemoved_1 = true;
-            __componentRemoved( e );
+            __componentRemoved( __swiftObject, e);
             entered_componentRemoved_1 = false;
         }
         else
@@ -48,14 +52,14 @@ public void componentRemoved( java.awt.event.ContainerEvent e ) {
 
     /// public boolean java.lang.Object.equals(java.lang.Object)
 
-    public native boolean __equals( java.lang.Object arg0 );
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
 
     boolean entered_equals_2;
 
     public boolean equals( java.lang.Object arg0 ) {
         if ( !entered_equals_2 ) {
             entered_equals_2 = true;
-            boolean __return = __equals( arg0 );
+            boolean __return = __equals( __swiftObject, arg0);
             entered_equals_2 = false;
             return __return;
         }
@@ -63,38 +67,44 @@ public boolean equals( java.lang.Object arg0 ) {
             return super.equals( arg0 );
     }
 
-    /// public java.lang.String java.lang.Object.toString()
+    /// public native int java.lang.Object.hashCode()
 
-    public native java.lang.String __toString();
+    public native int __hashCode( long __swiftObject );
 
-    boolean entered_toString_3;
+    boolean entered_hashCode_3;
 
-    public java.lang.String toString() {
-        if ( !entered_toString_3 ) {
-            entered_toString_3 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_3 = false;
+    public int hashCode() {
+        if ( !entered_hashCode_3 ) {
+            entered_hashCode_3 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_3 = false;
             return __return;
         }
         else
-            return super.toString( );
+            return super.hashCode( );
     }
 
-    /// public native int java.lang.Object.hashCode()
+    /// public java.lang.String java.lang.Object.toString()
 
-    public native int __hashCode();
+    public native java.lang.String __toString( long __swiftObject );
 
-    boolean entered_hashCode_4;
+    boolean entered_toString_4;
 
-    public int hashCode() {
-        if ( !entered_hashCode_4 ) {
-            entered_hashCode_4 = true;
-            int __return = __hashCode( );
-            entered_hashCode_4 = false;
+    public java.lang.String toString() {
+        if ( !entered_toString_4 ) {
+            entered_toString_4 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_4 = false;
             return __return;
         }
         else
-            return super.hashCode( );
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
     }
 
 }
diff --git a/src/org/swiftjava/java_awt/ContainerListenerProxy.java b/src/org/swiftjava/java_awt/ContainerListenerProxy.java
new file mode 100644
index 0000000..510474d
--- /dev/null
+++ b/src/org/swiftjava/java_awt/ContainerListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.ContainerListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class ContainerListenerProxy implements java.awt.event.ContainerListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    ContainerListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.ContainerListener.componentAdded(java.awt.event.ContainerEvent)
+
+    public native void __componentAdded( long __swiftObject, java.awt.event.ContainerEvent e );
+
+    public void componentAdded( java.awt.event.ContainerEvent e ) {
+        __componentAdded( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.ContainerListener.componentRemoved(java.awt.event.ContainerEvent)
+
+    public native void __componentRemoved( long __swiftObject, java.awt.event.ContainerEvent e );
+
+    public void componentRemoved( java.awt.event.ContainerEvent e ) {
+        __componentRemoved( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/java_awt/DialogProxy.java b/src/org/swiftjava/java_awt/DialogProxy.java
similarity index 60%
rename from src/org/genie/java_awt/DialogProxy.java
rename to src/org/swiftjava/java_awt/DialogProxy.java
index fdec434..3ad6137 100644
--- a/src/org/genie/java_awt/DialogProxy.java
+++ b/src/org/swiftjava/java_awt/DialogProxy.java
@@ -1,124 +1,134 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class java.awt.Dialog ///
 
-package org.genie.java_awt;
+package org.swiftjava.java_awt;
 
+@SuppressWarnings("JniMissingFunction")
 public class DialogProxy extends java.awt.Dialog {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public java.awt.Dialog(java.awt.Window,java.lang.String)
 
-    DialogProxy( java.awt.Window arg0, java.lang.String arg1 , long swiftObject ) {
+    DialogProxy( java.awt.Window arg0, java.lang.String arg1 , long __swiftObject ) {
         super( arg0, arg1 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Window)
 
-    DialogProxy( java.awt.Window arg0 , long swiftObject ) {
+    DialogProxy( java.awt.Window arg0 , long __swiftObject ) {
         super( arg0 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Dialog,java.lang.String,boolean,java.awt.GraphicsConfiguration)
 
-    DialogProxy( java.awt.Dialog arg0, java.lang.String arg1, boolean arg2, java.awt.GraphicsConfiguration arg3 , long swiftObject ) {
+    DialogProxy( java.awt.Dialog arg0, java.lang.String arg1, boolean arg2, java.awt.GraphicsConfiguration arg3 , long __swiftObject ) {
         super( arg0, arg1, arg2, arg3 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Dialog,java.lang.String,boolean)
 
-    DialogProxy( java.awt.Dialog arg0, java.lang.String arg1, boolean arg2 , long swiftObject ) {
+    DialogProxy( java.awt.Dialog arg0, java.lang.String arg1, boolean arg2 , long __swiftObject ) {
         super( arg0, arg1, arg2 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Window,java.awt.Dialog$ModalityType)
 
-    DialogProxy( java.awt.Window arg0, java.awt.Dialog.ModalityType arg1 , long swiftObject ) {
+    DialogProxy( java.awt.Window arg0, java.awt.Dialog.ModalityType arg1 , long __swiftObject ) {
         super( arg0, arg1 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Window,java.lang.String,java.awt.Dialog$ModalityType)
 
-    DialogProxy( java.awt.Window arg0, java.lang.String arg1, java.awt.Dialog.ModalityType arg2 , long swiftObject ) {
+    DialogProxy( java.awt.Window arg0, java.lang.String arg1, java.awt.Dialog.ModalityType arg2 , long __swiftObject ) {
         super( arg0, arg1, arg2 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Window,java.lang.String,java.awt.Dialog$ModalityType,java.awt.GraphicsConfiguration)
 
-    DialogProxy( java.awt.Window arg0, java.lang.String arg1, java.awt.Dialog.ModalityType arg2, java.awt.GraphicsConfiguration arg3 , long swiftObject ) {
+    DialogProxy( java.awt.Window arg0, java.lang.String arg1, java.awt.Dialog.ModalityType arg2, java.awt.GraphicsConfiguration arg3 , long __swiftObject ) {
         super( arg0, arg1, arg2, arg3 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Frame,java.lang.String,boolean)
 
-    DialogProxy( java.awt.Frame arg0, java.lang.String arg1, boolean arg2 , long swiftObject ) {
+    DialogProxy( java.awt.Frame arg0, java.lang.String arg1, boolean arg2 , long __swiftObject ) {
         super( arg0, arg1, arg2 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Frame,java.lang.String)
 
-    DialogProxy( java.awt.Frame arg0, java.lang.String arg1 , long swiftObject ) {
+    DialogProxy( java.awt.Frame arg0, java.lang.String arg1 , long __swiftObject ) {
         super( arg0, arg1 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Frame,boolean)
 
-    DialogProxy( java.awt.Frame arg0, boolean arg1 , long swiftObject ) {
+    DialogProxy( java.awt.Frame arg0, boolean arg1 , long __swiftObject ) {
         super( arg0, arg1 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Frame)
 
-    DialogProxy( java.awt.Frame arg0 , long swiftObject ) {
+    DialogProxy( java.awt.Frame arg0 , long __swiftObject ) {
         super( arg0 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Dialog,java.lang.String)
 
-    DialogProxy( java.awt.Dialog arg0, java.lang.String arg1 , long swiftObject ) {
+    DialogProxy( java.awt.Dialog arg0, java.lang.String arg1 , long __swiftObject ) {
         super( arg0, arg1 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Dialog)
 
-    DialogProxy( java.awt.Dialog arg0 , long swiftObject ) {
+    DialogProxy( java.awt.Dialog arg0 , long __swiftObject ) {
         super( arg0 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Dialog(java.awt.Frame,java.lang.String,boolean,java.awt.GraphicsConfiguration)
 
-    DialogProxy( java.awt.Frame arg0, java.lang.String arg1, boolean arg2, java.awt.GraphicsConfiguration arg3 , long swiftObject ) {
+    DialogProxy( java.awt.Frame arg0, java.lang.String arg1, boolean arg2, java.awt.GraphicsConfiguration arg3 , long __swiftObject ) {
         super( arg0, arg1, arg2, arg3 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public void java.awt.Window.paint(java.awt.Graphics)
 
-    public native void __paint( java.awt.Graphics arg0 );
+    public native void __paint( long __swiftObject, java.awt.Graphics arg0 );
 
     boolean entered_paint_0;
 
     public void paint( java.awt.Graphics arg0 ) {
         if ( !entered_paint_0 ) {
             entered_paint_0 = true;
-            __paint( arg0 );
+            __paint( __swiftObject, arg0);
             entered_paint_0 = false;
         }
         else
             super.paint( arg0 );
     }
 
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
 }
diff --git a/src/org/swiftjava/java_awt/DragGestureListenerProxy.java b/src/org/swiftjava/java_awt/DragGestureListenerProxy.java
new file mode 100644
index 0000000..fbc11d1
--- /dev/null
+++ b/src/org/swiftjava/java_awt/DragGestureListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.dnd.DragGestureListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class DragGestureListenerProxy implements java.awt.dnd.DragGestureListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    DragGestureListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.dnd.DragGestureListener.dragGestureRecognized(java.awt.dnd.DragGestureEvent)
+
+    public native void __dragGestureRecognized( long __swiftObject, java.awt.dnd.DragGestureEvent dge );
+
+    public void dragGestureRecognized( java.awt.dnd.DragGestureEvent dge ) {
+        __dragGestureRecognized( __swiftObject, dge );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/DragSourceAdapterProxy.java b/src/org/swiftjava/java_awt/DragSourceAdapterProxy.java
new file mode 100644
index 0000000..1af1186
--- /dev/null
+++ b/src/org/swiftjava/java_awt/DragSourceAdapterProxy.java
@@ -0,0 +1,174 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class java.awt.dnd.DragSourceAdapter ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class DragSourceAdapterProxy extends java.awt.dnd.DragSourceAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public java.awt.dnd.DragSourceAdapter()
+
+    DragSourceAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public void java.awt.dnd.DragSourceAdapter.dragDropEnd(java.awt.dnd.DragSourceDropEvent)
+
+    public native void __dragDropEnd( long __swiftObject, java.awt.dnd.DragSourceDropEvent dsde );
+
+    boolean entered_dragDropEnd_0;
+
+    public void dragDropEnd( java.awt.dnd.DragSourceDropEvent dsde ) {
+        if ( !entered_dragDropEnd_0 ) {
+            entered_dragDropEnd_0 = true;
+            __dragDropEnd( __swiftObject, dsde);
+            entered_dragDropEnd_0 = false;
+        }
+        else
+            super.dragDropEnd( dsde );
+    }
+
+    /// public void java.awt.dnd.DragSourceAdapter.dragEnter(java.awt.dnd.DragSourceDragEvent)
+
+    public native void __dragEnter( long __swiftObject, java.awt.dnd.DragSourceDragEvent dsde );
+
+    boolean entered_dragEnter_1;
+
+    public void dragEnter( java.awt.dnd.DragSourceDragEvent dsde ) {
+        if ( !entered_dragEnter_1 ) {
+            entered_dragEnter_1 = true;
+            __dragEnter( __swiftObject, dsde);
+            entered_dragEnter_1 = false;
+        }
+        else
+            super.dragEnter( dsde );
+    }
+
+    /// public void java.awt.dnd.DragSourceAdapter.dragExit(java.awt.dnd.DragSourceEvent)
+
+    public native void __dragExit( long __swiftObject, java.awt.dnd.DragSourceEvent dse );
+
+    boolean entered_dragExit_2;
+
+    public void dragExit( java.awt.dnd.DragSourceEvent dse ) {
+        if ( !entered_dragExit_2 ) {
+            entered_dragExit_2 = true;
+            __dragExit( __swiftObject, dse);
+            entered_dragExit_2 = false;
+        }
+        else
+            super.dragExit( dse );
+    }
+
+    /// public void java.awt.dnd.DragSourceAdapter.dragMouseMoved(java.awt.dnd.DragSourceDragEvent)
+
+    public native void __dragMouseMoved( long __swiftObject, java.awt.dnd.DragSourceDragEvent dsde );
+
+    boolean entered_dragMouseMoved_3;
+
+    public void dragMouseMoved( java.awt.dnd.DragSourceDragEvent dsde ) {
+        if ( !entered_dragMouseMoved_3 ) {
+            entered_dragMouseMoved_3 = true;
+            __dragMouseMoved( __swiftObject, dsde);
+            entered_dragMouseMoved_3 = false;
+        }
+        else
+            super.dragMouseMoved( dsde );
+    }
+
+    /// public void java.awt.dnd.DragSourceAdapter.dragOver(java.awt.dnd.DragSourceDragEvent)
+
+    public native void __dragOver( long __swiftObject, java.awt.dnd.DragSourceDragEvent dsde );
+
+    boolean entered_dragOver_4;
+
+    public void dragOver( java.awt.dnd.DragSourceDragEvent dsde ) {
+        if ( !entered_dragOver_4 ) {
+            entered_dragOver_4 = true;
+            __dragOver( __swiftObject, dsde);
+            entered_dragOver_4 = false;
+        }
+        else
+            super.dragOver( dsde );
+    }
+
+    /// public void java.awt.dnd.DragSourceAdapter.dropActionChanged(java.awt.dnd.DragSourceDragEvent)
+
+    public native void __dropActionChanged( long __swiftObject, java.awt.dnd.DragSourceDragEvent dsde );
+
+    boolean entered_dropActionChanged_5;
+
+    public void dropActionChanged( java.awt.dnd.DragSourceDragEvent dsde ) {
+        if ( !entered_dropActionChanged_5 ) {
+            entered_dropActionChanged_5 = true;
+            __dropActionChanged( __swiftObject, dsde);
+            entered_dropActionChanged_5 = false;
+        }
+        else
+            super.dropActionChanged( dsde );
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_6;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_6 ) {
+            entered_equals_6 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_6 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_7;
+
+    public int hashCode() {
+        if ( !entered_hashCode_7 ) {
+            entered_hashCode_7 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_7 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_8;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_8 ) {
+            entered_toString_8 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_8 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/DragSourceListenerProxy.java b/src/org/swiftjava/java_awt/DragSourceListenerProxy.java
new file mode 100644
index 0000000..f33544e
--- /dev/null
+++ b/src/org/swiftjava/java_awt/DragSourceListenerProxy.java
@@ -0,0 +1,64 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.dnd.DragSourceListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class DragSourceListenerProxy implements java.awt.dnd.DragSourceListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    DragSourceListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.dnd.DragSourceListener.dragDropEnd(java.awt.dnd.DragSourceDropEvent)
+
+    public native void __dragDropEnd( long __swiftObject, java.awt.dnd.DragSourceDropEvent dsde );
+
+    public void dragDropEnd( java.awt.dnd.DragSourceDropEvent dsde ) {
+        __dragDropEnd( __swiftObject, dsde );
+    }
+
+    /// public abstract void java.awt.dnd.DragSourceListener.dragEnter(java.awt.dnd.DragSourceDragEvent)
+
+    public native void __dragEnter( long __swiftObject, java.awt.dnd.DragSourceDragEvent dsde );
+
+    public void dragEnter( java.awt.dnd.DragSourceDragEvent dsde ) {
+        __dragEnter( __swiftObject, dsde );
+    }
+
+    /// public abstract void java.awt.dnd.DragSourceListener.dragExit(java.awt.dnd.DragSourceEvent)
+
+    public native void __dragExit( long __swiftObject, java.awt.dnd.DragSourceEvent dse );
+
+    public void dragExit( java.awt.dnd.DragSourceEvent dse ) {
+        __dragExit( __swiftObject, dse );
+    }
+
+    /// public abstract void java.awt.dnd.DragSourceListener.dragOver(java.awt.dnd.DragSourceDragEvent)
+
+    public native void __dragOver( long __swiftObject, java.awt.dnd.DragSourceDragEvent dsde );
+
+    public void dragOver( java.awt.dnd.DragSourceDragEvent dsde ) {
+        __dragOver( __swiftObject, dsde );
+    }
+
+    /// public abstract void java.awt.dnd.DragSourceListener.dropActionChanged(java.awt.dnd.DragSourceDragEvent)
+
+    public native void __dropActionChanged( long __swiftObject, java.awt.dnd.DragSourceDragEvent dsde );
+
+    public void dropActionChanged( java.awt.dnd.DragSourceDragEvent dsde ) {
+        __dropActionChanged( __swiftObject, dsde );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/DragSourceMotionListenerProxy.java b/src/org/swiftjava/java_awt/DragSourceMotionListenerProxy.java
new file mode 100644
index 0000000..fca18fd
--- /dev/null
+++ b/src/org/swiftjava/java_awt/DragSourceMotionListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.dnd.DragSourceMotionListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class DragSourceMotionListenerProxy implements java.awt.dnd.DragSourceMotionListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    DragSourceMotionListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.dnd.DragSourceMotionListener.dragMouseMoved(java.awt.dnd.DragSourceDragEvent)
+
+    public native void __dragMouseMoved( long __swiftObject, java.awt.dnd.DragSourceDragEvent dsde );
+
+    public void dragMouseMoved( java.awt.dnd.DragSourceDragEvent dsde ) {
+        __dragMouseMoved( __swiftObject, dsde );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/DropTargetAdapterProxy.java b/src/org/swiftjava/java_awt/DropTargetAdapterProxy.java
new file mode 100644
index 0000000..3e757d1
--- /dev/null
+++ b/src/org/swiftjava/java_awt/DropTargetAdapterProxy.java
@@ -0,0 +1,152 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class java.awt.dnd.DropTargetAdapter ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class DropTargetAdapterProxy extends java.awt.dnd.DropTargetAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public java.awt.dnd.DropTargetAdapter()
+
+    DropTargetAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public void java.awt.dnd.DropTargetAdapter.dragEnter(java.awt.dnd.DropTargetDragEvent)
+
+    public native void __dragEnter( long __swiftObject, java.awt.dnd.DropTargetDragEvent dtde );
+
+    boolean entered_dragEnter_0;
+
+    public void dragEnter( java.awt.dnd.DropTargetDragEvent dtde ) {
+        if ( !entered_dragEnter_0 ) {
+            entered_dragEnter_0 = true;
+            __dragEnter( __swiftObject, dtde);
+            entered_dragEnter_0 = false;
+        }
+        else
+            super.dragEnter( dtde );
+    }
+
+    /// public void java.awt.dnd.DropTargetAdapter.dragExit(java.awt.dnd.DropTargetEvent)
+
+    public native void __dragExit( long __swiftObject, java.awt.dnd.DropTargetEvent dte );
+
+    boolean entered_dragExit_1;
+
+    public void dragExit( java.awt.dnd.DropTargetEvent dte ) {
+        if ( !entered_dragExit_1 ) {
+            entered_dragExit_1 = true;
+            __dragExit( __swiftObject, dte);
+            entered_dragExit_1 = false;
+        }
+        else
+            super.dragExit( dte );
+    }
+
+    /// public void java.awt.dnd.DropTargetAdapter.dragOver(java.awt.dnd.DropTargetDragEvent)
+
+    public native void __dragOver( long __swiftObject, java.awt.dnd.DropTargetDragEvent dtde );
+
+    boolean entered_dragOver_2;
+
+    public void dragOver( java.awt.dnd.DropTargetDragEvent dtde ) {
+        if ( !entered_dragOver_2 ) {
+            entered_dragOver_2 = true;
+            __dragOver( __swiftObject, dtde);
+            entered_dragOver_2 = false;
+        }
+        else
+            super.dragOver( dtde );
+    }
+
+    /// public abstract void java.awt.dnd.DropTargetListener.drop(java.awt.dnd.DropTargetDropEvent)
+
+    public native void __drop( long __swiftObject, java.awt.dnd.DropTargetDropEvent dtde );
+
+    boolean entered_drop_3;
+
+    public void drop( java.awt.dnd.DropTargetDropEvent dtde ) {
+        __drop( __swiftObject, dtde );
+    }
+
+    /// public void java.awt.dnd.DropTargetAdapter.dropActionChanged(java.awt.dnd.DropTargetDragEvent)
+
+    public native void __dropActionChanged( long __swiftObject, java.awt.dnd.DropTargetDragEvent dtde );
+
+    boolean entered_dropActionChanged_4;
+
+    public void dropActionChanged( java.awt.dnd.DropTargetDragEvent dtde ) {
+        if ( !entered_dropActionChanged_4 ) {
+            entered_dropActionChanged_4 = true;
+            __dropActionChanged( __swiftObject, dtde);
+            entered_dropActionChanged_4 = false;
+        }
+        else
+            super.dropActionChanged( dtde );
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_5;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_5 ) {
+            entered_equals_5 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_5 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_6;
+
+    public int hashCode() {
+        if ( !entered_hashCode_6 ) {
+            entered_hashCode_6 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_6 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_7;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_7 ) {
+            entered_toString_7 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_7 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/DropTargetListenerProxy.java b/src/org/swiftjava/java_awt/DropTargetListenerProxy.java
new file mode 100644
index 0000000..7140c73
--- /dev/null
+++ b/src/org/swiftjava/java_awt/DropTargetListenerProxy.java
@@ -0,0 +1,64 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.dnd.DropTargetListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class DropTargetListenerProxy implements java.awt.dnd.DropTargetListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    DropTargetListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.dnd.DropTargetListener.dragEnter(java.awt.dnd.DropTargetDragEvent)
+
+    public native void __dragEnter( long __swiftObject, java.awt.dnd.DropTargetDragEvent dtde );
+
+    public void dragEnter( java.awt.dnd.DropTargetDragEvent dtde ) {
+        __dragEnter( __swiftObject, dtde );
+    }
+
+    /// public abstract void java.awt.dnd.DropTargetListener.dragExit(java.awt.dnd.DropTargetEvent)
+
+    public native void __dragExit( long __swiftObject, java.awt.dnd.DropTargetEvent dte );
+
+    public void dragExit( java.awt.dnd.DropTargetEvent dte ) {
+        __dragExit( __swiftObject, dte );
+    }
+
+    /// public abstract void java.awt.dnd.DropTargetListener.dragOver(java.awt.dnd.DropTargetDragEvent)
+
+    public native void __dragOver( long __swiftObject, java.awt.dnd.DropTargetDragEvent dtde );
+
+    public void dragOver( java.awt.dnd.DropTargetDragEvent dtde ) {
+        __dragOver( __swiftObject, dtde );
+    }
+
+    /// public abstract void java.awt.dnd.DropTargetListener.drop(java.awt.dnd.DropTargetDropEvent)
+
+    public native void __drop( long __swiftObject, java.awt.dnd.DropTargetDropEvent dtde );
+
+    public void drop( java.awt.dnd.DropTargetDropEvent dtde ) {
+        __drop( __swiftObject, dtde );
+    }
+
+    /// public abstract void java.awt.dnd.DropTargetListener.dropActionChanged(java.awt.dnd.DropTargetDragEvent)
+
+    public native void __dropActionChanged( long __swiftObject, java.awt.dnd.DropTargetDragEvent dtde );
+
+    public void dropActionChanged( java.awt.dnd.DropTargetDragEvent dtde ) {
+        __dropActionChanged( __swiftObject, dtde );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/java_awt/FileDialogProxy.java b/src/org/swiftjava/java_awt/FileDialogProxy.java
similarity index 56%
rename from src/org/genie/java_awt/FileDialogProxy.java
rename to src/org/swiftjava/java_awt/FileDialogProxy.java
index cd45375..48f83bf 100644
--- a/src/org/genie/java_awt/FileDialogProxy.java
+++ b/src/org/swiftjava/java_awt/FileDialogProxy.java
@@ -1,68 +1,78 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class java.awt.FileDialog ///
 
-package org.genie.java_awt;
+package org.swiftjava.java_awt;
 
+@SuppressWarnings("JniMissingFunction")
 public class FileDialogProxy extends java.awt.FileDialog {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public java.awt.FileDialog(java.awt.Dialog,java.lang.String)
 
-    FileDialogProxy( java.awt.Dialog parent, java.lang.String title , long swiftObject ) {
+    FileDialogProxy( java.awt.Dialog parent, java.lang.String title , long __swiftObject ) {
         super( parent, title );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.FileDialog(java.awt.Dialog)
 
-    FileDialogProxy( java.awt.Dialog parent , long swiftObject ) {
+    FileDialogProxy( java.awt.Dialog parent , long __swiftObject ) {
         super( parent );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.FileDialog(java.awt.Frame,java.lang.String,int)
 
-    FileDialogProxy( java.awt.Frame parent, java.lang.String title, int mode , long swiftObject ) {
+    FileDialogProxy( java.awt.Frame parent, java.lang.String title, int mode , long __swiftObject ) {
         super( parent, title, mode );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.FileDialog(java.awt.Dialog,java.lang.String,int)
 
-    FileDialogProxy( java.awt.Dialog parent, java.lang.String title, int mode , long swiftObject ) {
+    FileDialogProxy( java.awt.Dialog parent, java.lang.String title, int mode , long __swiftObject ) {
         super( parent, title, mode );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.FileDialog(java.awt.Frame)
 
-    FileDialogProxy( java.awt.Frame parent , long swiftObject ) {
+    FileDialogProxy( java.awt.Frame parent , long __swiftObject ) {
         super( parent );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.FileDialog(java.awt.Frame,java.lang.String)
 
-    FileDialogProxy( java.awt.Frame parent, java.lang.String title , long swiftObject ) {
+    FileDialogProxy( java.awt.Frame parent, java.lang.String title , long __swiftObject ) {
         super( parent, title );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public void java.awt.Window.paint(java.awt.Graphics)
 
-    public native void __paint( java.awt.Graphics arg0 );
+    public native void __paint( long __swiftObject, java.awt.Graphics arg0 );
 
     boolean entered_paint_0;
 
     public void paint( java.awt.Graphics arg0 ) {
         if ( !entered_paint_0 ) {
             entered_paint_0 = true;
-            __paint( arg0 );
+            __paint( __swiftObject, arg0);
             entered_paint_0 = false;
         }
         else
             super.paint( arg0 );
     }
 
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
 }
diff --git a/src/org/swiftjava/java_awt/FlavorListenerProxy.java b/src/org/swiftjava/java_awt/FlavorListenerProxy.java
new file mode 100644
index 0000000..af25bb2
--- /dev/null
+++ b/src/org/swiftjava/java_awt/FlavorListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.datatransfer.FlavorListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class FlavorListenerProxy implements java.awt.datatransfer.FlavorListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    FlavorListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.datatransfer.FlavorListener.flavorsChanged(java.awt.datatransfer.FlavorEvent)
+
+    public native void __flavorsChanged( long __swiftObject, java.awt.datatransfer.FlavorEvent e );
+
+    public void flavorsChanged( java.awt.datatransfer.FlavorEvent e ) {
+        __flavorsChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/FocusAdapterProxy.java b/src/org/swiftjava/java_awt/FocusAdapterProxy.java
new file mode 100644
index 0000000..7c93384
--- /dev/null
+++ b/src/org/swiftjava/java_awt/FocusAdapterProxy.java
@@ -0,0 +1,110 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class java.awt.event.FocusAdapter ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class FocusAdapterProxy extends java.awt.event.FocusAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public java.awt.event.FocusAdapter()
+
+    FocusAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_0;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_0 ) {
+            entered_equals_0 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_0 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public void java.awt.event.FocusAdapter.focusGained(java.awt.event.FocusEvent)
+
+    public native void __focusGained( long __swiftObject, java.awt.event.FocusEvent e );
+
+    boolean entered_focusGained_1;
+
+    public void focusGained( java.awt.event.FocusEvent e ) {
+        if ( !entered_focusGained_1 ) {
+            entered_focusGained_1 = true;
+            __focusGained( __swiftObject, e);
+            entered_focusGained_1 = false;
+        }
+        else
+            super.focusGained( e );
+    }
+
+    /// public void java.awt.event.FocusAdapter.focusLost(java.awt.event.FocusEvent)
+
+    public native void __focusLost( long __swiftObject, java.awt.event.FocusEvent e );
+
+    boolean entered_focusLost_2;
+
+    public void focusLost( java.awt.event.FocusEvent e ) {
+        if ( !entered_focusLost_2 ) {
+            entered_focusLost_2 = true;
+            __focusLost( __swiftObject, e);
+            entered_focusLost_2 = false;
+        }
+        else
+            super.focusLost( e );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_3;
+
+    public int hashCode() {
+        if ( !entered_hashCode_3 ) {
+            entered_hashCode_3 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_3 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_4;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_4 ) {
+            entered_toString_4 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_4 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/FocusListenerProxy.java b/src/org/swiftjava/java_awt/FocusListenerProxy.java
new file mode 100644
index 0000000..d856bbd
--- /dev/null
+++ b/src/org/swiftjava/java_awt/FocusListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.FocusListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class FocusListenerProxy implements java.awt.event.FocusListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    FocusListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.FocusListener.focusGained(java.awt.event.FocusEvent)
+
+    public native void __focusGained( long __swiftObject, java.awt.event.FocusEvent e );
+
+    public void focusGained( java.awt.event.FocusEvent e ) {
+        __focusGained( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.FocusListener.focusLost(java.awt.event.FocusEvent)
+
+    public native void __focusLost( long __swiftObject, java.awt.event.FocusEvent e );
+
+    public void focusLost( java.awt.event.FocusEvent e ) {
+        __focusLost( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/java_awt/FrameProxy.java b/src/org/swiftjava/java_awt/FrameProxy.java
similarity index 50%
rename from src/org/genie/java_awt/FrameProxy.java
rename to src/org/swiftjava/java_awt/FrameProxy.java
index 5555b42..a109a31 100644
--- a/src/org/genie/java_awt/FrameProxy.java
+++ b/src/org/swiftjava/java_awt/FrameProxy.java
@@ -1,54 +1,64 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class java.awt.Frame ///
 
-package org.genie.java_awt;
+package org.swiftjava.java_awt;
 
+@SuppressWarnings("JniMissingFunction")
 public class FrameProxy extends java.awt.Frame {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public java.awt.Frame(java.lang.String,java.awt.GraphicsConfiguration)
 
-    FrameProxy( java.lang.String title, java.awt.GraphicsConfiguration gc , long swiftObject ) {
+    FrameProxy( java.lang.String title, java.awt.GraphicsConfiguration gc , long __swiftObject ) {
         super( title, gc );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Frame(java.lang.String) throws java.awt.HeadlessException
 
-    FrameProxy( java.lang.String title , long swiftObject ) {
+    FrameProxy( java.lang.String title , long __swiftObject ) {
         super( title );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Frame(java.awt.GraphicsConfiguration)
 
-    FrameProxy( java.awt.GraphicsConfiguration gc , long swiftObject ) {
+    FrameProxy( java.awt.GraphicsConfiguration gc , long __swiftObject ) {
         super( gc );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Frame() throws java.awt.HeadlessException
 
-    FrameProxy( long swiftObject ) {
+    FrameProxy( long __swiftObject ) {
         super( );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public void java.awt.Window.paint(java.awt.Graphics)
 
-    public native void __paint( java.awt.Graphics arg0 );
+    public native void __paint( long __swiftObject, java.awt.Graphics arg0 );
 
     boolean entered_paint_0;
 
     public void paint( java.awt.Graphics arg0 ) {
         if ( !entered_paint_0 ) {
             entered_paint_0 = true;
-            __paint( arg0 );
+            __paint( __swiftObject, arg0);
             entered_paint_0 = false;
         }
         else
             super.paint( arg0 );
     }
 
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
 }
diff --git a/src/org/genie/java_awt/HierarchyBoundsAdapterProxy.java b/src/org/swiftjava/java_awt/HierarchyBoundsAdapterProxy.java
similarity index 55%
rename from src/org/genie/java_awt/HierarchyBoundsAdapterProxy.java
rename to src/org/swiftjava/java_awt/HierarchyBoundsAdapterProxy.java
index b5a581b..0a202de 100644
--- a/src/org/genie/java_awt/HierarchyBoundsAdapterProxy.java
+++ b/src/org/swiftjava/java_awt/HierarchyBoundsAdapterProxy.java
@@ -1,29 +1,33 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class java.awt.event.HierarchyBoundsAdapter ///
 
-package org.genie.java_awt;
+package org.swiftjava.java_awt;
 
+@SuppressWarnings("JniMissingFunction")
 public class HierarchyBoundsAdapterProxy extends java.awt.event.HierarchyBoundsAdapter {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public java.awt.event.HierarchyBoundsAdapter()
 
-    HierarchyBoundsAdapterProxy( long swiftObject ) {
+    HierarchyBoundsAdapterProxy( long __swiftObject ) {
         super( );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public void java.awt.event.HierarchyBoundsAdapter.ancestorMoved(java.awt.event.HierarchyEvent)
 
-    public native void __ancestorMoved( java.awt.event.HierarchyEvent e );
+    public native void __ancestorMoved( long __swiftObject, java.awt.event.HierarchyEvent e );
 
     boolean entered_ancestorMoved_0;
 
     public void ancestorMoved( java.awt.event.HierarchyEvent e ) {
         if ( !entered_ancestorMoved_0 ) {
             entered_ancestorMoved_0 = true;
-            __ancestorMoved( e );
+            __ancestorMoved( __swiftObject, e);
             entered_ancestorMoved_0 = false;
         }
         else
@@ -32,14 +36,14 @@ public void ancestorMoved( java.awt.event.HierarchyEvent e ) {
 
     /// public void java.awt.event.HierarchyBoundsAdapter.ancestorResized(java.awt.event.HierarchyEvent)
 
-    public native void __ancestorResized( java.awt.event.HierarchyEvent e );
+    public native void __ancestorResized( long __swiftObject, java.awt.event.HierarchyEvent e );
 
     boolean entered_ancestorResized_1;
 
     public void ancestorResized( java.awt.event.HierarchyEvent e ) {
         if ( !entered_ancestorResized_1 ) {
             entered_ancestorResized_1 = true;
-            __ancestorResized( e );
+            __ancestorResized( __swiftObject, e);
             entered_ancestorResized_1 = false;
         }
         else
@@ -48,14 +52,14 @@ public void ancestorResized( java.awt.event.HierarchyEvent e ) {
 
     /// public boolean java.lang.Object.equals(java.lang.Object)
 
-    public native boolean __equals( java.lang.Object arg0 );
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
 
     boolean entered_equals_2;
 
     public boolean equals( java.lang.Object arg0 ) {
         if ( !entered_equals_2 ) {
             entered_equals_2 = true;
-            boolean __return = __equals( arg0 );
+            boolean __return = __equals( __swiftObject, arg0);
             entered_equals_2 = false;
             return __return;
         }
@@ -63,38 +67,44 @@ public boolean equals( java.lang.Object arg0 ) {
             return super.equals( arg0 );
     }
 
-    /// public java.lang.String java.lang.Object.toString()
+    /// public native int java.lang.Object.hashCode()
 
-    public native java.lang.String __toString();
+    public native int __hashCode( long __swiftObject );
 
-    boolean entered_toString_3;
+    boolean entered_hashCode_3;
 
-    public java.lang.String toString() {
-        if ( !entered_toString_3 ) {
-            entered_toString_3 = true;
-            java.lang.String __return = __toString( );
-            entered_toString_3 = false;
+    public int hashCode() {
+        if ( !entered_hashCode_3 ) {
+            entered_hashCode_3 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_3 = false;
             return __return;
         }
         else
-            return super.toString( );
+            return super.hashCode( );
     }
 
-    /// public native int java.lang.Object.hashCode()
+    /// public java.lang.String java.lang.Object.toString()
 
-    public native int __hashCode();
+    public native java.lang.String __toString( long __swiftObject );
 
-    boolean entered_hashCode_4;
+    boolean entered_toString_4;
 
-    public int hashCode() {
-        if ( !entered_hashCode_4 ) {
-            entered_hashCode_4 = true;
-            int __return = __hashCode( );
-            entered_hashCode_4 = false;
+    public java.lang.String toString() {
+        if ( !entered_toString_4 ) {
+            entered_toString_4 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_4 = false;
             return __return;
         }
         else
-            return super.hashCode( );
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
     }
 
 }
diff --git a/src/org/swiftjava/java_awt/HierarchyBoundsListenerProxy.java b/src/org/swiftjava/java_awt/HierarchyBoundsListenerProxy.java
new file mode 100644
index 0000000..b9b9abc
--- /dev/null
+++ b/src/org/swiftjava/java_awt/HierarchyBoundsListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.HierarchyBoundsListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class HierarchyBoundsListenerProxy implements java.awt.event.HierarchyBoundsListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    HierarchyBoundsListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.HierarchyBoundsListener.ancestorMoved(java.awt.event.HierarchyEvent)
+
+    public native void __ancestorMoved( long __swiftObject, java.awt.event.HierarchyEvent e );
+
+    public void ancestorMoved( java.awt.event.HierarchyEvent e ) {
+        __ancestorMoved( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.HierarchyBoundsListener.ancestorResized(java.awt.event.HierarchyEvent)
+
+    public native void __ancestorResized( long __swiftObject, java.awt.event.HierarchyEvent e );
+
+    public void ancestorResized( java.awt.event.HierarchyEvent e ) {
+        __ancestorResized( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/HierarchyListenerProxy.java b/src/org/swiftjava/java_awt/HierarchyListenerProxy.java
new file mode 100644
index 0000000..445097b
--- /dev/null
+++ b/src/org/swiftjava/java_awt/HierarchyListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.HierarchyListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class HierarchyListenerProxy implements java.awt.event.HierarchyListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    HierarchyListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.HierarchyListener.hierarchyChanged(java.awt.event.HierarchyEvent)
+
+    public native void __hierarchyChanged( long __swiftObject, java.awt.event.HierarchyEvent e );
+
+    public void hierarchyChanged( java.awt.event.HierarchyEvent e ) {
+        __hierarchyChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/InputMethodListenerProxy.java b/src/org/swiftjava/java_awt/InputMethodListenerProxy.java
new file mode 100644
index 0000000..dbeb4ac
--- /dev/null
+++ b/src/org/swiftjava/java_awt/InputMethodListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.InputMethodListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class InputMethodListenerProxy implements java.awt.event.InputMethodListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    InputMethodListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.InputMethodListener.caretPositionChanged(java.awt.event.InputMethodEvent)
+
+    public native void __caretPositionChanged( long __swiftObject, java.awt.event.InputMethodEvent event );
+
+    public void caretPositionChanged( java.awt.event.InputMethodEvent event ) {
+        __caretPositionChanged( __swiftObject, event );
+    }
+
+    /// public abstract void java.awt.event.InputMethodListener.inputMethodTextChanged(java.awt.event.InputMethodEvent)
+
+    public native void __inputMethodTextChanged( long __swiftObject, java.awt.event.InputMethodEvent event );
+
+    public void inputMethodTextChanged( java.awt.event.InputMethodEvent event ) {
+        __inputMethodTextChanged( __swiftObject, event );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/ItemListenerProxy.java b/src/org/swiftjava/java_awt/ItemListenerProxy.java
new file mode 100644
index 0000000..2da4b46
--- /dev/null
+++ b/src/org/swiftjava/java_awt/ItemListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.ItemListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class ItemListenerProxy implements java.awt.event.ItemListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    ItemListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.ItemListener.itemStateChanged(java.awt.event.ItemEvent)
+
+    public native void __itemStateChanged( long __swiftObject, java.awt.event.ItemEvent e );
+
+    public void itemStateChanged( java.awt.event.ItemEvent e ) {
+        __itemStateChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/KeyAdapterProxy.java b/src/org/swiftjava/java_awt/KeyAdapterProxy.java
new file mode 100644
index 0000000..9f9a106
--- /dev/null
+++ b/src/org/swiftjava/java_awt/KeyAdapterProxy.java
@@ -0,0 +1,126 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class java.awt.event.KeyAdapter ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class KeyAdapterProxy extends java.awt.event.KeyAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public java.awt.event.KeyAdapter()
+
+    KeyAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_0;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_0 ) {
+            entered_equals_0 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_0 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_1;
+
+    public int hashCode() {
+        if ( !entered_hashCode_1 ) {
+            entered_hashCode_1 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_1 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public void java.awt.event.KeyAdapter.keyPressed(java.awt.event.KeyEvent)
+
+    public native void __keyPressed( long __swiftObject, java.awt.event.KeyEvent e );
+
+    boolean entered_keyPressed_2;
+
+    public void keyPressed( java.awt.event.KeyEvent e ) {
+        if ( !entered_keyPressed_2 ) {
+            entered_keyPressed_2 = true;
+            __keyPressed( __swiftObject, e);
+            entered_keyPressed_2 = false;
+        }
+        else
+            super.keyPressed( e );
+    }
+
+    /// public void java.awt.event.KeyAdapter.keyReleased(java.awt.event.KeyEvent)
+
+    public native void __keyReleased( long __swiftObject, java.awt.event.KeyEvent e );
+
+    boolean entered_keyReleased_3;
+
+    public void keyReleased( java.awt.event.KeyEvent e ) {
+        if ( !entered_keyReleased_3 ) {
+            entered_keyReleased_3 = true;
+            __keyReleased( __swiftObject, e);
+            entered_keyReleased_3 = false;
+        }
+        else
+            super.keyReleased( e );
+    }
+
+    /// public void java.awt.event.KeyAdapter.keyTyped(java.awt.event.KeyEvent)
+
+    public native void __keyTyped( long __swiftObject, java.awt.event.KeyEvent e );
+
+    boolean entered_keyTyped_4;
+
+    public void keyTyped( java.awt.event.KeyEvent e ) {
+        if ( !entered_keyTyped_4 ) {
+            entered_keyTyped_4 = true;
+            __keyTyped( __swiftObject, e);
+            entered_keyTyped_4 = false;
+        }
+        else
+            super.keyTyped( e );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_5;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_5 ) {
+            entered_toString_5 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_5 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/KeyListenerProxy.java b/src/org/swiftjava/java_awt/KeyListenerProxy.java
new file mode 100644
index 0000000..bf9617f
--- /dev/null
+++ b/src/org/swiftjava/java_awt/KeyListenerProxy.java
@@ -0,0 +1,48 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.KeyListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class KeyListenerProxy implements java.awt.event.KeyListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    KeyListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.KeyListener.keyPressed(java.awt.event.KeyEvent)
+
+    public native void __keyPressed( long __swiftObject, java.awt.event.KeyEvent e );
+
+    public void keyPressed( java.awt.event.KeyEvent e ) {
+        __keyPressed( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.KeyListener.keyReleased(java.awt.event.KeyEvent)
+
+    public native void __keyReleased( long __swiftObject, java.awt.event.KeyEvent e );
+
+    public void keyReleased( java.awt.event.KeyEvent e ) {
+        __keyReleased( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.KeyListener.keyTyped(java.awt.event.KeyEvent)
+
+    public native void __keyTyped( long __swiftObject, java.awt.event.KeyEvent e );
+
+    public void keyTyped( java.awt.event.KeyEvent e ) {
+        __keyTyped( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/LayoutManagerProxy.java b/src/org/swiftjava/java_awt/LayoutManagerProxy.java
new file mode 100644
index 0000000..4421a17
--- /dev/null
+++ b/src/org/swiftjava/java_awt/LayoutManagerProxy.java
@@ -0,0 +1,64 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.LayoutManager ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class LayoutManagerProxy implements java.awt.LayoutManager {
+
+    // address of proxy object
+    long __swiftObject;
+
+    LayoutManagerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.LayoutManager.addLayoutComponent(java.lang.String,java.awt.Component)
+
+    public native void __addLayoutComponent( long __swiftObject, java.lang.String name, java.awt.Component comp );
+
+    public void addLayoutComponent( java.lang.String name, java.awt.Component comp ) {
+        __addLayoutComponent( __swiftObject, name, comp );
+    }
+
+    /// public abstract void java.awt.LayoutManager.layoutContainer(java.awt.Container)
+
+    public native void __layoutContainer( long __swiftObject, java.awt.Container parent );
+
+    public void layoutContainer( java.awt.Container parent ) {
+        __layoutContainer( __swiftObject, parent );
+    }
+
+    /// public abstract java.awt.Dimension java.awt.LayoutManager.minimumLayoutSize(java.awt.Container)
+
+    public native java.awt.Dimension __minimumLayoutSize( long __swiftObject, java.awt.Container parent );
+
+    public java.awt.Dimension minimumLayoutSize( java.awt.Container parent ) {
+        return __minimumLayoutSize( __swiftObject, parent );
+    }
+
+    /// public abstract java.awt.Dimension java.awt.LayoutManager.preferredLayoutSize(java.awt.Container)
+
+    public native java.awt.Dimension __preferredLayoutSize( long __swiftObject, java.awt.Container parent );
+
+    public java.awt.Dimension preferredLayoutSize( java.awt.Container parent ) {
+        return __preferredLayoutSize( __swiftObject, parent );
+    }
+
+    /// public abstract void java.awt.LayoutManager.removeLayoutComponent(java.awt.Component)
+
+    public native void __removeLayoutComponent( long __swiftObject, java.awt.Component comp );
+
+    public void removeLayoutComponent( java.awt.Component comp ) {
+        __removeLayoutComponent( __swiftObject, comp );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/MouseAdapterProxy.java b/src/org/swiftjava/java_awt/MouseAdapterProxy.java
new file mode 100644
index 0000000..5b00c11
--- /dev/null
+++ b/src/org/swiftjava/java_awt/MouseAdapterProxy.java
@@ -0,0 +1,206 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class java.awt.event.MouseAdapter ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class MouseAdapterProxy extends java.awt.event.MouseAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public java.awt.event.MouseAdapter()
+
+    MouseAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_0;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_0 ) {
+            entered_equals_0 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_0 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_1;
+
+    public int hashCode() {
+        if ( !entered_hashCode_1 ) {
+            entered_hashCode_1 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_1 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseClicked(java.awt.event.MouseEvent)
+
+    public native void __mouseClicked( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseClicked_2;
+
+    public void mouseClicked( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseClicked_2 ) {
+            entered_mouseClicked_2 = true;
+            __mouseClicked( __swiftObject, e);
+            entered_mouseClicked_2 = false;
+        }
+        else
+            super.mouseClicked( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseDragged(java.awt.event.MouseEvent)
+
+    public native void __mouseDragged( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseDragged_3;
+
+    public void mouseDragged( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseDragged_3 ) {
+            entered_mouseDragged_3 = true;
+            __mouseDragged( __swiftObject, e);
+            entered_mouseDragged_3 = false;
+        }
+        else
+            super.mouseDragged( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseEntered(java.awt.event.MouseEvent)
+
+    public native void __mouseEntered( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseEntered_4;
+
+    public void mouseEntered( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseEntered_4 ) {
+            entered_mouseEntered_4 = true;
+            __mouseEntered( __swiftObject, e);
+            entered_mouseEntered_4 = false;
+        }
+        else
+            super.mouseEntered( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseExited(java.awt.event.MouseEvent)
+
+    public native void __mouseExited( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseExited_5;
+
+    public void mouseExited( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseExited_5 ) {
+            entered_mouseExited_5 = true;
+            __mouseExited( __swiftObject, e);
+            entered_mouseExited_5 = false;
+        }
+        else
+            super.mouseExited( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseMoved(java.awt.event.MouseEvent)
+
+    public native void __mouseMoved( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseMoved_6;
+
+    public void mouseMoved( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseMoved_6 ) {
+            entered_mouseMoved_6 = true;
+            __mouseMoved( __swiftObject, e);
+            entered_mouseMoved_6 = false;
+        }
+        else
+            super.mouseMoved( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mousePressed(java.awt.event.MouseEvent)
+
+    public native void __mousePressed( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mousePressed_7;
+
+    public void mousePressed( java.awt.event.MouseEvent e ) {
+        if ( !entered_mousePressed_7 ) {
+            entered_mousePressed_7 = true;
+            __mousePressed( __swiftObject, e);
+            entered_mousePressed_7 = false;
+        }
+        else
+            super.mousePressed( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseReleased(java.awt.event.MouseEvent)
+
+    public native void __mouseReleased( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseReleased_8;
+
+    public void mouseReleased( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseReleased_8 ) {
+            entered_mouseReleased_8 = true;
+            __mouseReleased( __swiftObject, e);
+            entered_mouseReleased_8 = false;
+        }
+        else
+            super.mouseReleased( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseWheelMoved(java.awt.event.MouseWheelEvent)
+
+    public native void __mouseWheelMoved( long __swiftObject, java.awt.event.MouseWheelEvent e );
+
+    boolean entered_mouseWheelMoved_9;
+
+    public void mouseWheelMoved( java.awt.event.MouseWheelEvent e ) {
+        if ( !entered_mouseWheelMoved_9 ) {
+            entered_mouseWheelMoved_9 = true;
+            __mouseWheelMoved( __swiftObject, e);
+            entered_mouseWheelMoved_9 = false;
+        }
+        else
+            super.mouseWheelMoved( e );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_10;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_10 ) {
+            entered_toString_10 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_10 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/MouseListenerProxy.java b/src/org/swiftjava/java_awt/MouseListenerProxy.java
new file mode 100644
index 0000000..8dd2a4e
--- /dev/null
+++ b/src/org/swiftjava/java_awt/MouseListenerProxy.java
@@ -0,0 +1,64 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.MouseListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class MouseListenerProxy implements java.awt.event.MouseListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    MouseListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.MouseListener.mouseClicked(java.awt.event.MouseEvent)
+
+    public native void __mouseClicked( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseClicked( java.awt.event.MouseEvent e ) {
+        __mouseClicked( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.MouseListener.mouseEntered(java.awt.event.MouseEvent)
+
+    public native void __mouseEntered( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseEntered( java.awt.event.MouseEvent e ) {
+        __mouseEntered( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.MouseListener.mouseExited(java.awt.event.MouseEvent)
+
+    public native void __mouseExited( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseExited( java.awt.event.MouseEvent e ) {
+        __mouseExited( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.MouseListener.mousePressed(java.awt.event.MouseEvent)
+
+    public native void __mousePressed( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mousePressed( java.awt.event.MouseEvent e ) {
+        __mousePressed( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.MouseListener.mouseReleased(java.awt.event.MouseEvent)
+
+    public native void __mouseReleased( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseReleased( java.awt.event.MouseEvent e ) {
+        __mouseReleased( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/MouseMotionAdapterProxy.java b/src/org/swiftjava/java_awt/MouseMotionAdapterProxy.java
new file mode 100644
index 0000000..5974a3e
--- /dev/null
+++ b/src/org/swiftjava/java_awt/MouseMotionAdapterProxy.java
@@ -0,0 +1,110 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class java.awt.event.MouseMotionAdapter ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class MouseMotionAdapterProxy extends java.awt.event.MouseMotionAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public java.awt.event.MouseMotionAdapter()
+
+    MouseMotionAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_0;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_0 ) {
+            entered_equals_0 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_0 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_1;
+
+    public int hashCode() {
+        if ( !entered_hashCode_1 ) {
+            entered_hashCode_1 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_1 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public void java.awt.event.MouseMotionAdapter.mouseDragged(java.awt.event.MouseEvent)
+
+    public native void __mouseDragged( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseDragged_2;
+
+    public void mouseDragged( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseDragged_2 ) {
+            entered_mouseDragged_2 = true;
+            __mouseDragged( __swiftObject, e);
+            entered_mouseDragged_2 = false;
+        }
+        else
+            super.mouseDragged( e );
+    }
+
+    /// public void java.awt.event.MouseMotionAdapter.mouseMoved(java.awt.event.MouseEvent)
+
+    public native void __mouseMoved( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseMoved_3;
+
+    public void mouseMoved( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseMoved_3 ) {
+            entered_mouseMoved_3 = true;
+            __mouseMoved( __swiftObject, e);
+            entered_mouseMoved_3 = false;
+        }
+        else
+            super.mouseMoved( e );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_4;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_4 ) {
+            entered_toString_4 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_4 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/MouseMotionListenerProxy.java b/src/org/swiftjava/java_awt/MouseMotionListenerProxy.java
new file mode 100644
index 0000000..0939e54
--- /dev/null
+++ b/src/org/swiftjava/java_awt/MouseMotionListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.MouseMotionListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class MouseMotionListenerProxy implements java.awt.event.MouseMotionListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    MouseMotionListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.MouseMotionListener.mouseDragged(java.awt.event.MouseEvent)
+
+    public native void __mouseDragged( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseDragged( java.awt.event.MouseEvent e ) {
+        __mouseDragged( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.MouseMotionListener.mouseMoved(java.awt.event.MouseEvent)
+
+    public native void __mouseMoved( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseMoved( java.awt.event.MouseEvent e ) {
+        __mouseMoved( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/MouseWheelListenerProxy.java b/src/org/swiftjava/java_awt/MouseWheelListenerProxy.java
new file mode 100644
index 0000000..3fa35f3
--- /dev/null
+++ b/src/org/swiftjava/java_awt/MouseWheelListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.MouseWheelListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class MouseWheelListenerProxy implements java.awt.event.MouseWheelListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    MouseWheelListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.MouseWheelListener.mouseWheelMoved(java.awt.event.MouseWheelEvent)
+
+    public native void __mouseWheelMoved( long __swiftObject, java.awt.event.MouseWheelEvent e );
+
+    public void mouseWheelMoved( java.awt.event.MouseWheelEvent e ) {
+        __mouseWheelMoved( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/TextListenerProxy.java b/src/org/swiftjava/java_awt/TextListenerProxy.java
new file mode 100644
index 0000000..e37256c
--- /dev/null
+++ b/src/org/swiftjava/java_awt/TextListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.TextListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class TextListenerProxy implements java.awt.event.TextListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    TextListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.TextListener.textValueChanged(java.awt.event.TextEvent)
+
+    public native void __textValueChanged( long __swiftObject, java.awt.event.TextEvent e );
+
+    public void textValueChanged( java.awt.event.TextEvent e ) {
+        __textValueChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/WindowAdapterProxy.java b/src/org/swiftjava/java_awt/WindowAdapterProxy.java
new file mode 100644
index 0000000..4743bba
--- /dev/null
+++ b/src/org/swiftjava/java_awt/WindowAdapterProxy.java
@@ -0,0 +1,238 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class java.awt.event.WindowAdapter ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class WindowAdapterProxy extends java.awt.event.WindowAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public java.awt.event.WindowAdapter()
+
+    WindowAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_0;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_0 ) {
+            entered_equals_0 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_0 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_1;
+
+    public int hashCode() {
+        if ( !entered_hashCode_1 ) {
+            entered_hashCode_1 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_1 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_2;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_2 ) {
+            entered_toString_2 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_2 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    /// public void java.awt.event.WindowAdapter.windowActivated(java.awt.event.WindowEvent)
+
+    public native void __windowActivated( long __swiftObject, java.awt.event.WindowEvent e );
+
+    boolean entered_windowActivated_3;
+
+    public void windowActivated( java.awt.event.WindowEvent e ) {
+        if ( !entered_windowActivated_3 ) {
+            entered_windowActivated_3 = true;
+            __windowActivated( __swiftObject, e);
+            entered_windowActivated_3 = false;
+        }
+        else
+            super.windowActivated( e );
+    }
+
+    /// public void java.awt.event.WindowAdapter.windowClosed(java.awt.event.WindowEvent)
+
+    public native void __windowClosed( long __swiftObject, java.awt.event.WindowEvent e );
+
+    boolean entered_windowClosed_4;
+
+    public void windowClosed( java.awt.event.WindowEvent e ) {
+        if ( !entered_windowClosed_4 ) {
+            entered_windowClosed_4 = true;
+            __windowClosed( __swiftObject, e);
+            entered_windowClosed_4 = false;
+        }
+        else
+            super.windowClosed( e );
+    }
+
+    /// public void java.awt.event.WindowAdapter.windowClosing(java.awt.event.WindowEvent)
+
+    public native void __windowClosing( long __swiftObject, java.awt.event.WindowEvent e );
+
+    boolean entered_windowClosing_5;
+
+    public void windowClosing( java.awt.event.WindowEvent e ) {
+        if ( !entered_windowClosing_5 ) {
+            entered_windowClosing_5 = true;
+            __windowClosing( __swiftObject, e);
+            entered_windowClosing_5 = false;
+        }
+        else
+            super.windowClosing( e );
+    }
+
+    /// public void java.awt.event.WindowAdapter.windowDeactivated(java.awt.event.WindowEvent)
+
+    public native void __windowDeactivated( long __swiftObject, java.awt.event.WindowEvent e );
+
+    boolean entered_windowDeactivated_6;
+
+    public void windowDeactivated( java.awt.event.WindowEvent e ) {
+        if ( !entered_windowDeactivated_6 ) {
+            entered_windowDeactivated_6 = true;
+            __windowDeactivated( __swiftObject, e);
+            entered_windowDeactivated_6 = false;
+        }
+        else
+            super.windowDeactivated( e );
+    }
+
+    /// public void java.awt.event.WindowAdapter.windowDeiconified(java.awt.event.WindowEvent)
+
+    public native void __windowDeiconified( long __swiftObject, java.awt.event.WindowEvent e );
+
+    boolean entered_windowDeiconified_7;
+
+    public void windowDeiconified( java.awt.event.WindowEvent e ) {
+        if ( !entered_windowDeiconified_7 ) {
+            entered_windowDeiconified_7 = true;
+            __windowDeiconified( __swiftObject, e);
+            entered_windowDeiconified_7 = false;
+        }
+        else
+            super.windowDeiconified( e );
+    }
+
+    /// public void java.awt.event.WindowAdapter.windowGainedFocus(java.awt.event.WindowEvent)
+
+    public native void __windowGainedFocus( long __swiftObject, java.awt.event.WindowEvent e );
+
+    boolean entered_windowGainedFocus_8;
+
+    public void windowGainedFocus( java.awt.event.WindowEvent e ) {
+        if ( !entered_windowGainedFocus_8 ) {
+            entered_windowGainedFocus_8 = true;
+            __windowGainedFocus( __swiftObject, e);
+            entered_windowGainedFocus_8 = false;
+        }
+        else
+            super.windowGainedFocus( e );
+    }
+
+    /// public void java.awt.event.WindowAdapter.windowIconified(java.awt.event.WindowEvent)
+
+    public native void __windowIconified( long __swiftObject, java.awt.event.WindowEvent e );
+
+    boolean entered_windowIconified_9;
+
+    public void windowIconified( java.awt.event.WindowEvent e ) {
+        if ( !entered_windowIconified_9 ) {
+            entered_windowIconified_9 = true;
+            __windowIconified( __swiftObject, e);
+            entered_windowIconified_9 = false;
+        }
+        else
+            super.windowIconified( e );
+    }
+
+    /// public void java.awt.event.WindowAdapter.windowLostFocus(java.awt.event.WindowEvent)
+
+    public native void __windowLostFocus( long __swiftObject, java.awt.event.WindowEvent e );
+
+    boolean entered_windowLostFocus_10;
+
+    public void windowLostFocus( java.awt.event.WindowEvent e ) {
+        if ( !entered_windowLostFocus_10 ) {
+            entered_windowLostFocus_10 = true;
+            __windowLostFocus( __swiftObject, e);
+            entered_windowLostFocus_10 = false;
+        }
+        else
+            super.windowLostFocus( e );
+    }
+
+    /// public void java.awt.event.WindowAdapter.windowOpened(java.awt.event.WindowEvent)
+
+    public native void __windowOpened( long __swiftObject, java.awt.event.WindowEvent e );
+
+    boolean entered_windowOpened_11;
+
+    public void windowOpened( java.awt.event.WindowEvent e ) {
+        if ( !entered_windowOpened_11 ) {
+            entered_windowOpened_11 = true;
+            __windowOpened( __swiftObject, e);
+            entered_windowOpened_11 = false;
+        }
+        else
+            super.windowOpened( e );
+    }
+
+    /// public void java.awt.event.WindowAdapter.windowStateChanged(java.awt.event.WindowEvent)
+
+    public native void __windowStateChanged( long __swiftObject, java.awt.event.WindowEvent e );
+
+    boolean entered_windowStateChanged_12;
+
+    public void windowStateChanged( java.awt.event.WindowEvent e ) {
+        if ( !entered_windowStateChanged_12 ) {
+            entered_windowStateChanged_12 = true;
+            __windowStateChanged( __swiftObject, e);
+            entered_windowStateChanged_12 = false;
+        }
+        else
+            super.windowStateChanged( e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/WindowFocusListenerProxy.java b/src/org/swiftjava/java_awt/WindowFocusListenerProxy.java
new file mode 100644
index 0000000..eb35f3e
--- /dev/null
+++ b/src/org/swiftjava/java_awt/WindowFocusListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.WindowFocusListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class WindowFocusListenerProxy implements java.awt.event.WindowFocusListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    WindowFocusListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.WindowFocusListener.windowGainedFocus(java.awt.event.WindowEvent)
+
+    public native void __windowGainedFocus( long __swiftObject, java.awt.event.WindowEvent e );
+
+    public void windowGainedFocus( java.awt.event.WindowEvent e ) {
+        __windowGainedFocus( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.WindowFocusListener.windowLostFocus(java.awt.event.WindowEvent)
+
+    public native void __windowLostFocus( long __swiftObject, java.awt.event.WindowEvent e );
+
+    public void windowLostFocus( java.awt.event.WindowEvent e ) {
+        __windowLostFocus( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_awt/WindowListenerProxy.java b/src/org/swiftjava/java_awt/WindowListenerProxy.java
new file mode 100644
index 0000000..0513f60
--- /dev/null
+++ b/src/org/swiftjava/java_awt/WindowListenerProxy.java
@@ -0,0 +1,80 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.WindowListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class WindowListenerProxy implements java.awt.event.WindowListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    WindowListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.WindowListener.windowActivated(java.awt.event.WindowEvent)
+
+    public native void __windowActivated( long __swiftObject, java.awt.event.WindowEvent e );
+
+    public void windowActivated( java.awt.event.WindowEvent e ) {
+        __windowActivated( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.WindowListener.windowClosed(java.awt.event.WindowEvent)
+
+    public native void __windowClosed( long __swiftObject, java.awt.event.WindowEvent e );
+
+    public void windowClosed( java.awt.event.WindowEvent e ) {
+        __windowClosed( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.WindowListener.windowClosing(java.awt.event.WindowEvent)
+
+    public native void __windowClosing( long __swiftObject, java.awt.event.WindowEvent e );
+
+    public void windowClosing( java.awt.event.WindowEvent e ) {
+        __windowClosing( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.WindowListener.windowDeactivated(java.awt.event.WindowEvent)
+
+    public native void __windowDeactivated( long __swiftObject, java.awt.event.WindowEvent e );
+
+    public void windowDeactivated( java.awt.event.WindowEvent e ) {
+        __windowDeactivated( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.WindowListener.windowDeiconified(java.awt.event.WindowEvent)
+
+    public native void __windowDeiconified( long __swiftObject, java.awt.event.WindowEvent e );
+
+    public void windowDeiconified( java.awt.event.WindowEvent e ) {
+        __windowDeiconified( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.WindowListener.windowIconified(java.awt.event.WindowEvent)
+
+    public native void __windowIconified( long __swiftObject, java.awt.event.WindowEvent e );
+
+    public void windowIconified( java.awt.event.WindowEvent e ) {
+        __windowIconified( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.WindowListener.windowOpened(java.awt.event.WindowEvent)
+
+    public native void __windowOpened( long __swiftObject, java.awt.event.WindowEvent e );
+
+    public void windowOpened( java.awt.event.WindowEvent e ) {
+        __windowOpened( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/java_awt/WindowProxy.java b/src/org/swiftjava/java_awt/WindowProxy.java
similarity index 52%
rename from src/org/genie/java_awt/WindowProxy.java
rename to src/org/swiftjava/java_awt/WindowProxy.java
index 94f7216..af919e2 100644
--- a/src/org/genie/java_awt/WindowProxy.java
+++ b/src/org/swiftjava/java_awt/WindowProxy.java
@@ -1,31 +1,35 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class java.awt.Window ///
 
-package org.genie.java_awt;
+package org.swiftjava.java_awt;
 
+@SuppressWarnings("JniMissingFunction")
 public class WindowProxy extends java.awt.Window {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public java.awt.Window(java.awt.Frame)
 
-    WindowProxy( java.awt.Frame arg0 , long swiftObject ) {
+    WindowProxy( java.awt.Frame arg0 , long __swiftObject ) {
         super( arg0 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Window(java.awt.Window)
 
-    WindowProxy( java.awt.Window arg0 , long swiftObject ) {
+    WindowProxy( java.awt.Window arg0 , long __swiftObject ) {
         super( arg0 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Window(java.awt.Window,java.awt.GraphicsConfiguration)
 
-    WindowProxy( java.awt.Window arg0, java.awt.GraphicsConfiguration arg1 , long swiftObject ) {
+    WindowProxy( java.awt.Window arg0, java.awt.GraphicsConfiguration arg1 , long __swiftObject ) {
         super( arg0, arg1 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// java.awt.Window(java.awt.GraphicsConfiguration)
@@ -34,18 +38,24 @@ public class WindowProxy extends java.awt.Window {
 
     /// public void java.awt.Window.paint(java.awt.Graphics)
 
-    public native void __paint( java.awt.Graphics arg0 );
+    public native void __paint( long __swiftObject, java.awt.Graphics arg0 );
 
     boolean entered_paint_0;
 
     public void paint( java.awt.Graphics arg0 ) {
         if ( !entered_paint_0 ) {
             entered_paint_0 = true;
-            __paint( arg0 );
+            __paint( __swiftObject, arg0);
             entered_paint_0 = false;
         }
         else
             super.paint( arg0 );
     }
 
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
 }
diff --git a/src/org/swiftjava/java_awt/WindowStateListenerProxy.java b/src/org/swiftjava/java_awt/WindowStateListenerProxy.java
new file mode 100644
index 0000000..f459b16
--- /dev/null
+++ b/src/org/swiftjava/java_awt/WindowStateListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.awt.event.WindowStateListener ///
+
+package org.swiftjava.java_awt;
+
+@SuppressWarnings("JniMissingFunction")
+public class WindowStateListenerProxy implements java.awt.event.WindowStateListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    WindowStateListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.WindowStateListener.windowStateChanged(java.awt.event.WindowEvent)
+
+    public native void __windowStateChanged( long __swiftObject, java.awt.event.WindowEvent e );
+
+    public void windowStateChanged( java.awt.event.WindowEvent e ) {
+        __windowStateChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_lang/InvocationHandlerProxy.java b/src/org/swiftjava/java_lang/InvocationHandlerProxy.java
new file mode 100644
index 0000000..3b46dd1
--- /dev/null
+++ b/src/org/swiftjava/java_lang/InvocationHandlerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.lang.reflect.InvocationHandler ///
+
+package org.swiftjava.java_lang;
+
+@SuppressWarnings("JniMissingFunction")
+public class InvocationHandlerProxy implements java.lang.reflect.InvocationHandler {
+
+    // address of proxy object
+    long __swiftObject;
+
+    InvocationHandlerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract java.lang.Object java.lang.reflect.InvocationHandler.invoke(java.lang.Object,java.lang.reflect.Method,java.lang.Object[]) throws java.lang.Throwable
+
+    public native java.lang.Object __invoke( long __swiftObject, java.lang.Object proxy, java.lang.reflect.Method method, java.lang.Object[] args );
+
+    public java.lang.Object invoke( java.lang.Object proxy, java.lang.reflect.Method method, java.lang.Object[] args ) throws java.lang.Throwable {
+        return __invoke( __swiftObject, proxy, method, args );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_lang/RunnableProxy.java b/src/org/swiftjava/java_lang/RunnableProxy.java
new file mode 100644
index 0000000..6f007ec
--- /dev/null
+++ b/src/org/swiftjava/java_lang/RunnableProxy.java
@@ -0,0 +1,29 @@
+
+/// interface java.lang.Runnable ///
+
+package org.swiftjava.java_lang;
+
+@SuppressWarnings("JniMissingFunction")
+public class RunnableProxy implements java.lang.Runnable {
+
+    long __swiftObject;
+
+    RunnableProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.lang.Runnable.run()
+
+    public native void __run( long __swiftObject );
+
+    public void run() {
+        __run( __swiftObject  );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_lang/Thread_UncaughtExceptionHandlerProxy.java b/src/org/swiftjava/java_lang/Thread_UncaughtExceptionHandlerProxy.java
new file mode 100644
index 0000000..475b076
--- /dev/null
+++ b/src/org/swiftjava/java_lang/Thread_UncaughtExceptionHandlerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.lang.Thread$UncaughtExceptionHandler ///
+
+package org.swiftjava.java_lang;
+
+@SuppressWarnings("JniMissingFunction")
+public class Thread_UncaughtExceptionHandlerProxy implements java.lang.Thread.UncaughtExceptionHandler {
+
+    // address of proxy object
+    long __swiftObject;
+
+    Thread_UncaughtExceptionHandlerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.lang.Thread$UncaughtExceptionHandler.uncaughtException(java.lang.Thread,java.lang.Throwable)
+
+    public native void __uncaughtException( long __swiftObject, java.lang.Thread arg0, java.lang.Throwable arg1 );
+
+    public void uncaughtException( java.lang.Thread arg0, java.lang.Throwable arg1 ) {
+        __uncaughtException( __swiftObject, arg0, arg1 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_swift/RunnableProxy.java b/src/org/swiftjava/java_swift/RunnableProxy.java
new file mode 100644
index 0000000..0796f19
--- /dev/null
+++ b/src/org/swiftjava/java_swift/RunnableProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.lang.Runnable ///
+
+package org.swiftjava.java_swift;
+
+@SuppressWarnings("JniMissingFunction")
+public class RunnableProxy implements java.lang.Runnable {
+
+    // address of proxy object
+    long __swiftObject;
+
+    RunnableProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.lang.Runnable.run()
+
+    public native void __run( long __swiftObject );
+
+    public void run() {
+        __run( __swiftObject  );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_util/EventListenerProxy.java b/src/org/swiftjava/java_util/EventListenerProxy.java
new file mode 100644
index 0000000..f3668c6
--- /dev/null
+++ b/src/org/swiftjava/java_util/EventListenerProxy.java
@@ -0,0 +1,24 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.util.EventListener ///
+
+package org.swiftjava.java_util;
+
+@SuppressWarnings("JniMissingFunction")
+public class EventListenerProxy implements java.util.EventListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    EventListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_util/NodeChangeListenerProxy.java b/src/org/swiftjava/java_util/NodeChangeListenerProxy.java
new file mode 100644
index 0000000..79112b4
--- /dev/null
+++ b/src/org/swiftjava/java_util/NodeChangeListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.util.prefs.NodeChangeListener ///
+
+package org.swiftjava.java_util;
+
+@SuppressWarnings("JniMissingFunction")
+public class NodeChangeListenerProxy implements java.util.prefs.NodeChangeListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    NodeChangeListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.util.prefs.NodeChangeListener.childAdded(java.util.prefs.NodeChangeEvent)
+
+    public native void __childAdded( long __swiftObject, java.util.prefs.NodeChangeEvent evt );
+
+    public void childAdded( java.util.prefs.NodeChangeEvent evt ) {
+        __childAdded( __swiftObject, evt );
+    }
+
+    /// public abstract void java.util.prefs.NodeChangeListener.childRemoved(java.util.prefs.NodeChangeEvent)
+
+    public native void __childRemoved( long __swiftObject, java.util.prefs.NodeChangeEvent evt );
+
+    public void childRemoved( java.util.prefs.NodeChangeEvent evt ) {
+        __childRemoved( __swiftObject, evt );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_util/PreferenceChangeListenerProxy.java b/src/org/swiftjava/java_util/PreferenceChangeListenerProxy.java
new file mode 100644
index 0000000..42f1245
--- /dev/null
+++ b/src/org/swiftjava/java_util/PreferenceChangeListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.util.prefs.PreferenceChangeListener ///
+
+package org.swiftjava.java_util;
+
+@SuppressWarnings("JniMissingFunction")
+public class PreferenceChangeListenerProxy implements java.util.prefs.PreferenceChangeListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    PreferenceChangeListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.util.prefs.PreferenceChangeListener.preferenceChange(java.util.prefs.PreferenceChangeEvent)
+
+    public native void __preferenceChange( long __swiftObject, java.util.prefs.PreferenceChangeEvent evt );
+
+    public void preferenceChange( java.util.prefs.PreferenceChangeEvent evt ) {
+        __preferenceChange( __swiftObject, evt );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/java_util/RejectedExecutionHandlerProxy.java b/src/org/swiftjava/java_util/RejectedExecutionHandlerProxy.java
new file mode 100644
index 0000000..74294f1
--- /dev/null
+++ b/src/org/swiftjava/java_util/RejectedExecutionHandlerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface java.util.concurrent.RejectedExecutionHandler ///
+
+package org.swiftjava.java_util;
+
+@SuppressWarnings("JniMissingFunction")
+public class RejectedExecutionHandlerProxy implements java.util.concurrent.RejectedExecutionHandler {
+
+    // address of proxy object
+    long __swiftObject;
+
+    RejectedExecutionHandlerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.util.concurrent.RejectedExecutionHandler.rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)
+
+    public native void __rejectedExecution( long __swiftObject, java.lang.Runnable r, java.util.concurrent.ThreadPoolExecutor executor );
+
+    public void rejectedExecution( java.lang.Runnable r, java.util.concurrent.ThreadPoolExecutor executor ) {
+        __rejectedExecution( __swiftObject, r, executor );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/AncestorListenerProxy.java b/src/org/swiftjava/javax_swing/AncestorListenerProxy.java
new file mode 100644
index 0000000..950ce5e
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/AncestorListenerProxy.java
@@ -0,0 +1,48 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.AncestorListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class AncestorListenerProxy implements javax.swing.event.AncestorListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    AncestorListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.AncestorListener.ancestorAdded(javax.swing.event.AncestorEvent)
+
+    public native void __ancestorAdded( long __swiftObject, javax.swing.event.AncestorEvent event );
+
+    public void ancestorAdded( javax.swing.event.AncestorEvent event ) {
+        __ancestorAdded( __swiftObject, event );
+    }
+
+    /// public abstract void javax.swing.event.AncestorListener.ancestorMoved(javax.swing.event.AncestorEvent)
+
+    public native void __ancestorMoved( long __swiftObject, javax.swing.event.AncestorEvent event );
+
+    public void ancestorMoved( javax.swing.event.AncestorEvent event ) {
+        __ancestorMoved( __swiftObject, event );
+    }
+
+    /// public abstract void javax.swing.event.AncestorListener.ancestorRemoved(javax.swing.event.AncestorEvent)
+
+    public native void __ancestorRemoved( long __swiftObject, javax.swing.event.AncestorEvent event );
+
+    public void ancestorRemoved( javax.swing.event.AncestorEvent event ) {
+        __ancestorRemoved( __swiftObject, event );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/CaretListenerProxy.java b/src/org/swiftjava/javax_swing/CaretListenerProxy.java
new file mode 100644
index 0000000..9730fea
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/CaretListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.CaretListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class CaretListenerProxy implements javax.swing.event.CaretListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    CaretListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.CaretListener.caretUpdate(javax.swing.event.CaretEvent)
+
+    public native void __caretUpdate( long __swiftObject, javax.swing.event.CaretEvent e );
+
+    public void caretUpdate( javax.swing.event.CaretEvent e ) {
+        __caretUpdate( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/CellEditorListenerProxy.java b/src/org/swiftjava/javax_swing/CellEditorListenerProxy.java
new file mode 100644
index 0000000..4785537
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/CellEditorListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.CellEditorListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class CellEditorListenerProxy implements javax.swing.event.CellEditorListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    CellEditorListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.CellEditorListener.editingCanceled(javax.swing.event.ChangeEvent)
+
+    public native void __editingCanceled( long __swiftObject, javax.swing.event.ChangeEvent e );
+
+    public void editingCanceled( javax.swing.event.ChangeEvent e ) {
+        __editingCanceled( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.CellEditorListener.editingStopped(javax.swing.event.ChangeEvent)
+
+    public native void __editingStopped( long __swiftObject, javax.swing.event.ChangeEvent e );
+
+    public void editingStopped( javax.swing.event.ChangeEvent e ) {
+        __editingStopped( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/ChangeListenerProxy.java b/src/org/swiftjava/javax_swing/ChangeListenerProxy.java
new file mode 100644
index 0000000..726bbdd
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/ChangeListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.ChangeListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class ChangeListenerProxy implements javax.swing.event.ChangeListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    ChangeListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.ChangeListener.stateChanged(javax.swing.event.ChangeEvent)
+
+    public native void __stateChanged( long __swiftObject, javax.swing.event.ChangeEvent e );
+
+    public void stateChanged( javax.swing.event.ChangeEvent e ) {
+        __stateChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/javax_swing/DefaultTableCellRendererProxy.java b/src/org/swiftjava/javax_swing/DefaultTableCellRendererProxy.java
similarity index 62%
rename from src/org/genie/javax_swing/DefaultTableCellRendererProxy.java
rename to src/org/swiftjava/javax_swing/DefaultTableCellRendererProxy.java
index 5ae7d74..57c583e 100644
--- a/src/org/genie/javax_swing/DefaultTableCellRendererProxy.java
+++ b/src/org/swiftjava/javax_swing/DefaultTableCellRendererProxy.java
@@ -1,29 +1,33 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class javax.swing.table.DefaultTableCellRenderer ///
 
-package org.genie.javax_swing;
+package org.swiftjava.javax_swing;
 
+@SuppressWarnings("JniMissingFunction")
 public class DefaultTableCellRendererProxy extends javax.swing.table.DefaultTableCellRenderer {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public javax.swing.table.DefaultTableCellRenderer()
 
-    DefaultTableCellRendererProxy( long swiftObject ) {
+    DefaultTableCellRendererProxy( long __swiftObject ) {
         super( );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Component javax.swing.table.DefaultTableCellRenderer.getTableCellRendererComponent(javax.swing.JTable,java.lang.Object,boolean,boolean,int,int)
 
-    public native java.awt.Component __getTableCellRendererComponent( javax.swing.JTable table, java.lang.Object value, boolean isSelected, boolean hasFocus, int row, int column );
+    public native java.awt.Component __getTableCellRendererComponent( long __swiftObject, javax.swing.JTable table, java.lang.Object value, boolean isSelected, boolean hasFocus, int row, int column );
 
     boolean entered_getTableCellRendererComponent_0;
 
     public java.awt.Component getTableCellRendererComponent( javax.swing.JTable table, java.lang.Object value, boolean isSelected, boolean hasFocus, int row, int column ) {
         if ( !entered_getTableCellRendererComponent_0 ) {
             entered_getTableCellRendererComponent_0 = true;
-            java.awt.Component __return = __getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column );
+            java.awt.Component __return = __getTableCellRendererComponent( __swiftObject, table, value, isSelected, hasFocus, row, column);
             entered_getTableCellRendererComponent_0 = false;
             return __return;
         }
@@ -31,4 +35,10 @@ public java.awt.Component getTableCellRendererComponent( javax.swing.JTable tabl
             return super.getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column );
     }
 
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
 }
diff --git a/src/org/genie/javax_swing/DefaultTableCellRenderer_UIResourceProxy.java b/src/org/swiftjava/javax_swing/DefaultTableCellRenderer_UIResourceProxy.java
similarity index 63%
rename from src/org/genie/javax_swing/DefaultTableCellRenderer_UIResourceProxy.java
rename to src/org/swiftjava/javax_swing/DefaultTableCellRenderer_UIResourceProxy.java
index e3642bc..1ee53d2 100644
--- a/src/org/genie/javax_swing/DefaultTableCellRenderer_UIResourceProxy.java
+++ b/src/org/swiftjava/javax_swing/DefaultTableCellRenderer_UIResourceProxy.java
@@ -1,29 +1,33 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class javax.swing.table.DefaultTableCellRenderer$UIResource ///
 
-package org.genie.javax_swing;
+package org.swiftjava.javax_swing;
 
+@SuppressWarnings("JniMissingFunction")
 public class DefaultTableCellRenderer_UIResourceProxy extends javax.swing.table.DefaultTableCellRenderer.UIResource {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public javax.swing.table.DefaultTableCellRenderer$UIResource()
 
-    DefaultTableCellRenderer_UIResourceProxy( long swiftObject ) {
+    DefaultTableCellRenderer_UIResourceProxy( long __swiftObject ) {
         super( );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public java.awt.Component javax.swing.table.DefaultTableCellRenderer.getTableCellRendererComponent(javax.swing.JTable,java.lang.Object,boolean,boolean,int,int)
 
-    public native java.awt.Component __getTableCellRendererComponent( javax.swing.JTable table, java.lang.Object value, boolean isSelected, boolean hasFocus, int row, int column );
+    public native java.awt.Component __getTableCellRendererComponent( long __swiftObject, javax.swing.JTable table, java.lang.Object value, boolean isSelected, boolean hasFocus, int row, int column );
 
     boolean entered_getTableCellRendererComponent_0;
 
     public java.awt.Component getTableCellRendererComponent( javax.swing.JTable table, java.lang.Object value, boolean isSelected, boolean hasFocus, int row, int column ) {
         if ( !entered_getTableCellRendererComponent_0 ) {
             entered_getTableCellRendererComponent_0 = true;
-            java.awt.Component __return = __getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column );
+            java.awt.Component __return = __getTableCellRendererComponent( __swiftObject, table, value, isSelected, hasFocus, row, column);
             entered_getTableCellRendererComponent_0 = false;
             return __return;
         }
@@ -31,4 +35,10 @@ public java.awt.Component getTableCellRendererComponent( javax.swing.JTable tabl
             return super.getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column );
     }
 
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
 }
diff --git a/src/org/genie/javax_swing/DefaultTableModelProxy.java b/src/org/swiftjava/javax_swing/DefaultTableModelProxy.java
similarity index 61%
rename from src/org/genie/javax_swing/DefaultTableModelProxy.java
rename to src/org/swiftjava/javax_swing/DefaultTableModelProxy.java
index 985be91..80b2e4f 100644
--- a/src/org/genie/javax_swing/DefaultTableModelProxy.java
+++ b/src/org/swiftjava/javax_swing/DefaultTableModelProxy.java
@@ -1,64 +1,68 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class javax.swing.table.DefaultTableModel ///
 
-package org.genie.javax_swing;
+package org.swiftjava.javax_swing;
 
+@SuppressWarnings("JniMissingFunction")
 public class DefaultTableModelProxy extends javax.swing.table.DefaultTableModel {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public javax.swing.table.DefaultTableModel(java.util.Vector,int)
 
-    DefaultTableModelProxy( java.util.Vector columnNames, int rowCount , long swiftObject ) {
+    DefaultTableModelProxy( java.util.Vector columnNames, int rowCount , long __swiftObject ) {
         super( columnNames, rowCount );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.table.DefaultTableModel(java.lang.Object[],int)
 
-    DefaultTableModelProxy( java.lang.Object[] columnNames, int rowCount , long swiftObject ) {
+    DefaultTableModelProxy( java.lang.Object[] columnNames, int rowCount , long __swiftObject ) {
         super( columnNames, rowCount );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.table.DefaultTableModel(java.util.Vector,java.util.Vector)
 
-    DefaultTableModelProxy( java.util.Vector data, java.util.Vector columnNames , long swiftObject ) {
+    DefaultTableModelProxy( java.util.Vector data, java.util.Vector columnNames , long __swiftObject ) {
         super( data, columnNames );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.table.DefaultTableModel(java.lang.Object[][],java.lang.Object[])
 
-    DefaultTableModelProxy( java.lang.Object[][] data, java.lang.Object[] columnNames , long swiftObject ) {
+    DefaultTableModelProxy( java.lang.Object[][] data, java.lang.Object[] columnNames , long __swiftObject ) {
         super( data, columnNames );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
-    /// public javax.swing.table.DefaultTableModel(int,int)
+    /// public javax.swing.table.DefaultTableModel()
 
-    DefaultTableModelProxy( int rowCount, int columnCount , long swiftObject ) {
-        super( rowCount, columnCount );
-        this.swiftObject = swiftObject;
+    DefaultTableModelProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
     }
 
-    /// public javax.swing.table.DefaultTableModel()
+    /// public javax.swing.table.DefaultTableModel(int,int)
 
-    DefaultTableModelProxy( long swiftObject ) {
-        super( );
-        this.swiftObject = swiftObject;
+    DefaultTableModelProxy( int rowCount, int columnCount , long __swiftObject ) {
+        super( rowCount, columnCount );
+        this.__swiftObject = __swiftObject;
     }
 
     /// public boolean javax.swing.table.DefaultTableModel.isCellEditable(int,int)
 
-    public native boolean __isCellEditable( int row, int column );
+    public native boolean __isCellEditable( long __swiftObject, int row, int column );
 
     boolean entered_isCellEditable_0;
 
     public boolean isCellEditable( int row, int column ) {
         if ( !entered_isCellEditable_0 ) {
             entered_isCellEditable_0 = true;
-            boolean __return = __isCellEditable( row, column );
+            boolean __return = __isCellEditable( __swiftObject, row, column);
             entered_isCellEditable_0 = false;
             return __return;
         }
@@ -66,4 +70,10 @@ public boolean isCellEditable( int row, int column ) {
             return super.isCellEditable( row, column );
     }
 
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
 }
diff --git a/src/org/genie/javax_swing/DesktopManagerProxy.java b/src/org/swiftjava/javax_swing/DesktopManagerProxy.java
similarity index 51%
rename from src/org/genie/javax_swing/DesktopManagerProxy.java
rename to src/org/swiftjava/javax_swing/DesktopManagerProxy.java
index 8ec6fc5..d51da68 100644
--- a/src/org/genie/javax_swing/DesktopManagerProxy.java
+++ b/src/org/swiftjava/javax_swing/DesktopManagerProxy.java
@@ -1,134 +1,144 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// interface javax.swing.DesktopManager ///
 
-package org.genie.javax_swing;
+package org.swiftjava.javax_swing;
 
+@SuppressWarnings("JniMissingFunction")
 public class DesktopManagerProxy implements javax.swing.DesktopManager {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
-    DesktopManagerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
+    DesktopManagerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
     }
 
-    /// public abstract void javax.swing.DesktopManager.openFrame(javax.swing.JInternalFrame)
+    /// public abstract void javax.swing.DesktopManager.activateFrame(javax.swing.JInternalFrame)
 
-    public native void __openFrame( javax.swing.JInternalFrame f );
+    public native void __activateFrame( long __swiftObject, javax.swing.JInternalFrame f );
 
-    public void openFrame( javax.swing.JInternalFrame f ) {
-        __openFrame( f );
+    public void activateFrame( javax.swing.JInternalFrame f ) {
+        __activateFrame( __swiftObject, f );
     }
 
-    /// public abstract void javax.swing.DesktopManager.closeFrame(javax.swing.JInternalFrame)
+    /// public abstract void javax.swing.DesktopManager.beginDraggingFrame(javax.swing.JComponent)
 
-    public native void __closeFrame( javax.swing.JInternalFrame f );
+    public native void __beginDraggingFrame( long __swiftObject, javax.swing.JComponent f );
 
-    public void closeFrame( javax.swing.JInternalFrame f ) {
-        __closeFrame( f );
+    public void beginDraggingFrame( javax.swing.JComponent f ) {
+        __beginDraggingFrame( __swiftObject, f );
     }
 
-    /// public abstract void javax.swing.DesktopManager.maximizeFrame(javax.swing.JInternalFrame)
+    /// public abstract void javax.swing.DesktopManager.beginResizingFrame(javax.swing.JComponent,int)
 
-    public native void __maximizeFrame( javax.swing.JInternalFrame f );
+    public native void __beginResizingFrame( long __swiftObject, javax.swing.JComponent f, int direction );
 
-    public void maximizeFrame( javax.swing.JInternalFrame f ) {
-        __maximizeFrame( f );
+    public void beginResizingFrame( javax.swing.JComponent f, int direction ) {
+        __beginResizingFrame( __swiftObject, f, direction );
     }
 
-    /// public abstract void javax.swing.DesktopManager.minimizeFrame(javax.swing.JInternalFrame)
+    /// public abstract void javax.swing.DesktopManager.closeFrame(javax.swing.JInternalFrame)
 
-    public native void __minimizeFrame( javax.swing.JInternalFrame f );
+    public native void __closeFrame( long __swiftObject, javax.swing.JInternalFrame f );
 
-    public void minimizeFrame( javax.swing.JInternalFrame f ) {
-        __minimizeFrame( f );
+    public void closeFrame( javax.swing.JInternalFrame f ) {
+        __closeFrame( __swiftObject, f );
     }
 
-    /// public abstract void javax.swing.DesktopManager.iconifyFrame(javax.swing.JInternalFrame)
+    /// public abstract void javax.swing.DesktopManager.deactivateFrame(javax.swing.JInternalFrame)
 
-    public native void __iconifyFrame( javax.swing.JInternalFrame f );
+    public native void __deactivateFrame( long __swiftObject, javax.swing.JInternalFrame f );
 
-    public void iconifyFrame( javax.swing.JInternalFrame f ) {
-        __iconifyFrame( f );
+    public void deactivateFrame( javax.swing.JInternalFrame f ) {
+        __deactivateFrame( __swiftObject, f );
     }
 
     /// public abstract void javax.swing.DesktopManager.deiconifyFrame(javax.swing.JInternalFrame)
 
-    public native void __deiconifyFrame( javax.swing.JInternalFrame f );
+    public native void __deiconifyFrame( long __swiftObject, javax.swing.JInternalFrame f );
 
     public void deiconifyFrame( javax.swing.JInternalFrame f ) {
-        __deiconifyFrame( f );
+        __deiconifyFrame( __swiftObject, f );
     }
 
-    /// public abstract void javax.swing.DesktopManager.activateFrame(javax.swing.JInternalFrame)
+    /// public abstract void javax.swing.DesktopManager.dragFrame(javax.swing.JComponent,int,int)
 
-    public native void __activateFrame( javax.swing.JInternalFrame f );
+    public native void __dragFrame( long __swiftObject, javax.swing.JComponent f, int newX, int newY );
 
-    public void activateFrame( javax.swing.JInternalFrame f ) {
-        __activateFrame( f );
+    public void dragFrame( javax.swing.JComponent f, int newX, int newY ) {
+        __dragFrame( __swiftObject, f, newX, newY );
     }
 
-    /// public abstract void javax.swing.DesktopManager.deactivateFrame(javax.swing.JInternalFrame)
+    /// public abstract void javax.swing.DesktopManager.endDraggingFrame(javax.swing.JComponent)
 
-    public native void __deactivateFrame( javax.swing.JInternalFrame f );
+    public native void __endDraggingFrame( long __swiftObject, javax.swing.JComponent f );
 
-    public void deactivateFrame( javax.swing.JInternalFrame f ) {
-        __deactivateFrame( f );
+    public void endDraggingFrame( javax.swing.JComponent f ) {
+        __endDraggingFrame( __swiftObject, f );
     }
 
-    /// public abstract void javax.swing.DesktopManager.beginDraggingFrame(javax.swing.JComponent)
+    /// public abstract void javax.swing.DesktopManager.endResizingFrame(javax.swing.JComponent)
 
-    public native void __beginDraggingFrame( javax.swing.JComponent f );
+    public native void __endResizingFrame( long __swiftObject, javax.swing.JComponent f );
 
-    public void beginDraggingFrame( javax.swing.JComponent f ) {
-        __beginDraggingFrame( f );
+    public void endResizingFrame( javax.swing.JComponent f ) {
+        __endResizingFrame( __swiftObject, f );
     }
 
-    /// public abstract void javax.swing.DesktopManager.dragFrame(javax.swing.JComponent,int,int)
+    /// public abstract void javax.swing.DesktopManager.iconifyFrame(javax.swing.JInternalFrame)
 
-    public native void __dragFrame( javax.swing.JComponent f, int newX, int newY );
+    public native void __iconifyFrame( long __swiftObject, javax.swing.JInternalFrame f );
 
-    public void dragFrame( javax.swing.JComponent f, int newX, int newY ) {
-        __dragFrame( f, newX, newY );
+    public void iconifyFrame( javax.swing.JInternalFrame f ) {
+        __iconifyFrame( __swiftObject, f );
     }
 
-    /// public abstract void javax.swing.DesktopManager.endDraggingFrame(javax.swing.JComponent)
+    /// public abstract void javax.swing.DesktopManager.maximizeFrame(javax.swing.JInternalFrame)
 
-    public native void __endDraggingFrame( javax.swing.JComponent f );
+    public native void __maximizeFrame( long __swiftObject, javax.swing.JInternalFrame f );
 
-    public void endDraggingFrame( javax.swing.JComponent f ) {
-        __endDraggingFrame( f );
+    public void maximizeFrame( javax.swing.JInternalFrame f ) {
+        __maximizeFrame( __swiftObject, f );
     }
 
-    /// public abstract void javax.swing.DesktopManager.beginResizingFrame(javax.swing.JComponent,int)
+    /// public abstract void javax.swing.DesktopManager.minimizeFrame(javax.swing.JInternalFrame)
 
-    public native void __beginResizingFrame( javax.swing.JComponent f, int direction );
+    public native void __minimizeFrame( long __swiftObject, javax.swing.JInternalFrame f );
 
-    public void beginResizingFrame( javax.swing.JComponent f, int direction ) {
-        __beginResizingFrame( f, direction );
+    public void minimizeFrame( javax.swing.JInternalFrame f ) {
+        __minimizeFrame( __swiftObject, f );
     }
 
-    /// public abstract void javax.swing.DesktopManager.resizeFrame(javax.swing.JComponent,int,int,int,int)
+    /// public abstract void javax.swing.DesktopManager.openFrame(javax.swing.JInternalFrame)
 
-    public native void __resizeFrame( javax.swing.JComponent f, int newX, int newY, int newWidth, int newHeight );
+    public native void __openFrame( long __swiftObject, javax.swing.JInternalFrame f );
 
-    public void resizeFrame( javax.swing.JComponent f, int newX, int newY, int newWidth, int newHeight ) {
-        __resizeFrame( f, newX, newY, newWidth, newHeight );
+    public void openFrame( javax.swing.JInternalFrame f ) {
+        __openFrame( __swiftObject, f );
     }
 
-    /// public abstract void javax.swing.DesktopManager.endResizingFrame(javax.swing.JComponent)
+    /// public abstract void javax.swing.DesktopManager.resizeFrame(javax.swing.JComponent,int,int,int,int)
 
-    public native void __endResizingFrame( javax.swing.JComponent f );
+    public native void __resizeFrame( long __swiftObject, javax.swing.JComponent f, int newX, int newY, int newWidth, int newHeight );
 
-    public void endResizingFrame( javax.swing.JComponent f ) {
-        __endResizingFrame( f );
+    public void resizeFrame( javax.swing.JComponent f, int newX, int newY, int newWidth, int newHeight ) {
+        __resizeFrame( __swiftObject, f, newX, newY, newWidth, newHeight );
     }
 
     /// public abstract void javax.swing.DesktopManager.setBoundsForFrame(javax.swing.JComponent,int,int,int,int)
 
-    public native void __setBoundsForFrame( javax.swing.JComponent f, int newX, int newY, int newWidth, int newHeight );
+    public native void __setBoundsForFrame( long __swiftObject, javax.swing.JComponent f, int newX, int newY, int newWidth, int newHeight );
 
     public void setBoundsForFrame( javax.swing.JComponent f, int newX, int newY, int newWidth, int newHeight ) {
-        __setBoundsForFrame( f, newX, newY, newWidth, newHeight );
+        __setBoundsForFrame( __swiftObject, f, newX, newY, newWidth, newHeight );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
     }
 
 }
diff --git a/src/org/swiftjava/javax_swing/DocumentListenerProxy.java b/src/org/swiftjava/javax_swing/DocumentListenerProxy.java
new file mode 100644
index 0000000..4c7b8f9
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/DocumentListenerProxy.java
@@ -0,0 +1,48 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.DocumentListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class DocumentListenerProxy implements javax.swing.event.DocumentListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    DocumentListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.DocumentListener.changedUpdate(javax.swing.event.DocumentEvent)
+
+    public native void __changedUpdate( long __swiftObject, javax.swing.event.DocumentEvent e );
+
+    public void changedUpdate( javax.swing.event.DocumentEvent e ) {
+        __changedUpdate( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.DocumentListener.insertUpdate(javax.swing.event.DocumentEvent)
+
+    public native void __insertUpdate( long __swiftObject, javax.swing.event.DocumentEvent e );
+
+    public void insertUpdate( javax.swing.event.DocumentEvent e ) {
+        __insertUpdate( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.DocumentListener.removeUpdate(javax.swing.event.DocumentEvent)
+
+    public native void __removeUpdate( long __swiftObject, javax.swing.event.DocumentEvent e );
+
+    public void removeUpdate( javax.swing.event.DocumentEvent e ) {
+        __removeUpdate( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/HyperlinkListenerProxy.java b/src/org/swiftjava/javax_swing/HyperlinkListenerProxy.java
new file mode 100644
index 0000000..c6ceed8
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/HyperlinkListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.HyperlinkListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class HyperlinkListenerProxy implements javax.swing.event.HyperlinkListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    HyperlinkListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.HyperlinkListener.hyperlinkUpdate(javax.swing.event.HyperlinkEvent)
+
+    public native void __hyperlinkUpdate( long __swiftObject, javax.swing.event.HyperlinkEvent e );
+
+    public void hyperlinkUpdate( javax.swing.event.HyperlinkEvent e ) {
+        __hyperlinkUpdate( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/InternalFrameAdapterProxy.java b/src/org/swiftjava/javax_swing/InternalFrameAdapterProxy.java
new file mode 100644
index 0000000..f310261
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/InternalFrameAdapterProxy.java
@@ -0,0 +1,190 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class javax.swing.event.InternalFrameAdapter ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class InternalFrameAdapterProxy extends javax.swing.event.InternalFrameAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public javax.swing.event.InternalFrameAdapter()
+
+    InternalFrameAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_0;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_0 ) {
+            entered_equals_0 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_0 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_1;
+
+    public int hashCode() {
+        if ( !entered_hashCode_1 ) {
+            entered_hashCode_1 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_1 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public void javax.swing.event.InternalFrameAdapter.internalFrameActivated(javax.swing.event.InternalFrameEvent)
+
+    public native void __internalFrameActivated( long __swiftObject, javax.swing.event.InternalFrameEvent e );
+
+    boolean entered_internalFrameActivated_2;
+
+    public void internalFrameActivated( javax.swing.event.InternalFrameEvent e ) {
+        if ( !entered_internalFrameActivated_2 ) {
+            entered_internalFrameActivated_2 = true;
+            __internalFrameActivated( __swiftObject, e);
+            entered_internalFrameActivated_2 = false;
+        }
+        else
+            super.internalFrameActivated( e );
+    }
+
+    /// public void javax.swing.event.InternalFrameAdapter.internalFrameClosed(javax.swing.event.InternalFrameEvent)
+
+    public native void __internalFrameClosed( long __swiftObject, javax.swing.event.InternalFrameEvent e );
+
+    boolean entered_internalFrameClosed_3;
+
+    public void internalFrameClosed( javax.swing.event.InternalFrameEvent e ) {
+        if ( !entered_internalFrameClosed_3 ) {
+            entered_internalFrameClosed_3 = true;
+            __internalFrameClosed( __swiftObject, e);
+            entered_internalFrameClosed_3 = false;
+        }
+        else
+            super.internalFrameClosed( e );
+    }
+
+    /// public void javax.swing.event.InternalFrameAdapter.internalFrameClosing(javax.swing.event.InternalFrameEvent)
+
+    public native void __internalFrameClosing( long __swiftObject, javax.swing.event.InternalFrameEvent e );
+
+    boolean entered_internalFrameClosing_4;
+
+    public void internalFrameClosing( javax.swing.event.InternalFrameEvent e ) {
+        if ( !entered_internalFrameClosing_4 ) {
+            entered_internalFrameClosing_4 = true;
+            __internalFrameClosing( __swiftObject, e);
+            entered_internalFrameClosing_4 = false;
+        }
+        else
+            super.internalFrameClosing( e );
+    }
+
+    /// public void javax.swing.event.InternalFrameAdapter.internalFrameDeactivated(javax.swing.event.InternalFrameEvent)
+
+    public native void __internalFrameDeactivated( long __swiftObject, javax.swing.event.InternalFrameEvent e );
+
+    boolean entered_internalFrameDeactivated_5;
+
+    public void internalFrameDeactivated( javax.swing.event.InternalFrameEvent e ) {
+        if ( !entered_internalFrameDeactivated_5 ) {
+            entered_internalFrameDeactivated_5 = true;
+            __internalFrameDeactivated( __swiftObject, e);
+            entered_internalFrameDeactivated_5 = false;
+        }
+        else
+            super.internalFrameDeactivated( e );
+    }
+
+    /// public void javax.swing.event.InternalFrameAdapter.internalFrameDeiconified(javax.swing.event.InternalFrameEvent)
+
+    public native void __internalFrameDeiconified( long __swiftObject, javax.swing.event.InternalFrameEvent e );
+
+    boolean entered_internalFrameDeiconified_6;
+
+    public void internalFrameDeiconified( javax.swing.event.InternalFrameEvent e ) {
+        if ( !entered_internalFrameDeiconified_6 ) {
+            entered_internalFrameDeiconified_6 = true;
+            __internalFrameDeiconified( __swiftObject, e);
+            entered_internalFrameDeiconified_6 = false;
+        }
+        else
+            super.internalFrameDeiconified( e );
+    }
+
+    /// public void javax.swing.event.InternalFrameAdapter.internalFrameIconified(javax.swing.event.InternalFrameEvent)
+
+    public native void __internalFrameIconified( long __swiftObject, javax.swing.event.InternalFrameEvent e );
+
+    boolean entered_internalFrameIconified_7;
+
+    public void internalFrameIconified( javax.swing.event.InternalFrameEvent e ) {
+        if ( !entered_internalFrameIconified_7 ) {
+            entered_internalFrameIconified_7 = true;
+            __internalFrameIconified( __swiftObject, e);
+            entered_internalFrameIconified_7 = false;
+        }
+        else
+            super.internalFrameIconified( e );
+    }
+
+    /// public void javax.swing.event.InternalFrameAdapter.internalFrameOpened(javax.swing.event.InternalFrameEvent)
+
+    public native void __internalFrameOpened( long __swiftObject, javax.swing.event.InternalFrameEvent e );
+
+    boolean entered_internalFrameOpened_8;
+
+    public void internalFrameOpened( javax.swing.event.InternalFrameEvent e ) {
+        if ( !entered_internalFrameOpened_8 ) {
+            entered_internalFrameOpened_8 = true;
+            __internalFrameOpened( __swiftObject, e);
+            entered_internalFrameOpened_8 = false;
+        }
+        else
+            super.internalFrameOpened( e );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_9;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_9 ) {
+            entered_toString_9 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_9 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/javax_swing/InternalFrameListenerProxy.java b/src/org/swiftjava/javax_swing/InternalFrameListenerProxy.java
similarity index 51%
rename from src/org/genie/javax_swing/InternalFrameListenerProxy.java
rename to src/org/swiftjava/javax_swing/InternalFrameListenerProxy.java
index 1052929..cabacae 100644
--- a/src/org/genie/javax_swing/InternalFrameListenerProxy.java
+++ b/src/org/swiftjava/javax_swing/InternalFrameListenerProxy.java
@@ -1,70 +1,80 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// interface javax.swing.event.InternalFrameListener ///
 
-package org.genie.javax_swing;
+package org.swiftjava.javax_swing;
 
+@SuppressWarnings("JniMissingFunction")
 public class InternalFrameListenerProxy implements javax.swing.event.InternalFrameListener {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
-    InternalFrameListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
+    InternalFrameListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
     }
 
-    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameOpened(javax.swing.event.InternalFrameEvent)
+    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameActivated(javax.swing.event.InternalFrameEvent)
 
-    public native void __internalFrameOpened( javax.swing.event.InternalFrameEvent e );
+    public native void __internalFrameActivated( long __swiftObject, javax.swing.event.InternalFrameEvent e );
 
-    public void internalFrameOpened( javax.swing.event.InternalFrameEvent e ) {
-        __internalFrameOpened( e );
+    public void internalFrameActivated( javax.swing.event.InternalFrameEvent e ) {
+        __internalFrameActivated( __swiftObject, e );
     }
 
-    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameClosing(javax.swing.event.InternalFrameEvent)
+    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameClosed(javax.swing.event.InternalFrameEvent)
 
-    public native void __internalFrameClosing( javax.swing.event.InternalFrameEvent e );
+    public native void __internalFrameClosed( long __swiftObject, javax.swing.event.InternalFrameEvent e );
 
-    public void internalFrameClosing( javax.swing.event.InternalFrameEvent e ) {
-        __internalFrameClosing( e );
+    public void internalFrameClosed( javax.swing.event.InternalFrameEvent e ) {
+        __internalFrameClosed( __swiftObject, e );
     }
 
-    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameClosed(javax.swing.event.InternalFrameEvent)
+    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameClosing(javax.swing.event.InternalFrameEvent)
 
-    public native void __internalFrameClosed( javax.swing.event.InternalFrameEvent e );
+    public native void __internalFrameClosing( long __swiftObject, javax.swing.event.InternalFrameEvent e );
 
-    public void internalFrameClosed( javax.swing.event.InternalFrameEvent e ) {
-        __internalFrameClosed( e );
+    public void internalFrameClosing( javax.swing.event.InternalFrameEvent e ) {
+        __internalFrameClosing( __swiftObject, e );
     }
 
-    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameIconified(javax.swing.event.InternalFrameEvent)
+    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameDeactivated(javax.swing.event.InternalFrameEvent)
 
-    public native void __internalFrameIconified( javax.swing.event.InternalFrameEvent e );
+    public native void __internalFrameDeactivated( long __swiftObject, javax.swing.event.InternalFrameEvent e );
 
-    public void internalFrameIconified( javax.swing.event.InternalFrameEvent e ) {
-        __internalFrameIconified( e );
+    public void internalFrameDeactivated( javax.swing.event.InternalFrameEvent e ) {
+        __internalFrameDeactivated( __swiftObject, e );
     }
 
     /// public abstract void javax.swing.event.InternalFrameListener.internalFrameDeiconified(javax.swing.event.InternalFrameEvent)
 
-    public native void __internalFrameDeiconified( javax.swing.event.InternalFrameEvent e );
+    public native void __internalFrameDeiconified( long __swiftObject, javax.swing.event.InternalFrameEvent e );
 
     public void internalFrameDeiconified( javax.swing.event.InternalFrameEvent e ) {
-        __internalFrameDeiconified( e );
+        __internalFrameDeiconified( __swiftObject, e );
     }
 
-    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameActivated(javax.swing.event.InternalFrameEvent)
+    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameIconified(javax.swing.event.InternalFrameEvent)
 
-    public native void __internalFrameActivated( javax.swing.event.InternalFrameEvent e );
+    public native void __internalFrameIconified( long __swiftObject, javax.swing.event.InternalFrameEvent e );
 
-    public void internalFrameActivated( javax.swing.event.InternalFrameEvent e ) {
-        __internalFrameActivated( e );
+    public void internalFrameIconified( javax.swing.event.InternalFrameEvent e ) {
+        __internalFrameIconified( __swiftObject, e );
     }
 
-    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameDeactivated(javax.swing.event.InternalFrameEvent)
+    /// public abstract void javax.swing.event.InternalFrameListener.internalFrameOpened(javax.swing.event.InternalFrameEvent)
 
-    public native void __internalFrameDeactivated( javax.swing.event.InternalFrameEvent e );
+    public native void __internalFrameOpened( long __swiftObject, javax.swing.event.InternalFrameEvent e );
 
-    public void internalFrameDeactivated( javax.swing.event.InternalFrameEvent e ) {
-        __internalFrameDeactivated( e );
+    public void internalFrameOpened( javax.swing.event.InternalFrameEvent e ) {
+        __internalFrameOpened( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
     }
 
 }
diff --git a/src/org/swiftjava/javax_swing/JComboBox_KeySelectionManagerProxy.java b/src/org/swiftjava/javax_swing/JComboBox_KeySelectionManagerProxy.java
new file mode 100644
index 0000000..dd4230b
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/JComboBox_KeySelectionManagerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.JComboBox$KeySelectionManager ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class JComboBox_KeySelectionManagerProxy implements javax.swing.JComboBox.KeySelectionManager {
+
+    // address of proxy object
+    long __swiftObject;
+
+    JComboBox_KeySelectionManagerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract int javax.swing.JComboBox$KeySelectionManager.selectionForKey(char,javax.swing.ComboBoxModel)
+
+    public native int __selectionForKey( long __swiftObject, char aKey, javax.swing.ComboBoxModel aModel );
+
+    public int selectionForKey( char aKey, javax.swing.ComboBoxModel aModel ) {
+        return __selectionForKey( __swiftObject, aKey, aModel );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/javax_swing/JDialogProxy.java b/src/org/swiftjava/javax_swing/JDialogProxy.java
similarity index 59%
rename from src/org/genie/javax_swing/JDialogProxy.java
rename to src/org/swiftjava/javax_swing/JDialogProxy.java
index fb8fd9a..f8b65df 100644
--- a/src/org/genie/javax_swing/JDialogProxy.java
+++ b/src/org/swiftjava/javax_swing/JDialogProxy.java
@@ -1,138 +1,148 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class javax.swing.JDialog ///
 
-package org.genie.javax_swing;
+package org.swiftjava.javax_swing;
 
+@SuppressWarnings("JniMissingFunction")
 public class JDialogProxy extends javax.swing.JDialog {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public javax.swing.JDialog(java.awt.Window)
 
-    JDialogProxy( java.awt.Window owner , long swiftObject ) {
+    JDialogProxy( java.awt.Window owner , long __swiftObject ) {
         super( owner );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Dialog,java.lang.String,boolean,java.awt.GraphicsConfiguration)
 
-    JDialogProxy( java.awt.Dialog owner, java.lang.String title, boolean modal, java.awt.GraphicsConfiguration gc , long swiftObject ) {
+    JDialogProxy( java.awt.Dialog owner, java.lang.String title, boolean modal, java.awt.GraphicsConfiguration gc , long __swiftObject ) {
         super( owner, title, modal, gc );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Dialog,java.lang.String,boolean)
 
-    JDialogProxy( java.awt.Dialog owner, java.lang.String title, boolean modal , long swiftObject ) {
+    JDialogProxy( java.awt.Dialog owner, java.lang.String title, boolean modal , long __swiftObject ) {
         super( owner, title, modal );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Dialog,java.lang.String)
 
-    JDialogProxy( java.awt.Dialog owner, java.lang.String title , long swiftObject ) {
+    JDialogProxy( java.awt.Dialog owner, java.lang.String title , long __swiftObject ) {
         super( owner, title );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Window,java.lang.String,java.awt.Dialog$ModalityType,java.awt.GraphicsConfiguration)
 
-    JDialogProxy( java.awt.Window owner, java.lang.String title, java.awt.Dialog.ModalityType modalityType, java.awt.GraphicsConfiguration gc , long swiftObject ) {
+    JDialogProxy( java.awt.Window owner, java.lang.String title, java.awt.Dialog.ModalityType modalityType, java.awt.GraphicsConfiguration gc , long __swiftObject ) {
         super( owner, title, modalityType, gc );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Window,java.lang.String,java.awt.Dialog$ModalityType)
 
-    JDialogProxy( java.awt.Window owner, java.lang.String title, java.awt.Dialog.ModalityType modalityType , long swiftObject ) {
+    JDialogProxy( java.awt.Window owner, java.lang.String title, java.awt.Dialog.ModalityType modalityType , long __swiftObject ) {
         super( owner, title, modalityType );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Window,java.lang.String)
 
-    JDialogProxy( java.awt.Window owner, java.lang.String title , long swiftObject ) {
+    JDialogProxy( java.awt.Window owner, java.lang.String title , long __swiftObject ) {
         super( owner, title );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Window,java.awt.Dialog$ModalityType)
 
-    JDialogProxy( java.awt.Window owner, java.awt.Dialog.ModalityType modalityType , long swiftObject ) {
+    JDialogProxy( java.awt.Window owner, java.awt.Dialog.ModalityType modalityType , long __swiftObject ) {
         super( owner, modalityType );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Frame,java.lang.String)
 
-    JDialogProxy( java.awt.Frame owner, java.lang.String title , long swiftObject ) {
+    JDialogProxy( java.awt.Frame owner, java.lang.String title , long __swiftObject ) {
         super( owner, title );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Frame,boolean)
 
-    JDialogProxy( java.awt.Frame owner, boolean modal , long swiftObject ) {
+    JDialogProxy( java.awt.Frame owner, boolean modal , long __swiftObject ) {
         super( owner, modal );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Frame)
 
-    JDialogProxy( java.awt.Frame owner , long swiftObject ) {
+    JDialogProxy( java.awt.Frame owner , long __swiftObject ) {
         super( owner );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog()
 
-    JDialogProxy( long swiftObject ) {
+    JDialogProxy( long __swiftObject ) {
         super( );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Dialog,boolean)
 
-    JDialogProxy( java.awt.Dialog owner, boolean modal , long swiftObject ) {
+    JDialogProxy( java.awt.Dialog owner, boolean modal , long __swiftObject ) {
         super( owner, modal );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Dialog)
 
-    JDialogProxy( java.awt.Dialog owner , long swiftObject ) {
+    JDialogProxy( java.awt.Dialog owner , long __swiftObject ) {
         super( owner );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Frame,java.lang.String,boolean,java.awt.GraphicsConfiguration)
 
-    JDialogProxy( java.awt.Frame owner, java.lang.String title, boolean modal, java.awt.GraphicsConfiguration gc , long swiftObject ) {
+    JDialogProxy( java.awt.Frame owner, java.lang.String title, boolean modal, java.awt.GraphicsConfiguration gc , long __swiftObject ) {
         super( owner, title, modal, gc );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JDialog(java.awt.Frame,java.lang.String,boolean)
 
-    JDialogProxy( java.awt.Frame owner, java.lang.String title, boolean modal , long swiftObject ) {
+    JDialogProxy( java.awt.Frame owner, java.lang.String title, boolean modal , long __swiftObject ) {
         super( owner, title, modal );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public void java.awt.Window.paint(java.awt.Graphics)
 
-    public native void __paint( java.awt.Graphics arg0 );
+    public native void __paint( long __swiftObject, java.awt.Graphics arg0 );
 
     boolean entered_paint_0;
 
     public void paint( java.awt.Graphics arg0 ) {
         if ( !entered_paint_0 ) {
             entered_paint_0 = true;
-            __paint( arg0 );
+            __paint( __swiftObject, arg0);
             entered_paint_0 = false;
         }
         else
             super.paint( arg0 );
     }
 
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
 }
diff --git a/src/org/genie/javax_swing/JFrameProxy.java b/src/org/swiftjava/javax_swing/JFrameProxy.java
similarity index 50%
rename from src/org/genie/javax_swing/JFrameProxy.java
rename to src/org/swiftjava/javax_swing/JFrameProxy.java
index 1648cf6..7d5db87 100644
--- a/src/org/genie/javax_swing/JFrameProxy.java
+++ b/src/org/swiftjava/javax_swing/JFrameProxy.java
@@ -1,54 +1,64 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class javax.swing.JFrame ///
 
-package org.genie.javax_swing;
+package org.swiftjava.javax_swing;
 
+@SuppressWarnings("JniMissingFunction")
 public class JFrameProxy extends javax.swing.JFrame {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public javax.swing.JFrame(java.lang.String,java.awt.GraphicsConfiguration)
 
-    JFrameProxy( java.lang.String title, java.awt.GraphicsConfiguration gc , long swiftObject ) {
+    JFrameProxy( java.lang.String title, java.awt.GraphicsConfiguration gc , long __swiftObject ) {
         super( title, gc );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JFrame(java.lang.String) throws java.awt.HeadlessException
 
-    JFrameProxy( java.lang.String title , long swiftObject ) {
+    JFrameProxy( java.lang.String title , long __swiftObject ) {
         super( title );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JFrame(java.awt.GraphicsConfiguration)
 
-    JFrameProxy( java.awt.GraphicsConfiguration gc , long swiftObject ) {
+    JFrameProxy( java.awt.GraphicsConfiguration gc , long __swiftObject ) {
         super( gc );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JFrame() throws java.awt.HeadlessException
 
-    JFrameProxy( long swiftObject ) {
+    JFrameProxy( long __swiftObject ) {
         super( );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public void java.awt.Window.paint(java.awt.Graphics)
 
-    public native void __paint( java.awt.Graphics arg0 );
+    public native void __paint( long __swiftObject, java.awt.Graphics arg0 );
 
     boolean entered_paint_0;
 
     public void paint( java.awt.Graphics arg0 ) {
         if ( !entered_paint_0 ) {
             entered_paint_0 = true;
-            __paint( arg0 );
+            __paint( __swiftObject, arg0);
             entered_paint_0 = false;
         }
         else
             super.paint( arg0 );
     }
 
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
 }
diff --git a/src/org/genie/javax_swing/JTableProxy.java b/src/org/swiftjava/javax_swing/JTableProxy.java
similarity index 60%
rename from src/org/genie/javax_swing/JTableProxy.java
rename to src/org/swiftjava/javax_swing/JTableProxy.java
index dc72ebf..1b0d55c 100644
--- a/src/org/genie/javax_swing/JTableProxy.java
+++ b/src/org/swiftjava/javax_swing/JTableProxy.java
@@ -1,71 +1,75 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class javax.swing.JTable ///
 
-package org.genie.javax_swing;
+package org.swiftjava.javax_swing;
 
+@SuppressWarnings("JniMissingFunction")
 public class JTableProxy extends javax.swing.JTable {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public javax.swing.JTable(javax.swing.table.TableModel,javax.swing.table.TableColumnModel,javax.swing.ListSelectionModel)
 
-    JTableProxy( javax.swing.table.TableModel arg0, javax.swing.table.TableColumnModel arg1, javax.swing.ListSelectionModel arg2 , long swiftObject ) {
+    JTableProxy( javax.swing.table.TableModel arg0, javax.swing.table.TableColumnModel arg1, javax.swing.ListSelectionModel arg2 , long __swiftObject ) {
         super( arg0, arg1, arg2 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JTable(int,int)
 
-    JTableProxy( int arg0, int arg1 , long swiftObject ) {
+    JTableProxy( int arg0, int arg1 , long __swiftObject ) {
         super( arg0, arg1 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JTable(java.util.Vector,java.util.Vector)
 
-    JTableProxy( java.util.Vector arg0, java.util.Vector arg1 , long swiftObject ) {
+    JTableProxy( java.util.Vector arg0, java.util.Vector arg1 , long __swiftObject ) {
         super( arg0, arg1 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JTable(java.lang.Object[][],java.lang.Object[])
 
-    JTableProxy( java.lang.Object[][] arg0, java.lang.Object[] arg1 , long swiftObject ) {
+    JTableProxy( java.lang.Object[][] arg0, java.lang.Object[] arg1 , long __swiftObject ) {
         super( arg0, arg1 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JTable()
 
-    JTableProxy( long swiftObject ) {
+    JTableProxy( long __swiftObject ) {
         super( );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JTable(javax.swing.table.TableModel)
 
-    JTableProxy( javax.swing.table.TableModel arg0 , long swiftObject ) {
+    JTableProxy( javax.swing.table.TableModel arg0 , long __swiftObject ) {
         super( arg0 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.JTable(javax.swing.table.TableModel,javax.swing.table.TableColumnModel)
 
-    JTableProxy( javax.swing.table.TableModel arg0, javax.swing.table.TableColumnModel arg1 , long swiftObject ) {
+    JTableProxy( javax.swing.table.TableModel arg0, javax.swing.table.TableColumnModel arg1 , long __swiftObject ) {
         super( arg0, arg1 );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public void javax.swing.JTable.changeSelection(int,int,boolean,boolean)
 
-    public native void __changeSelection( int arg0, int arg1, boolean arg2, boolean arg3 );
+    public native void __changeSelection( long __swiftObject, int arg0, int arg1, boolean arg2, boolean arg3 );
 
     boolean entered_changeSelection_0;
 
     public void changeSelection( int arg0, int arg1, boolean arg2, boolean arg3 ) {
         if ( !entered_changeSelection_0 ) {
             entered_changeSelection_0 = true;
-            __changeSelection( arg0, arg1, arg2, arg3 );
+            __changeSelection( __swiftObject, arg0, arg1, arg2, arg3);
             entered_changeSelection_0 = false;
         }
         else
@@ -74,14 +78,14 @@ public void changeSelection( int arg0, int arg1, boolean arg2, boolean arg3 ) {
 
     /// public java.awt.Component javax.swing.JTable.prepareRenderer(javax.swing.table.TableCellRenderer,int,int)
 
-    public native java.awt.Component __prepareRenderer( javax.swing.table.TableCellRenderer arg0, int arg1, int arg2 );
+    public native java.awt.Component __prepareRenderer( long __swiftObject, javax.swing.table.TableCellRenderer arg0, int arg1, int arg2 );
 
     boolean entered_prepareRenderer_1;
 
     public java.awt.Component prepareRenderer( javax.swing.table.TableCellRenderer arg0, int arg1, int arg2 ) {
         if ( !entered_prepareRenderer_1 ) {
             entered_prepareRenderer_1 = true;
-            java.awt.Component __return = __prepareRenderer( arg0, arg1, arg2 );
+            java.awt.Component __return = __prepareRenderer( __swiftObject, arg0, arg1, arg2);
             entered_prepareRenderer_1 = false;
             return __return;
         }
@@ -89,4 +93,10 @@ public java.awt.Component prepareRenderer( javax.swing.table.TableCellRenderer a
             return super.prepareRenderer( arg0, arg1, arg2 );
     }
 
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
 }
diff --git a/src/org/swiftjava/javax_swing/JWindowProxy.java b/src/org/swiftjava/javax_swing/JWindowProxy.java
new file mode 100644
index 0000000..b49233e
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/JWindowProxy.java
@@ -0,0 +1,71 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class javax.swing.JWindow ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class JWindowProxy extends javax.swing.JWindow {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public javax.swing.JWindow(java.awt.Window,java.awt.GraphicsConfiguration)
+
+    JWindowProxy( java.awt.Window owner, java.awt.GraphicsConfiguration gc , long __swiftObject ) {
+        super( owner, gc );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public javax.swing.JWindow(java.awt.Window)
+
+    JWindowProxy( java.awt.Window owner , long __swiftObject ) {
+        super( owner );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public javax.swing.JWindow(java.awt.Frame)
+
+    JWindowProxy( java.awt.Frame owner , long __swiftObject ) {
+        super( owner );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public javax.swing.JWindow(java.awt.GraphicsConfiguration)
+
+    JWindowProxy( java.awt.GraphicsConfiguration gc , long __swiftObject ) {
+        super( gc );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public javax.swing.JWindow()
+
+    JWindowProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public void java.awt.Window.paint(java.awt.Graphics)
+
+    public native void __paint( long __swiftObject, java.awt.Graphics arg0 );
+
+    boolean entered_paint_0;
+
+    public void paint( java.awt.Graphics arg0 ) {
+        if ( !entered_paint_0 ) {
+            entered_paint_0 = true;
+            __paint( __swiftObject, arg0);
+            entered_paint_0 = false;
+        }
+        else
+            super.paint( arg0 );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/ListDataListenerProxy.java b/src/org/swiftjava/javax_swing/ListDataListenerProxy.java
new file mode 100644
index 0000000..f656602
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/ListDataListenerProxy.java
@@ -0,0 +1,48 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.ListDataListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class ListDataListenerProxy implements javax.swing.event.ListDataListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    ListDataListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.ListDataListener.contentsChanged(javax.swing.event.ListDataEvent)
+
+    public native void __contentsChanged( long __swiftObject, javax.swing.event.ListDataEvent e );
+
+    public void contentsChanged( javax.swing.event.ListDataEvent e ) {
+        __contentsChanged( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.ListDataListener.intervalAdded(javax.swing.event.ListDataEvent)
+
+    public native void __intervalAdded( long __swiftObject, javax.swing.event.ListDataEvent e );
+
+    public void intervalAdded( javax.swing.event.ListDataEvent e ) {
+        __intervalAdded( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.ListDataListener.intervalRemoved(javax.swing.event.ListDataEvent)
+
+    public native void __intervalRemoved( long __swiftObject, javax.swing.event.ListDataEvent e );
+
+    public void intervalRemoved( javax.swing.event.ListDataEvent e ) {
+        __intervalRemoved( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/ListSelectionListenerProxy.java b/src/org/swiftjava/javax_swing/ListSelectionListenerProxy.java
new file mode 100644
index 0000000..e16e898
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/ListSelectionListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.ListSelectionListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class ListSelectionListenerProxy implements javax.swing.event.ListSelectionListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    ListSelectionListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.ListSelectionListener.valueChanged(javax.swing.event.ListSelectionEvent)
+
+    public native void __valueChanged( long __swiftObject, javax.swing.event.ListSelectionEvent e );
+
+    public void valueChanged( javax.swing.event.ListSelectionEvent e ) {
+        __valueChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/MenuDragMouseListenerProxy.java b/src/org/swiftjava/javax_swing/MenuDragMouseListenerProxy.java
new file mode 100644
index 0000000..462bb14
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/MenuDragMouseListenerProxy.java
@@ -0,0 +1,56 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.MenuDragMouseListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class MenuDragMouseListenerProxy implements javax.swing.event.MenuDragMouseListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    MenuDragMouseListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.MenuDragMouseListener.menuDragMouseDragged(javax.swing.event.MenuDragMouseEvent)
+
+    public native void __menuDragMouseDragged( long __swiftObject, javax.swing.event.MenuDragMouseEvent e );
+
+    public void menuDragMouseDragged( javax.swing.event.MenuDragMouseEvent e ) {
+        __menuDragMouseDragged( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.MenuDragMouseListener.menuDragMouseEntered(javax.swing.event.MenuDragMouseEvent)
+
+    public native void __menuDragMouseEntered( long __swiftObject, javax.swing.event.MenuDragMouseEvent e );
+
+    public void menuDragMouseEntered( javax.swing.event.MenuDragMouseEvent e ) {
+        __menuDragMouseEntered( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.MenuDragMouseListener.menuDragMouseExited(javax.swing.event.MenuDragMouseEvent)
+
+    public native void __menuDragMouseExited( long __swiftObject, javax.swing.event.MenuDragMouseEvent e );
+
+    public void menuDragMouseExited( javax.swing.event.MenuDragMouseEvent e ) {
+        __menuDragMouseExited( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.MenuDragMouseListener.menuDragMouseReleased(javax.swing.event.MenuDragMouseEvent)
+
+    public native void __menuDragMouseReleased( long __swiftObject, javax.swing.event.MenuDragMouseEvent e );
+
+    public void menuDragMouseReleased( javax.swing.event.MenuDragMouseEvent e ) {
+        __menuDragMouseReleased( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/MenuKeyListenerProxy.java b/src/org/swiftjava/javax_swing/MenuKeyListenerProxy.java
new file mode 100644
index 0000000..0732eed
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/MenuKeyListenerProxy.java
@@ -0,0 +1,48 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.MenuKeyListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class MenuKeyListenerProxy implements javax.swing.event.MenuKeyListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    MenuKeyListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.MenuKeyListener.menuKeyPressed(javax.swing.event.MenuKeyEvent)
+
+    public native void __menuKeyPressed( long __swiftObject, javax.swing.event.MenuKeyEvent e );
+
+    public void menuKeyPressed( javax.swing.event.MenuKeyEvent e ) {
+        __menuKeyPressed( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.MenuKeyListener.menuKeyReleased(javax.swing.event.MenuKeyEvent)
+
+    public native void __menuKeyReleased( long __swiftObject, javax.swing.event.MenuKeyEvent e );
+
+    public void menuKeyReleased( javax.swing.event.MenuKeyEvent e ) {
+        __menuKeyReleased( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.MenuKeyListener.menuKeyTyped(javax.swing.event.MenuKeyEvent)
+
+    public native void __menuKeyTyped( long __swiftObject, javax.swing.event.MenuKeyEvent e );
+
+    public void menuKeyTyped( javax.swing.event.MenuKeyEvent e ) {
+        __menuKeyTyped( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/MenuListenerProxy.java b/src/org/swiftjava/javax_swing/MenuListenerProxy.java
new file mode 100644
index 0000000..dfe274d
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/MenuListenerProxy.java
@@ -0,0 +1,48 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.MenuListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class MenuListenerProxy implements javax.swing.event.MenuListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    MenuListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.MenuListener.menuCanceled(javax.swing.event.MenuEvent)
+
+    public native void __menuCanceled( long __swiftObject, javax.swing.event.MenuEvent e );
+
+    public void menuCanceled( javax.swing.event.MenuEvent e ) {
+        __menuCanceled( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.MenuListener.menuDeselected(javax.swing.event.MenuEvent)
+
+    public native void __menuDeselected( long __swiftObject, javax.swing.event.MenuEvent e );
+
+    public void menuDeselected( javax.swing.event.MenuEvent e ) {
+        __menuDeselected( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.MenuListener.menuSelected(javax.swing.event.MenuEvent)
+
+    public native void __menuSelected( long __swiftObject, javax.swing.event.MenuEvent e );
+
+    public void menuSelected( javax.swing.event.MenuEvent e ) {
+        __menuSelected( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/MouseInputAdapterProxy.java b/src/org/swiftjava/javax_swing/MouseInputAdapterProxy.java
new file mode 100644
index 0000000..6773021
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/MouseInputAdapterProxy.java
@@ -0,0 +1,206 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// class javax.swing.event.MouseInputAdapter ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class MouseInputAdapterProxy extends javax.swing.event.MouseInputAdapter {
+
+    // address of proxy object
+    long __swiftObject;
+
+    /// public javax.swing.event.MouseInputAdapter()
+
+    MouseInputAdapterProxy( long __swiftObject ) {
+        super( );
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public boolean java.lang.Object.equals(java.lang.Object)
+
+    public native boolean __equals( long __swiftObject, java.lang.Object arg0 );
+
+    boolean entered_equals_0;
+
+    public boolean equals( java.lang.Object arg0 ) {
+        if ( !entered_equals_0 ) {
+            entered_equals_0 = true;
+            boolean __return = __equals( __swiftObject, arg0);
+            entered_equals_0 = false;
+            return __return;
+        }
+        else
+            return super.equals( arg0 );
+    }
+
+    /// public native int java.lang.Object.hashCode()
+
+    public native int __hashCode( long __swiftObject );
+
+    boolean entered_hashCode_1;
+
+    public int hashCode() {
+        if ( !entered_hashCode_1 ) {
+            entered_hashCode_1 = true;
+            int __return = __hashCode( __swiftObject );
+            entered_hashCode_1 = false;
+            return __return;
+        }
+        else
+            return super.hashCode( );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseClicked(java.awt.event.MouseEvent)
+
+    public native void __mouseClicked( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseClicked_2;
+
+    public void mouseClicked( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseClicked_2 ) {
+            entered_mouseClicked_2 = true;
+            __mouseClicked( __swiftObject, e);
+            entered_mouseClicked_2 = false;
+        }
+        else
+            super.mouseClicked( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseDragged(java.awt.event.MouseEvent)
+
+    public native void __mouseDragged( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseDragged_3;
+
+    public void mouseDragged( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseDragged_3 ) {
+            entered_mouseDragged_3 = true;
+            __mouseDragged( __swiftObject, e);
+            entered_mouseDragged_3 = false;
+        }
+        else
+            super.mouseDragged( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseEntered(java.awt.event.MouseEvent)
+
+    public native void __mouseEntered( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseEntered_4;
+
+    public void mouseEntered( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseEntered_4 ) {
+            entered_mouseEntered_4 = true;
+            __mouseEntered( __swiftObject, e);
+            entered_mouseEntered_4 = false;
+        }
+        else
+            super.mouseEntered( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseExited(java.awt.event.MouseEvent)
+
+    public native void __mouseExited( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseExited_5;
+
+    public void mouseExited( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseExited_5 ) {
+            entered_mouseExited_5 = true;
+            __mouseExited( __swiftObject, e);
+            entered_mouseExited_5 = false;
+        }
+        else
+            super.mouseExited( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseMoved(java.awt.event.MouseEvent)
+
+    public native void __mouseMoved( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseMoved_6;
+
+    public void mouseMoved( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseMoved_6 ) {
+            entered_mouseMoved_6 = true;
+            __mouseMoved( __swiftObject, e);
+            entered_mouseMoved_6 = false;
+        }
+        else
+            super.mouseMoved( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mousePressed(java.awt.event.MouseEvent)
+
+    public native void __mousePressed( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mousePressed_7;
+
+    public void mousePressed( java.awt.event.MouseEvent e ) {
+        if ( !entered_mousePressed_7 ) {
+            entered_mousePressed_7 = true;
+            __mousePressed( __swiftObject, e);
+            entered_mousePressed_7 = false;
+        }
+        else
+            super.mousePressed( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseReleased(java.awt.event.MouseEvent)
+
+    public native void __mouseReleased( long __swiftObject, java.awt.event.MouseEvent e );
+
+    boolean entered_mouseReleased_8;
+
+    public void mouseReleased( java.awt.event.MouseEvent e ) {
+        if ( !entered_mouseReleased_8 ) {
+            entered_mouseReleased_8 = true;
+            __mouseReleased( __swiftObject, e);
+            entered_mouseReleased_8 = false;
+        }
+        else
+            super.mouseReleased( e );
+    }
+
+    /// public void java.awt.event.MouseAdapter.mouseWheelMoved(java.awt.event.MouseWheelEvent)
+
+    public native void __mouseWheelMoved( long __swiftObject, java.awt.event.MouseWheelEvent e );
+
+    boolean entered_mouseWheelMoved_9;
+
+    public void mouseWheelMoved( java.awt.event.MouseWheelEvent e ) {
+        if ( !entered_mouseWheelMoved_9 ) {
+            entered_mouseWheelMoved_9 = true;
+            __mouseWheelMoved( __swiftObject, e);
+            entered_mouseWheelMoved_9 = false;
+        }
+        else
+            super.mouseWheelMoved( e );
+    }
+
+    /// public java.lang.String java.lang.Object.toString()
+
+    public native java.lang.String __toString( long __swiftObject );
+
+    boolean entered_toString_10;
+
+    public java.lang.String toString() {
+        if ( !entered_toString_10 ) {
+            entered_toString_10 = true;
+            java.lang.String __return = __toString( __swiftObject );
+            entered_toString_10 = false;
+            return __return;
+        }
+        else
+            return super.toString( );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/MouseInputListenerProxy.java b/src/org/swiftjava/javax_swing/MouseInputListenerProxy.java
new file mode 100644
index 0000000..f6c3119
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/MouseInputListenerProxy.java
@@ -0,0 +1,80 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.MouseInputListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class MouseInputListenerProxy implements javax.swing.event.MouseInputListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    MouseInputListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void java.awt.event.MouseListener.mouseClicked(java.awt.event.MouseEvent)
+
+    public native void __mouseClicked( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseClicked( java.awt.event.MouseEvent e ) {
+        __mouseClicked( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.MouseMotionListener.mouseDragged(java.awt.event.MouseEvent)
+
+    public native void __mouseDragged( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseDragged( java.awt.event.MouseEvent e ) {
+        __mouseDragged( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.MouseListener.mouseEntered(java.awt.event.MouseEvent)
+
+    public native void __mouseEntered( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseEntered( java.awt.event.MouseEvent e ) {
+        __mouseEntered( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.MouseListener.mouseExited(java.awt.event.MouseEvent)
+
+    public native void __mouseExited( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseExited( java.awt.event.MouseEvent e ) {
+        __mouseExited( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.MouseMotionListener.mouseMoved(java.awt.event.MouseEvent)
+
+    public native void __mouseMoved( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseMoved( java.awt.event.MouseEvent e ) {
+        __mouseMoved( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.MouseListener.mousePressed(java.awt.event.MouseEvent)
+
+    public native void __mousePressed( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mousePressed( java.awt.event.MouseEvent e ) {
+        __mousePressed( __swiftObject, e );
+    }
+
+    /// public abstract void java.awt.event.MouseListener.mouseReleased(java.awt.event.MouseEvent)
+
+    public native void __mouseReleased( long __swiftObject, java.awt.event.MouseEvent e );
+
+    public void mouseReleased( java.awt.event.MouseEvent e ) {
+        __mouseReleased( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/javax_swing/PlainDocumentProxy.java b/src/org/swiftjava/javax_swing/PlainDocumentProxy.java
similarity index 57%
rename from src/org/genie/javax_swing/PlainDocumentProxy.java
rename to src/org/swiftjava/javax_swing/PlainDocumentProxy.java
index af33b16..b031b28 100644
--- a/src/org/genie/javax_swing/PlainDocumentProxy.java
+++ b/src/org/swiftjava/javax_swing/PlainDocumentProxy.java
@@ -1,40 +1,50 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// class javax.swing.text.PlainDocument ///
 
-package org.genie.javax_swing;
+package org.swiftjava.javax_swing;
 
+@SuppressWarnings("JniMissingFunction")
 public class PlainDocumentProxy extends javax.swing.text.PlainDocument {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
     /// public javax.swing.text.PlainDocument()
 
-    PlainDocumentProxy( long swiftObject ) {
+    PlainDocumentProxy( long __swiftObject ) {
         super( );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public javax.swing.text.PlainDocument(javax.swing.text.AbstractDocument$Content)
 
-    PlainDocumentProxy( javax.swing.text.AbstractDocument.Content c , long swiftObject ) {
+    PlainDocumentProxy( javax.swing.text.AbstractDocument.Content c , long __swiftObject ) {
         super( c );
-        this.swiftObject = swiftObject;
+        this.__swiftObject = __swiftObject;
     }
 
     /// public void javax.swing.text.PlainDocument.insertString(int,java.lang.String,javax.swing.text.AttributeSet) throws javax.swing.text.BadLocationException
 
-    public native void __insertString( int offs, java.lang.String str, javax.swing.text.AttributeSet a );
+    public native void __insertString( long __swiftObject, int offs, java.lang.String str, javax.swing.text.AttributeSet a );
 
     boolean entered_insertString_0;
 
     public void insertString( int offs, java.lang.String str, javax.swing.text.AttributeSet a ) throws javax.swing.text.BadLocationException {
         if ( !entered_insertString_0 ) {
             entered_insertString_0 = true;
-            __insertString( offs, str, a );
+            __insertString( __swiftObject, offs, str, a);
             entered_insertString_0 = false;
         }
         else
             super.insertString( offs, str, a );
     }
 
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
 }
diff --git a/src/org/swiftjava/javax_swing/PopupMenuListenerProxy.java b/src/org/swiftjava/javax_swing/PopupMenuListenerProxy.java
new file mode 100644
index 0000000..9a34a32
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/PopupMenuListenerProxy.java
@@ -0,0 +1,48 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.PopupMenuListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class PopupMenuListenerProxy implements javax.swing.event.PopupMenuListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    PopupMenuListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.PopupMenuListener.popupMenuCanceled(javax.swing.event.PopupMenuEvent)
+
+    public native void __popupMenuCanceled( long __swiftObject, javax.swing.event.PopupMenuEvent e );
+
+    public void popupMenuCanceled( javax.swing.event.PopupMenuEvent e ) {
+        __popupMenuCanceled( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.PopupMenuListener.popupMenuWillBecomeInvisible(javax.swing.event.PopupMenuEvent)
+
+    public native void __popupMenuWillBecomeInvisible( long __swiftObject, javax.swing.event.PopupMenuEvent e );
+
+    public void popupMenuWillBecomeInvisible( javax.swing.event.PopupMenuEvent e ) {
+        __popupMenuWillBecomeInvisible( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.PopupMenuListener.popupMenuWillBecomeVisible(javax.swing.event.PopupMenuEvent)
+
+    public native void __popupMenuWillBecomeVisible( long __swiftObject, javax.swing.event.PopupMenuEvent e );
+
+    public void popupMenuWillBecomeVisible( javax.swing.event.PopupMenuEvent e ) {
+        __popupMenuWillBecomeVisible( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/RowSorterListenerProxy.java b/src/org/swiftjava/javax_swing/RowSorterListenerProxy.java
new file mode 100644
index 0000000..dcc1317
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/RowSorterListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.RowSorterListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class RowSorterListenerProxy implements javax.swing.event.RowSorterListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    RowSorterListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.RowSorterListener.sorterChanged(javax.swing.event.RowSorterEvent)
+
+    public native void __sorterChanged( long __swiftObject, javax.swing.event.RowSorterEvent e );
+
+    public void sorterChanged( javax.swing.event.RowSorterEvent e ) {
+        __sorterChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/javax_swing/TableColumnModelListenerProxy.java b/src/org/swiftjava/javax_swing/TableColumnModelListenerProxy.java
similarity index 50%
rename from src/org/genie/javax_swing/TableColumnModelListenerProxy.java
rename to src/org/swiftjava/javax_swing/TableColumnModelListenerProxy.java
index d1021ce..3a2e12a 100644
--- a/src/org/genie/javax_swing/TableColumnModelListenerProxy.java
+++ b/src/org/swiftjava/javax_swing/TableColumnModelListenerProxy.java
@@ -1,54 +1,64 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// interface javax.swing.event.TableColumnModelListener ///
 
-package org.genie.javax_swing;
+package org.swiftjava.javax_swing;
 
+@SuppressWarnings("JniMissingFunction")
 public class TableColumnModelListenerProxy implements javax.swing.event.TableColumnModelListener {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
 
-    TableColumnModelListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
+    TableColumnModelListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
     }
 
     /// public abstract void javax.swing.event.TableColumnModelListener.columnAdded(javax.swing.event.TableColumnModelEvent)
 
-    public native void __columnAdded( javax.swing.event.TableColumnModelEvent e );
+    public native void __columnAdded( long __swiftObject, javax.swing.event.TableColumnModelEvent e );
 
     public void columnAdded( javax.swing.event.TableColumnModelEvent e ) {
-        __columnAdded( e );
+        __columnAdded( __swiftObject, e );
     }
 
-    /// public abstract void javax.swing.event.TableColumnModelListener.columnRemoved(javax.swing.event.TableColumnModelEvent)
+    /// public abstract void javax.swing.event.TableColumnModelListener.columnMarginChanged(javax.swing.event.ChangeEvent)
 
-    public native void __columnRemoved( javax.swing.event.TableColumnModelEvent e );
+    public native void __columnMarginChanged( long __swiftObject, javax.swing.event.ChangeEvent e );
 
-    public void columnRemoved( javax.swing.event.TableColumnModelEvent e ) {
-        __columnRemoved( e );
+    public void columnMarginChanged( javax.swing.event.ChangeEvent e ) {
+        __columnMarginChanged( __swiftObject, e );
     }
 
     /// public abstract void javax.swing.event.TableColumnModelListener.columnMoved(javax.swing.event.TableColumnModelEvent)
 
-    public native void __columnMoved( javax.swing.event.TableColumnModelEvent e );
+    public native void __columnMoved( long __swiftObject, javax.swing.event.TableColumnModelEvent e );
 
     public void columnMoved( javax.swing.event.TableColumnModelEvent e ) {
-        __columnMoved( e );
+        __columnMoved( __swiftObject, e );
     }
 
-    /// public abstract void javax.swing.event.TableColumnModelListener.columnMarginChanged(javax.swing.event.ChangeEvent)
+    /// public abstract void javax.swing.event.TableColumnModelListener.columnRemoved(javax.swing.event.TableColumnModelEvent)
 
-    public native void __columnMarginChanged( javax.swing.event.ChangeEvent e );
+    public native void __columnRemoved( long __swiftObject, javax.swing.event.TableColumnModelEvent e );
 
-    public void columnMarginChanged( javax.swing.event.ChangeEvent e ) {
-        __columnMarginChanged( e );
+    public void columnRemoved( javax.swing.event.TableColumnModelEvent e ) {
+        __columnRemoved( __swiftObject, e );
     }
 
     /// public abstract void javax.swing.event.TableColumnModelListener.columnSelectionChanged(javax.swing.event.ListSelectionEvent)
 
-    public native void __columnSelectionChanged( javax.swing.event.ListSelectionEvent e );
+    public native void __columnSelectionChanged( long __swiftObject, javax.swing.event.ListSelectionEvent e );
 
     public void columnSelectionChanged( javax.swing.event.ListSelectionEvent e ) {
-        __columnSelectionChanged( e );
+        __columnSelectionChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
     }
 
 }
diff --git a/src/org/swiftjava/javax_swing/TableModelListenerProxy.java b/src/org/swiftjava/javax_swing/TableModelListenerProxy.java
new file mode 100644
index 0000000..750a26b
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/TableModelListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.TableModelListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class TableModelListenerProxy implements javax.swing.event.TableModelListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    TableModelListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.TableModelListener.tableChanged(javax.swing.event.TableModelEvent)
+
+    public native void __tableChanged( long __swiftObject, javax.swing.event.TableModelEvent e );
+
+    public void tableChanged( javax.swing.event.TableModelEvent e ) {
+        __tableChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/TreeExpansionListenerProxy.java b/src/org/swiftjava/javax_swing/TreeExpansionListenerProxy.java
new file mode 100644
index 0000000..8bb63f4
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/TreeExpansionListenerProxy.java
@@ -0,0 +1,40 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.TreeExpansionListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class TreeExpansionListenerProxy implements javax.swing.event.TreeExpansionListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    TreeExpansionListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.TreeExpansionListener.treeCollapsed(javax.swing.event.TreeExpansionEvent)
+
+    public native void __treeCollapsed( long __swiftObject, javax.swing.event.TreeExpansionEvent event );
+
+    public void treeCollapsed( javax.swing.event.TreeExpansionEvent event ) {
+        __treeCollapsed( __swiftObject, event );
+    }
+
+    /// public abstract void javax.swing.event.TreeExpansionListener.treeExpanded(javax.swing.event.TreeExpansionEvent)
+
+    public native void __treeExpanded( long __swiftObject, javax.swing.event.TreeExpansionEvent event );
+
+    public void treeExpanded( javax.swing.event.TreeExpansionEvent event ) {
+        __treeExpanded( __swiftObject, event );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/TreeModelListenerProxy.java b/src/org/swiftjava/javax_swing/TreeModelListenerProxy.java
new file mode 100644
index 0000000..d5aa3de
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/TreeModelListenerProxy.java
@@ -0,0 +1,56 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.TreeModelListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class TreeModelListenerProxy implements javax.swing.event.TreeModelListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    TreeModelListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.TreeModelListener.treeNodesChanged(javax.swing.event.TreeModelEvent)
+
+    public native void __treeNodesChanged( long __swiftObject, javax.swing.event.TreeModelEvent e );
+
+    public void treeNodesChanged( javax.swing.event.TreeModelEvent e ) {
+        __treeNodesChanged( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.TreeModelListener.treeNodesInserted(javax.swing.event.TreeModelEvent)
+
+    public native void __treeNodesInserted( long __swiftObject, javax.swing.event.TreeModelEvent e );
+
+    public void treeNodesInserted( javax.swing.event.TreeModelEvent e ) {
+        __treeNodesInserted( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.TreeModelListener.treeNodesRemoved(javax.swing.event.TreeModelEvent)
+
+    public native void __treeNodesRemoved( long __swiftObject, javax.swing.event.TreeModelEvent e );
+
+    public void treeNodesRemoved( javax.swing.event.TreeModelEvent e ) {
+        __treeNodesRemoved( __swiftObject, e );
+    }
+
+    /// public abstract void javax.swing.event.TreeModelListener.treeStructureChanged(javax.swing.event.TreeModelEvent)
+
+    public native void __treeStructureChanged( long __swiftObject, javax.swing.event.TreeModelEvent e );
+
+    public void treeStructureChanged( javax.swing.event.TreeModelEvent e ) {
+        __treeStructureChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/swiftjava/javax_swing/TreeSelectionListenerProxy.java b/src/org/swiftjava/javax_swing/TreeSelectionListenerProxy.java
new file mode 100644
index 0000000..409883c
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/TreeSelectionListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.TreeSelectionListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class TreeSelectionListenerProxy implements javax.swing.event.TreeSelectionListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    TreeSelectionListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.TreeSelectionListener.valueChanged(javax.swing.event.TreeSelectionEvent)
+
+    public native void __valueChanged( long __swiftObject, javax.swing.event.TreeSelectionEvent e );
+
+    public void valueChanged( javax.swing.event.TreeSelectionEvent e ) {
+        __valueChanged( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/src/org/genie/javax_swing/TreeWillExpandListenerProxy.java b/src/org/swiftjava/javax_swing/TreeWillExpandListenerProxy.java
similarity index 50%
rename from src/org/genie/javax_swing/TreeWillExpandListenerProxy.java
rename to src/org/swiftjava/javax_swing/TreeWillExpandListenerProxy.java
index d86c320..4c04e3c 100644
--- a/src/org/genie/javax_swing/TreeWillExpandListenerProxy.java
+++ b/src/org/swiftjava/javax_swing/TreeWillExpandListenerProxy.java
@@ -1,30 +1,40 @@
 
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
 /// interface javax.swing.event.TreeWillExpandListener ///
 
-package org.genie.javax_swing;
+package org.swiftjava.javax_swing;
 
+@SuppressWarnings("JniMissingFunction")
 public class TreeWillExpandListenerProxy implements javax.swing.event.TreeWillExpandListener {
 
-    long swiftObject;
+    // address of proxy object
+    long __swiftObject;
+
+    TreeWillExpandListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.TreeWillExpandListener.treeWillCollapse(javax.swing.event.TreeExpansionEvent) throws javax.swing.tree.ExpandVetoException
+
+    public native void __treeWillCollapse( long __swiftObject, javax.swing.event.TreeExpansionEvent event );
 
-    TreeWillExpandListenerProxy( long swiftObject ) {
-        this.swiftObject = swiftObject;
+    public void treeWillCollapse( javax.swing.event.TreeExpansionEvent event ) throws javax.swing.tree.ExpandVetoException {
+        __treeWillCollapse( __swiftObject, event );
     }
 
     /// public abstract void javax.swing.event.TreeWillExpandListener.treeWillExpand(javax.swing.event.TreeExpansionEvent) throws javax.swing.tree.ExpandVetoException
 
-    public native void __treeWillExpand( javax.swing.event.TreeExpansionEvent event );
+    public native void __treeWillExpand( long __swiftObject, javax.swing.event.TreeExpansionEvent event );
 
     public void treeWillExpand( javax.swing.event.TreeExpansionEvent event ) throws javax.swing.tree.ExpandVetoException {
-        __treeWillExpand( event );
+        __treeWillExpand( __swiftObject, event );
     }
 
-    /// public abstract void javax.swing.event.TreeWillExpandListener.treeWillCollapse(javax.swing.event.TreeExpansionEvent) throws javax.swing.tree.ExpandVetoException
+    public native void __finalize( long __swiftObject );
 
-    public native void __treeWillCollapse( javax.swing.event.TreeExpansionEvent event );
-
-    public void treeWillCollapse( javax.swing.event.TreeExpansionEvent event ) throws javax.swing.tree.ExpandVetoException {
-        __treeWillCollapse( event );
+    public void finalize() {
+        __finalize( __swiftObject );
     }
 
 }
diff --git a/src/org/swiftjava/javax_swing/UndoableEditListenerProxy.java b/src/org/swiftjava/javax_swing/UndoableEditListenerProxy.java
new file mode 100644
index 0000000..bcb3085
--- /dev/null
+++ b/src/org/swiftjava/javax_swing/UndoableEditListenerProxy.java
@@ -0,0 +1,32 @@
+
+/// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
+
+/// interface javax.swing.event.UndoableEditListener ///
+
+package org.swiftjava.javax_swing;
+
+@SuppressWarnings("JniMissingFunction")
+public class UndoableEditListenerProxy implements javax.swing.event.UndoableEditListener {
+
+    // address of proxy object
+    long __swiftObject;
+
+    UndoableEditListenerProxy( long __swiftObject ) {
+        this.__swiftObject = __swiftObject;
+    }
+
+    /// public abstract void javax.swing.event.UndoableEditListener.undoableEditHappened(javax.swing.event.UndoableEditEvent)
+
+    public native void __undoableEditHappened( long __swiftObject, javax.swing.event.UndoableEditEvent e );
+
+    public void undoableEditHappened( javax.swing.event.UndoableEditEvent e ) {
+        __undoableEditHappened( __swiftObject, e );
+    }
+
+    public native void __finalize( long __swiftObject );
+
+    public void finalize() {
+        __finalize( __swiftObject );
+    }
+
+}
diff --git a/swift-android-Clibadder b/swift-android-Clibadder
new file mode 160000
index 0000000..e263f46
--- /dev/null
+++ b/swift-android-Clibadder
@@ -0,0 +1 @@
+Subproject commit e263f46164e6e26c103771430f1162af873f3047
diff --git a/swift-android-gradle b/swift-android-gradle
index f740da2..ee17299 160000
--- a/swift-android-gradle
+++ b/swift-android-gradle
@@ -1 +1 @@
-Subproject commit f740da26ddfbf400580e5fe75f89f67e49b6462c
+Subproject commit ee17299c6ca9af66048131e002b6607bfe8e78cd
diff --git a/swift-android-injection b/swift-android-injection
new file mode 160000
index 0000000..e3878b3
--- /dev/null
+++ b/swift-android-injection
@@ -0,0 +1 @@
+Subproject commit e3878b355b41fb6c76083cf72987c534e40c125a
diff --git a/swift-android-kotlin b/swift-android-kotlin
new file mode 160000
index 0000000..5514cf5
--- /dev/null
+++ b/swift-android-kotlin
@@ -0,0 +1 @@
+Subproject commit 5514cf5c8da9609793470b384d991ffeb7a11281
diff --git a/swift-android-opengl b/swift-android-opengl
new file mode 160000
index 0000000..a9ed0c8
--- /dev/null
+++ b/swift-android-opengl
@@ -0,0 +1 @@
+Subproject commit a9ed0c8331f93d78792a29f686344092323acee4
diff --git a/swift-android-samples b/swift-android-samples
index c2542ce..fb0c53b 160000
--- a/swift-android-samples
+++ b/swift-android-samples
@@ -1 +1 @@
-Subproject commit c2542ce5b33d7f04eccabeb7631f8190e336f9a8
+Subproject commit fb0c53b782fdfd6505d6cc7f3c6dbc85c8c3b5cb
diff --git a/swift-android-zlib b/swift-android-zlib
new file mode 160000
index 0000000..f2b83e7
--- /dev/null
+++ b/swift-android-zlib
@@ -0,0 +1 @@
+Subproject commit f2b83e7c40bb8b0bb742dedc5a331ed306d67ad1
diff --git a/swiftjava.jar b/swiftjava.jar
new file mode 100644
index 0000000..894c62c
Binary files /dev/null and b/swiftjava.jar differ