Minor update

johnno1962 · johnno1962 · commit 3c1085356d0f · 2016-08-22T21:42:34.000+01:00
diff --git a/CJavaVM b/CJavaVM
@@ -1 +1 @@
-Subproject commit 81db307ef23f62643807fb32a2ec712466750d63
+Subproject commit 5ba8c2887bff82cc962d371189bfc40bbafac1e1
diff --git a/JDBC/AppDelegate.swift b/JDBC/AppDelegate.swift
@@ -61,7 +61,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
             return
         }
 
-        // Use Thread class to run in background to get the correct class loaderwith& classpath
+        // Use Thread class to run in background to get the correct class loader & classpath
         Thread( {
 
             do {
diff --git 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&uuml;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&uuml;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,7 +45,7 @@ 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:
 
@@ -57,7 +57,7 @@ runloop. Use the JNI.background and JNI.run methods to achieve this in a portabl
 
 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
@@ -108,7 +108,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/genie/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 +144,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.
@@ -176,11 +176,11 @@ 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 
+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.
+also be prompted to provide a null implementation of the "required" initialiser.
 
 ```Swift
     init(imageProducer:ImageProducer) {
diff --git a/SwiftJava.xcodeproj/project.pbxproj b/SwiftJava.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	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 */; };
 		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 */; };
@@ -720,7 +719,6 @@
 				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 */,
diff --git a/com_apple b/com_apple
@@ -1 +1 @@
-Subproject commit 875316c11370148f149d345f75a1e8b5133c32a4
+Subproject commit 06858e4c06f4ee1202ce9de9775af3a2db6adf4a
diff --git a/genie.jar b/genie.jar
diff --git a/genpkg.sh b/genpkg.sh
@@ -5,7 +5,7 @@
 
 cd `dirname $0`
 
-XCODEBUILD=/Applications/Xcode-beta5.app/Contents/Developer/usr/bin/xcodebuild
+XCODEBUILD=/Applications/Xcode-beta6.app/Contents/Developer/usr/bin/xcodebuild
 
 for i in $*; do
     ./genswift.sh $i
diff --git a/java_awt b/java_awt
@@ -1 +1 @@
-Subproject commit e83f00c1aa00553fa50559774aa3065c67eb1589
+Subproject commit 284ce91c85d618a306c5144b76511fdfd6c2746a
diff --git a/java_lang b/java_lang
@@ -1 +1 @@
-Subproject commit 4269b304b151659c362796ca62a81f990294f1e6
+Subproject commit 1c8dac20012c68f8d0f5eef0a9f05f16180039cf
diff --git a/java_sql b/java_sql
@@ -1 +1 @@
-Subproject commit 95c04d4b16c574acd3f24e0006fd364846f5ab10
+Subproject commit c3251d5e2a49e9a4e52044ff70712f1a0615553b
diff --git a/java_swift b/java_swift
@@ -1 +1 @@
-Subproject commit 175097a5dcb3705f381907e6f65de089c258f6df
+Subproject commit ce6936c34a55d269744ef93b6906d59ffe764415
diff --git a/java_util b/java_util
@@ -1 +1 @@
-Subproject commit 1b4edad33d6cfdfa9c47eda3124e124126311e91
+Subproject commit 8109287f96d41f7a3c05af5b01fea9a8be223c51
diff --git a/javax_swing b/javax_swing
@@ -1 +1 @@
-Subproject commit 7bfa3436c6d6764bee0df0a1c4eaa1d62a9e10cb
+Subproject commit 4a1750ab5e9c64cd82773d5c5b38259f1942d4fc
diff --git 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/genswift.java b/src/genswift.java
@@ -13,6 +13,33 @@
 //  the ordering is found by processing all files then re-processing
 //  after reordering to minimise the number of forward references in
 //  the generated code.
+//
+//  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".
+//
+//  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 is
+//  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
+//  ~/.genie.jar built from these generated sources using ../genjar.sh.
+//
 
 import java.io.*;
 import java.util.HashMap;
@@ -682,6 +709,7 @@ boolean generateMethods( Method methods[], boolean isProtocol, HashMap<String,Bo
 			interfaceMethods.remove(methodKey);
 
 			boolean createBody = !isListenerBase || !isInterface;
+			boolean notVoid = notVoid(method.getReturnType());
 
 			if ( !(isProtocol && argumentsOfProtocolRenamed( clazz )) ) {
 				if ( !isProtocol && (!isListenerBase || !isInterface) )
@@ -703,7 +731,7 @@ boolean generateMethods( Method methods[], boolean isProtocol, HashMap<String,Bo
                         code.append( functionHeader( method.getParameters(), interfaceMethod, 0 ) );
 
                         code.append( "        " );
-                        if ( notVoid(method.getReturnType()) ) 
+                        if ( notVoid ) 
                             code.append( "let __return = " );
 
                     	String methodArgs = 
@@ -718,20 +746,17 @@ boolean generateMethods( Method methods[], boolean isProtocol, HashMap<String,Bo
                     	if ( canThrow )
                     		addThrowCode( method );
 
-                    	if (notVoid(method.getReturnType()))
+                    	if ( notVoid )
                     		code.append("        return "+decoder( "__return", method.getReturnType())+"\n");
                     }
-                    else if ( createsNameless ) {
+					else if ( notVoid(method.getReturnType()) ) {
                     	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");
-                    }
+                    		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\n");
                 }
@@ -752,17 +777,8 @@ else if ( createsNameless ) {
 					code.append("\n");
 				else {
 					code.append(" {\n");
-					if ( createBody )
-						code.append("        "+(notVoid(method.getReturnType())?"return ":"")+(canThrow?"try ":"")+
+					code.append("        "+(notVoid?"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" );
 				}
 			}
@@ -796,8 +812,8 @@ void generateCallbackBase( HashMap<String,Boolean> fieldsSeen, Method responsibl
 			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()?"!":"");
+				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 )
@@ -810,7 +826,7 @@ void generateCallbackBase( HashMap<String,Boolean> fieldsSeen, Method responsibl
 			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");
+						"/*JNI.api.NewWeakGlobalRef( JNI.env,*/ __return?.javaObject /*)*/")+"\n");
 
 			code.append("}\n");
 			if ( crashesCompilerOnLinx( method ) )
diff --git a/src/org/genie/com_apple/ApplicationAdapterProxy.java b/src/org/genie/com_apple/ApplicationAdapterProxy.java
diff --git a/src/org/genie/com_apple/ApplicationListenerProxy.java b/src/org/genie/com_apple/ApplicationListenerProxy.java
diff --git a/src/org/genie/java_awt/DragSourceAdapterProxy.java b/src/org/genie/java_awt/DragSourceAdapterProxy.java
diff --git a/src/org/genie/java_awt/DragSourceListenerProxy.java b/src/org/genie/java_awt/DragSourceListenerProxy.java
diff --git a/src/org/genie/javax_swing/DefaultTableModelProxy.java b/src/org/genie/javax_swing/DefaultTableModelProxy.java

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab`
`61`	`61`	`return`
`62`	`62`	`}`
`63`	`63`
`64`		`- // Use Thread class to run in background to get the correct class loaderwith& classpath`
	`64`	`+ // Use Thread class to run in background to get the correct class loader & classpath`
`65`	`65`	`Thread( {`
`66`	`66`
`67`	`67`	`do {`