with withExtendedLifetime

johnno1962 · johnno1962 · commit 7f911f0d2389 · 2016-09-23T13:31:02.000+01:00
diff --git a/README.md b/README.md
@@ -178,13 +178,16 @@ a Base class and Proxy is generated for the concrete class that can be subclasse
 
 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
+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
     init(imageProducer:ImageProducer) {
-        super.init( javaObject: CanvasBase().takeJavaObject )
+        super.init(javaObject: nil)
+        withExtendedLifetime(CanvasBase()) {
+            javaObject = $0.javaObject
+        }
         image = createImage(imageProducer)
     }
 
diff --git a/com_apple b/com_apple
@@ -1 +1 @@
-Subproject commit 59f2d9dc82dbac70e07204725930f0300b189a87
+Subproject commit e99aea0e05033478dee00aa96f7ac23580e92120
diff --git a/examples b/examples
@@ -1 +1 @@
-Subproject commit 3802e1e2e946e1d27a3ae947dccb54156e37d6e6
+Subproject commit becbcef7bb3f11c52b68700883442c222841d28a
diff --git a/genie.jar b/genie.jar
diff --git a/java_awt b/java_awt
@@ -1 +1 @@
-Subproject commit 1e7543d7fa947d4d5692d75c53cae092cab88c17
+Subproject commit 4c99fd3d24e6e2ad9143ee8977b4c36eb6876e5a
diff --git a/java_lang b/java_lang
@@ -1 +1 @@
-Subproject commit 25abc381c0cc3dbf2e8d197e9916e3d4b78ae179
+Subproject commit 777dbd5bacb2ad9f847e1624138d9d019e9f025e
diff --git a/java_sql b/java_sql
@@ -1 +1 @@
-Subproject commit 9fc006fcca378b82828bce953b0b7bb2cce03663
+Subproject commit 62273bad7c8a3a46138ed8ed5e615441cc8af311
diff --git a/java_swift b/java_swift
@@ -1 +1 @@
-Subproject commit db183128e513c53beb12c1cc260abf31608533b1
+Subproject commit 54c1acf04f2db0a1b0c4895dc77abbaa0203c117
diff --git a/java_util b/java_util
@@ -1 +1 @@
-Subproject commit 943121fbd275ed48ac86c5755f7c386514ebe29a
+Subproject commit c3390d2e4b3e9c8dcf8d518493c5cf0794dbcf25
diff --git a/javax_swing b/javax_swing
@@ -1 +1 @@
-Subproject commit 1affb8ba21d4ea6dcacb975fb5a7bc331a8b6e86
+Subproject commit ff7e6f753c8a455c31219d1a65f7fe9cf10ebff5
diff --git a/src/genswift.java b/src/genswift.java
@@ -431,9 +431,14 @@ boolean generate() throws Exception {
 
 		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("        self.init( javaObject: nil )\n" );
 			code.append("        if !object.validDownCast( toJavaClass: \""+className+"\", file, line ) {\n" );
-			code.append("            return nil\n        }\n    }\n\n" );
+			code.append("            return nil\n");
+			code.append("        }\n");
+			code.append("        withExtendedLifetime( object ) {\n");
+			code.append("            javaObject = object.javaObject\n");
+			code.append("        }\n");
+			code.append("    }\n\n" );
 		}
 
 		classCacheVar = classSuffix+"JNIClass";
diff --git a/src/org/genie/com_apple/ApplicationAdapterProxy.java b/src/org/genie/com_apple/ApplicationAdapterProxy.java
@@ -14,17 +14,49 @@ public class ApplicationAdapterProxy extends com.apple.eawt.ApplicationAdapter {
         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_0;
+    boolean entered_handleOpenApplication_2;
 
     public void handleOpenApplication( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handleOpenApplication_0 ) {
-            entered_handleOpenApplication_0 = true;
+        if ( !entered_handleOpenApplication_2 ) {
+            entered_handleOpenApplication_2 = true;
             __handleOpenApplication( arg0 );
-            entered_handleOpenApplication_0 = false;
+            entered_handleOpenApplication_2 = false;
         }
         else
             super.handleOpenApplication( arg0 );
@@ -34,13 +66,13 @@ public void handleOpenApplication( com.apple.eawt.ApplicationEvent arg0 ) {
 
     public native void __handleOpenFile( com.apple.eawt.ApplicationEvent arg0 );
 
-    boolean entered_handleOpenFile_1;
+    boolean entered_handleOpenFile_3;
 
     public void handleOpenFile( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handleOpenFile_1 ) {
-            entered_handleOpenFile_1 = true;
+        if ( !entered_handleOpenFile_3 ) {
+            entered_handleOpenFile_3 = true;
             __handleOpenFile( arg0 );
-            entered_handleOpenFile_1 = false;
+            entered_handleOpenFile_3 = false;
         }
         else
             super.handleOpenFile( arg0 );
@@ -50,13 +82,13 @@ public void handleOpenFile( com.apple.eawt.ApplicationEvent arg0 ) {
 
     public native void __handlePrintFile( com.apple.eawt.ApplicationEvent arg0 );
 
-    boolean entered_handlePrintFile_2;
+    boolean entered_handlePrintFile_4;
 
     public void handlePrintFile( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handlePrintFile_2 ) {
-            entered_handlePrintFile_2 = true;
+        if ( !entered_handlePrintFile_4 ) {
+            entered_handlePrintFile_4 = true;
             __handlePrintFile( arg0 );
-            entered_handlePrintFile_2 = false;
+            entered_handlePrintFile_4 = false;
         }
         else
             super.handlePrintFile( arg0 );
@@ -66,13 +98,13 @@ public void handlePrintFile( com.apple.eawt.ApplicationEvent arg0 ) {
 
     public native void __handleQuit( com.apple.eawt.ApplicationEvent arg0 );
 
-    boolean entered_handleQuit_3;
+    boolean entered_handleQuit_5;
 
     public void handleQuit( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handleQuit_3 ) {
-            entered_handleQuit_3 = true;
+        if ( !entered_handleQuit_5 ) {
+            entered_handleQuit_5 = true;
             __handleQuit( arg0 );
-            entered_handleQuit_3 = false;
+            entered_handleQuit_5 = false;
         }
         else
             super.handleQuit( arg0 );
@@ -82,50 +114,18 @@ public void handleQuit( com.apple.eawt.ApplicationEvent arg0 ) {
 
     public native void __handleReOpenApplication( com.apple.eawt.ApplicationEvent arg0 );
 
-    boolean entered_handleReOpenApplication_4;
+    boolean entered_handleReOpenApplication_6;
 
     public void handleReOpenApplication( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handleReOpenApplication_4 ) {
-            entered_handleReOpenApplication_4 = true;
+        if ( !entered_handleReOpenApplication_6 ) {
+            entered_handleReOpenApplication_6 = true;
             __handleReOpenApplication( arg0 );
-            entered_handleReOpenApplication_4 = false;
+            entered_handleReOpenApplication_6 = false;
         }
         else
             super.handleReOpenApplication( arg0 );
     }
 
-    /// public void com.apple.eawt.ApplicationAdapter.handleAbout(com.apple.eawt.ApplicationEvent)
-
-    public native void __handleAbout( com.apple.eawt.ApplicationEvent arg0 );
-
-    boolean entered_handleAbout_5;
-
-    public void handleAbout( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handleAbout_5 ) {
-            entered_handleAbout_5 = true;
-            __handleAbout( arg0 );
-            entered_handleAbout_5 = 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_6;
-
-    public void handlePreferences( com.apple.eawt.ApplicationEvent arg0 ) {
-        if ( !entered_handlePreferences_6 ) {
-            entered_handlePreferences_6 = true;
-            __handlePreferences( arg0 );
-            entered_handlePreferences_6 = false;
-        }
-        else
-            super.handlePreferences( arg0 );
-    }
-
     /// public boolean java.lang.Object.equals(java.lang.Object)
 
     public native boolean __equals( java.lang.Object arg0 );
diff --git a/src/org/genie/com_apple/ApplicationListenerProxy.java b/src/org/genie/com_apple/ApplicationListenerProxy.java
@@ -11,6 +11,22 @@ public class ApplicationListenerProxy implements com.apple.eawt.ApplicationListe
         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 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 );
+    }
+
     /// public abstract void com.apple.eawt.ApplicationListener.handleOpenApplication(com.apple.eawt.ApplicationEvent)
 
     public native void __handleOpenApplication( com.apple.eawt.ApplicationEvent arg0 );
@@ -51,20 +67,4 @@ public void handleReOpenApplication( com.apple.eawt.ApplicationEvent arg0 ) {
         __handleReOpenApplication( arg0 );
     }
 
-    /// public abstract void com.apple.eawt.ApplicationListener.handleAbout(com.apple.eawt.ApplicationEvent)
-
-    public native void __handleAbout( 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 );
-    }
-
 }
diff --git a/src/org/genie/javax_swing/DefaultTableModelProxy.java b/src/org/genie/javax_swing/DefaultTableModelProxy.java
@@ -35,17 +35,17 @@ public class DefaultTableModelProxy extends javax.swing.table.DefaultTableModel
         this.swiftObject = swiftObject;
     }
 
-    /// public javax.swing.table.DefaultTableModel()
+    /// public javax.swing.table.DefaultTableModel(int,int)
 
-    DefaultTableModelProxy( long swiftObject ) {
-        super( );
+    DefaultTableModelProxy( int rowCount, int columnCount , long swiftObject ) {
+        super( rowCount, columnCount );
         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 );
+    DefaultTableModelProxy( long swiftObject ) {
+        super( );
         this.swiftObject = swiftObject;
     }
 
diff --git a/swift-android-gradle b/swift-android-gradle
@@ -1 +1 @@
-Subproject commit 18988f6e951ac0dd2b8c4c2a13c18ba124806b4d
+Subproject commit 8b82d82afa46d96c5f36489ca88ec2969f427f4d
