Updated for Version 2

Author: johnno1962

LICENSE

@@ -1,10 +1,12 @@
 
-This representation of the Java apis is generated from the Apple distribution of the Java VM
-which are provided under the provisions of "Fair Use" but your use is ultimately subject
-to the original License Agreement.
+This representation of the Java apis is 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
 
 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.
+

Package.swift

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

Sources/AbstractCollection.swift

@@ -4,18 +4,12 @@ import java_lang
 
 /// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
 
-/// JAVA_HOME: /Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home ///
-/// Tue Dec 20 11:30:06 GMT 2016 ///
-
 /// class java.util.concurrent.locks.AbstractOwnableSynchronizer ///
 
-open class AbstractOwnableSynchronizer: java_lang.JavaObject, /* java.io.Serializable */ UnclassedProtocol {
+open class AbstractOwnableSynchronizer: java_swift.JavaObject, /* java.io.Serializable */ UnclassedProtocol {
 
-    public convenience init?( casting object: java_lang.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
+    public convenience init?( casting object: java_swift.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
         self.init( javaObject: nil )
-        if !object.validDownCast( toJavaClass: "java.util.concurrent.locks.AbstractOwnableSynchronizer", file, line ) {
-            return nil
-        }
         object.withJavaObject {
             self.javaObject = $0
         }
@@ -43,15 +37,15 @@ open class AbstractOwnableSynchronizer: java_lang.JavaObject, /* java.io.Seriali
 
     private static var setExclusiveOwnerThread_MethodID_2: jmethodID?
 
-    open func setExclusiveOwnerThread( arg0: java_lang.Thread? ) {
+    open func setExclusiveOwnerThread( thread: java_lang.Thread? ) {
         var __args = [jvalue]( repeating: jvalue(), count: 1 )
         var __locals = [jobject]()
-        __args[0] = JNIType.encode( value: arg0, locals: &__locals )
+        __args[0] = JNIType.toJava( value: thread != nil ? thread! as JNIObject : nil, locals: &__locals )
         JNIMethod.CallVoidMethod( object: javaObject, methodName: "setExclusiveOwnerThread", methodSig: "(Ljava/lang/Thread;)V", methodCache: &AbstractOwnableSynchronizer.setExclusiveOwnerThread_MethodID_2, args: &__args, locals: &__locals )
     }
 
-    open func setExclusiveOwnerThread( _ _arg0: java_lang.Thread? ) {
-        setExclusiveOwnerThread( arg0: _arg0 )
+    open func setExclusiveOwnerThread( _ _thread: java_lang.Thread? ) {
+        setExclusiveOwnerThread( thread: _thread )
     }
 
     /// protected final java.lang.Thread java.util.concurrent.locks.AbstractOwnableSynchronizer.getExclusiveOwnerThread()
@@ -68,3 +62,4 @@ open class AbstractOwnableSynchronizer: java_lang.JavaObject, /* java.io.Seriali
 
 
 }
+

Sources/AbstractExecutorService.swift

@@ -1,28 +1,23 @@
 
 import java_swift
-import java_lang
 
 /// generated by: genswift.java 'java/lang|java/util|java/sql|java/awt|javax/swing' ///
 
-/// JAVA_HOME: /Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home ///
-/// Tue Dec 20 11:29:42 GMT 2016 ///
-
 /// class java.util.AbstractQueue ///
 
 open class AbstractQueue: AbstractCollection, Queue {
 
-    public convenience init?( casting object: java_lang.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
+    public convenience init?( casting object: java_swift.JavaObject, _ file: StaticString = #file, _ line: Int = #line ) {
         self.init( javaObject: nil )
-        if !object.validDownCast( toJavaClass: "java.util.AbstractQueue", file, line ) {
-            return nil
-        }
         object.withJavaObject {
             self.javaObject = $0
         }
     }
 
     private static var AbstractQueueJNIClass: jclass?
 
+    /// private static final int java.util.AbstractCollection.MAX_ARRAY_SIZE
+
     /// protected java.util.AbstractQueue()
 
     private static var new_MethodID_1: jmethodID?
@@ -37,108 +32,133 @@ open class AbstractQueue: AbstractCollection, Queue {
 
     /// public boolean java.util.AbstractQueue.add(java.lang.Object)
 
-    /// public void java.util.AbstractQueue.clear()
-
-    /// public boolean java.util.AbstractQueue.addAll(java.util.Collection)
-
     /// public java.lang.Object java.util.AbstractQueue.remove()
 
     private static var remove_MethodID_2: jmethodID?
 
-    open func remove() -> java_lang.JavaObject! {
+    open func remove() -> java_swift.JavaObject! {
         var __args = [jvalue]( repeating: jvalue(), count: 1 )
         var __locals = [jobject]()
         let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "remove", methodSig: "()Ljava/lang/Object;", methodCache: &AbstractQueue.remove_MethodID_2, args: &__args, locals: &__locals )
         defer { JNI.DeleteLocalRef( __return ) }
-        return __return != nil ? java_lang.JavaObject( javaObject: __return ) : nil
+        return __return != nil ? java_swift.JavaObject( javaObject: __return ) : nil
     }
 
 
+    /// public void java.util.AbstractQueue.clear()
+
+    /// public boolean java.util.AbstractQueue.addAll(java.util.Collection)
+
     /// public java.lang.Object java.util.AbstractQueue.element()
 
     private static var element_MethodID_3: jmethodID?
 
-    open func element() -> java_lang.JavaObject! {
+    open func element() -> java_swift.JavaObject! {
         var __args = [jvalue]( repeating: jvalue(), count: 1 )
         var __locals = [jobject]()
         let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "element", methodSig: "()Ljava/lang/Object;", methodCache: &AbstractQueue.element_MethodID_3, args: &__args, locals: &__locals )
         defer { JNI.DeleteLocalRef( __return ) }
-        return __return != nil ? java_lang.JavaObject( javaObject: __return ) : nil
+        return __return != nil ? java_swift.JavaObject( javaObject: __return ) : nil
     }
 
 
     /// In declared protocol but not defined.. ///
 
-    /// public abstract boolean java.util.Collection.removeAll(java.util.Collection)
+    /// public abstract boolean java.util.Collection.equals(java.lang.Object)
 
-    /// public abstract boolean java.util.Collection.contains(java.lang.Object)
+    private static var equals_MethodID_4: jmethodID?
 
-    /// public abstract boolean java.util.Collection.containsAll(java.util.Collection)
+    override open func equals( o: java_swift.JavaObject? ) -> Bool {
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        var __locals = [jobject]()
+        __args[0] = JNIType.toJava( value: o != nil ? o! as JNIObject : nil, locals: &__locals )
+        let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "equals", methodSig: "(Ljava/lang/Object;)Z", methodCache: &AbstractQueue.equals_MethodID_4, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: Bool(), from: __return )
+    }
 
-    /// public abstract int java.util.Collection.size()
+    override open func equals( _ _o: java_swift.JavaObject? ) -> Bool {
+        return equals( o: _o )
+    }
 
-    /// public abstract java.util.Iterator java.lang.Iterable.iterator()
+    /// public abstract boolean java.util.Collection.containsAll(java.util.Collection)
 
-    /// public abstract boolean java.util.Queue.offer(java.lang.Object)
+    /// public abstract java.lang.Object java.util.Queue.peek()
 
-    private static var offer_MethodID_4: jmethodID?
+    private static var peek_MethodID_5: jmethodID?
 
-    open func offer( arg0: java_lang.JavaObject? ) -> Bool {
+    open func peek() -> java_swift.JavaObject! {
         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: "offer", methodSig: "(Ljava/lang/Object;)Z", methodCache: &AbstractQueue.offer_MethodID_4, args: &__args, locals: &__locals )
-        return JNIType.decode( type: Bool(), from: __return )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "peek", methodSig: "()Ljava/lang/Object;", methodCache: &AbstractQueue.peek_MethodID_5, args: &__args, locals: &__locals )
+        defer { JNI.DeleteLocalRef( __return ) }
+        return __return != nil ? java_swift.JavaObject( javaObject: __return ) : nil
     }
 
-    open func offer( _ _arg0: java_lang.JavaObject? ) -> Bool {
-        return offer( arg0: _arg0 )
-    }
 
-    /// public abstract boolean java.util.Collection.retainAll(java.util.Collection)
+    /// public abstract boolean java.util.Collection.remove(java.lang.Object)
+
+    /// public abstract boolean java.util.Collection.removeAll(java.util.Collection)
 
     /// public abstract java.lang.Object[] java.util.Collection.toArray()
 
-    /// public abstract boolean java.util.Collection.equals(java.lang.Object)
+    /// public abstract boolean java.util.Collection.contains(java.lang.Object)
 
-    /// public abstract java.lang.Object java.util.Queue.poll()
+    /// public abstract java.lang.Object[] java.util.Collection.toArray(java.lang.Object[])
 
-    private static var poll_MethodID_5: jmethodID?
+    /// public abstract int java.util.Collection.hashCode()
 
-    open func poll() -> java_lang.JavaObject! {
-        var __args = [jvalue]( repeating: jvalue(), count: 1 )
-        var __locals = [jobject]()
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "poll", methodSig: "()Ljava/lang/Object;", methodCache: &AbstractQueue.poll_MethodID_5, args: &__args, locals: &__locals )
-        defer { JNI.DeleteLocalRef( __return ) }
-        return __return != nil ? java_lang.JavaObject( javaObject: __return ) : nil
-    }
+    /// public default void java.lang.Iterable.forEach(java.util.function.Consumer)
+
+    /// public default boolean java.util.Collection.removeIf(java.util.function.Predicate)
 
+    /// public default java.util.stream.Stream java.util.Collection.parallelStream()
 
     /// public abstract void java.util.Collection.clear()
 
-    /// public abstract boolean java.util.Collection.remove(java.lang.Object)
+    /// public abstract boolean java.util.Collection.isEmpty()
 
-    /// public abstract java.lang.Object[] java.util.Collection.toArray(java.lang.Object[])
+    /// public abstract boolean java.util.Collection.addAll(java.util.Collection)
 
-    /// public abstract boolean java.util.Collection.isEmpty()
+    /// public abstract boolean java.util.Queue.offer(java.lang.Object)
 
-    /// public abstract boolean java.util.Collection.add(java.lang.Object)
+    private static var offer_MethodID_6: jmethodID?
 
-    /// public abstract int java.util.Collection.hashCode()
+    open func offer( e: java_swift.JavaObject? ) -> Bool {
+        var __args = [jvalue]( repeating: jvalue(), count: 1 )
+        var __locals = [jobject]()
+        __args[0] = JNIType.toJava( value: e != nil ? e! as JNIObject : nil, locals: &__locals )
+        let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "offer", methodSig: "(Ljava/lang/Object;)Z", methodCache: &AbstractQueue.offer_MethodID_6, args: &__args, locals: &__locals )
+        return JNIType.toSwift( type: Bool(), from: __return )
+    }
 
-    /// public abstract java.lang.Object java.util.Queue.peek()
+    open func offer( _ _e: java_swift.JavaObject? ) -> Bool {
+        return offer( e: _e )
+    }
+
+    /// public abstract java.lang.Object java.util.Queue.poll()
 
-    private static var peek_MethodID_6: jmethodID?
+    private static var poll_MethodID_7: jmethodID?
 
-    open func peek() -> java_lang.JavaObject! {
+    open func poll() -> java_swift.JavaObject! {
         var __args = [jvalue]( repeating: jvalue(), count: 1 )
         var __locals = [jobject]()
-        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "peek", methodSig: "()Ljava/lang/Object;", methodCache: &AbstractQueue.peek_MethodID_6, args: &__args, locals: &__locals )
+        let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "poll", methodSig: "()Ljava/lang/Object;", methodCache: &AbstractQueue.poll_MethodID_7, args: &__args, locals: &__locals )
         defer { JNI.DeleteLocalRef( __return ) }
-        return __return != nil ? java_lang.JavaObject( javaObject: __return ) : nil
+        return __return != nil ? java_swift.JavaObject( javaObject: __return ) : nil
     }
 
 
-    /// public abstract boolean java.util.Collection.addAll(java.util.Collection)
+    /// public abstract boolean java.util.Collection.retainAll(java.util.Collection)
+
+    /// public abstract java.util.Iterator java.lang.Iterable.iterator()
+
+    /// public default java.util.Spliterator java.lang.Iterable.spliterator()
+
+    /// public abstract boolean java.util.Collection.add(java.lang.Object)
+
+    /// public default java.util.stream.Stream java.util.Collection.stream()
+
+    /// public abstract int java.util.Collection.size()
 
 }
+