Rework for use with toolchain beta 2

johnno1962 · johnno1962 · commit eac35bda3173 · 2017-08-20T13:29:51.000+01:00
diff --git a/Package.swift b/Package.swift
@@ -3,6 +3,6 @@ import PackageDescription
 let package = Package(
     name: "examples",
     dependencies: [
-        .Package(url: "https://github.com/SwiftJava/javax_swing.git", versions: Version(2,0,0)..<Version(3,0,0)),
+        .Package(url: "https://github.com/SwiftJava/javax_swing.git", versions: Version(2,1,0)..<Version(3,0,0)),
         ]
 )
diff --git a/Sources/JComboBox.swift b/Sources/JComboBox.swift
@@ -63,7 +63,7 @@ class AutoComplete: JComboBox
             {
                 //	System.out.println(lap)
                 // Kam nie hier vorbei.
-                if(cBox.lap + 1000 < now) {
+                if(Int64(cBox.lap) + 1000 < now) {
                     cBox.searchFor = "" + aKey
                 }
                 else {
diff --git a/Sources/main.swift b/Sources/main.swift
@@ -1,26 +1,25 @@
 //
 //  main.swift
-//  awt2
+//  examples
 //
 //  Created by John Holdsworth on 20/07/2016.
 //  Copyright (c) 2016 John Holdsworth. All rights reserved.
 //
 
-import Foundation
 import java_lang
 import java_util
 import java_awt
 import javax_swing
 
-print( Runtime.getRuntime().javaObject )
-print( Runtime.getRuntime().maxMemory() )
+print( String(describing: Runtime.getRuntime().javaObject) )
+print( String(describing: Runtime.getRuntime().maxMemory()) )
 let e = java_lang.Exception("JKKH")
-print( e.javaObject )
-print( ClassNotFoundException(casting: e) )
-print( Throwable(casting: e) )
-print( Exception(casting: e) )
-print( JavaClass(casting: e) )
-print( System.getenv("HOME"))
+print( String(describing: e.javaObject) )
+print( String(describing: ClassNotFoundException(casting: e)) )
+print( String(describing: Throwable(casting: e)) )
+print( String(describing: Exception(casting: e)) )
+print( String(describing: JavaClass(casting: e)) )
+print( String(describing: System.getenv("HOME")) )
 print( System.getProperty("java.class.path") )
 print( System.getProperty("java.version") )
 print( System.getProperty("java.vendor") )
@@ -59,7 +58,7 @@ JNI.background {
 }
 
 JNI.background {
-    let myExample = SimpleJTreeExample( "Simple JTree Example" )
+    _ = SimpleJTreeExample( "Simple JTree Example" )
 }
 
 JNI.background {
@@ -76,7 +75,7 @@ Thread( {
 } ).start()
 
 JNI.background {
-    let philosophersFrame = PhilosophersJList()
+    _ = PhilosophersJList()
 }
 
 JNI.background {
@@ -101,7 +100,7 @@ JNI.background {
     f.setSize(200,300)
     let cp = f.getContentPane()!
     cp.setLayout(nil)
-    //        let names = ["Beate", "Claudia", "Fjodor", "Fred", "Friedrich",	"Fritz", "Frodo", "Hermann", "Willi"]
+    //        let names = ["Beate", "Claudia", "Fjodor", "Fred", "Friedrich",    "Fritz", "Frodo", "Hermann", "Willi"]
     //        cBox = AutoComplete(items: names.map { JavaString( $0 ) })
     let locales = JavaLocale.getAvailableLocales()!//
     cBox = AutoComplete(items: locales)

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ import PackageDescription`
`3`	`3`	`let package = Package(`
`4`	`4`	`name: "examples",`
`5`	`5`	`dependencies: [`
`6`		`- .Package(url: "https://github.com/SwiftJava/javax_swing.git", versions: Version(2,0,0)..<Version(3,0,0)),`
	`6`	`+ .Package(url: "https://github.com/SwiftJava/javax_swing.git", versions: Version(2,1,0)..<Version(3,0,0)),`
`7`	`7`	`]`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class AutoComplete: JComboBox`
`63`	`63`	`{`
`64`	`64`	`// System.out.println(lap)`
`65`	`65`	`// Kam nie hier vorbei.`
`66`		`- if(cBox.lap + 1000 < now) {`
	`66`	`+ if(Int64(cBox.lap) + 1000 < now) {`
`67`	`67`	`cBox.searchFor = "" + aKey`
`68`	`68`	`}`
`69`	`69`	`else {`