Skip to content

Commit e603844

Browse files
johnno1962johnno1962
committed
Tidyup version 2
1 parent 08ec279 commit e603844

File tree

106 files changed

+1002
-990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1002
-990
lines changed

‎Package.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
//
2+
// Package.swift
3+
// SwiftJava
4+
//
5+
// Created by John Holdsworth on 20/07/2016.
6+
// Copyright (c) 2016 John Holdsworth. All rights reserved.
7+
//
18

29
import PackageDescription
310

‎Sources/AccessibleObject.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ open class AccessibleObject: java_swift.JavaObject, AnnotatedElement {
4343
open func getAnnotation( arg0: java_swift.JavaClass? ) -> Annotation! {
4444
var __args = [jvalue]( repeating: jvalue(), count: 1 )
4545
var __locals = [jobject]()
46-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
46+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
4747
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AccessibleObject.getAnnotation_MethodID_2, args: &__args, locals: &__locals )
4848
defer { JNI.DeleteLocalRef( __return ) }
4949
return __return != nil ? AnnotationForward( javaObject: __return ) : nil
@@ -60,7 +60,7 @@ open class AccessibleObject: java_swift.JavaObject, AnnotatedElement {
6060
open func isAnnotationPresent( arg0: java_swift.JavaClass? ) -> Bool {
6161
var __args = [jvalue]( repeating: jvalue(), count: 1 )
6262
var __locals = [jobject]()
63-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
63+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
6464
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "isAnnotationPresent", methodSig: "(Ljava/lang/Class;)Z", methodCache: &AccessibleObject.isAnnotationPresent_MethodID_3, args: &__args, locals: &__locals )
6565
return JNIType.toSwift( type: Bool(), from: __return )
6666
}
@@ -76,7 +76,7 @@ open class AccessibleObject: java_swift.JavaObject, AnnotatedElement {
7676
open func getAnnotationsByType( arg0: java_swift.JavaClass? ) -> [Annotation]! {
7777
var __args = [jvalue]( repeating: jvalue(), count: 1 )
7878
var __locals = [jobject]()
79-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
79+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
8080
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AccessibleObject.getAnnotationsByType_MethodID_4, args: &__args, locals: &__locals )
8181
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
8282
}
@@ -104,7 +104,7 @@ open class AccessibleObject: java_swift.JavaObject, AnnotatedElement {
104104
open func getDeclaredAnnotation( arg0: java_swift.JavaClass? ) -> Annotation! {
105105
var __args = [jvalue]( repeating: jvalue(), count: 1 )
106106
var __locals = [jobject]()
107-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
107+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
108108
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AccessibleObject.getDeclaredAnnotation_MethodID_6, args: &__args, locals: &__locals )
109109
defer { JNI.DeleteLocalRef( __return ) }
110110
return __return != nil ? AnnotationForward( javaObject: __return ) : nil
@@ -121,7 +121,7 @@ open class AccessibleObject: java_swift.JavaObject, AnnotatedElement {
121121
open func getDeclaredAnnotationsByType( arg0: java_swift.JavaClass? ) -> [Annotation]! {
122122
var __args = [jvalue]( repeating: jvalue(), count: 1 )
123123
var __locals = [jobject]()
124-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
124+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
125125
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AccessibleObject.getDeclaredAnnotationsByType_MethodID_7, args: &__args, locals: &__locals )
126126
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
127127
}

‎Sources/AnnotatedArrayType.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ open class AnnotatedArrayTypeForward: AnnotatedTypeForward, AnnotatedArrayType {
5151
override open func getAnnotation( arg0: java_swift.JavaClass? ) -> Annotation! {
5252
var __args = [jvalue]( repeating: jvalue(), count: 1 )
5353
var __locals = [jobject]()
54-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
54+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
5555
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getAnnotation_MethodID_4, args: &__args, locals: &__locals )
5656
defer { JNI.DeleteLocalRef( __return ) }
5757
return __return != nil ? AnnotationForward( javaObject: __return ) : nil
@@ -68,7 +68,7 @@ open class AnnotatedArrayTypeForward: AnnotatedTypeForward, AnnotatedArrayType {
6868
override open func isAnnotationPresent( arg0: java_swift.JavaClass? ) -> Bool {
6969
var __args = [jvalue]( repeating: jvalue(), count: 1 )
7070
var __locals = [jobject]()
71-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
71+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
7272
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "isAnnotationPresent", methodSig: "(Ljava/lang/Class;)Z", methodCache: &AnnotatedArrayTypeForward.isAnnotationPresent_MethodID_5, args: &__args, locals: &__locals )
7373
return JNIType.toSwift( type: Bool(), from: __return )
7474
}
@@ -84,7 +84,7 @@ open class AnnotatedArrayTypeForward: AnnotatedTypeForward, AnnotatedArrayType {
8484
override open func getAnnotationsByType( arg0: java_swift.JavaClass? ) -> [Annotation]! {
8585
var __args = [jvalue]( repeating: jvalue(), count: 1 )
8686
var __locals = [jobject]()
87-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
87+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
8888
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getAnnotationsByType_MethodID_6, args: &__args, locals: &__locals )
8989
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
9090
}
@@ -112,7 +112,7 @@ open class AnnotatedArrayTypeForward: AnnotatedTypeForward, AnnotatedArrayType {
112112
override open func getDeclaredAnnotation( arg0: java_swift.JavaClass? ) -> Annotation! {
113113
var __args = [jvalue]( repeating: jvalue(), count: 1 )
114114
var __locals = [jobject]()
115-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
115+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
116116
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getDeclaredAnnotation_MethodID_8, args: &__args, locals: &__locals )
117117
defer { JNI.DeleteLocalRef( __return ) }
118118
return __return != nil ? AnnotationForward( javaObject: __return ) : nil
@@ -129,7 +129,7 @@ open class AnnotatedArrayTypeForward: AnnotatedTypeForward, AnnotatedArrayType {
129129
override open func getDeclaredAnnotationsByType( arg0: java_swift.JavaClass? ) -> [Annotation]! {
130130
var __args = [jvalue]( repeating: jvalue(), count: 1 )
131131
var __locals = [jobject]()
132-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
132+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
133133
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getDeclaredAnnotationsByType_MethodID_9, args: &__args, locals: &__locals )
134134
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
135135
}

‎Sources/AnnotatedElement.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ open class AnnotatedElementForward: JNIObjectForward, AnnotatedElement {
5151
open func getAnnotation( arg0: java_swift.JavaClass? ) -> Annotation! {
5252
var __args = [jvalue]( repeating: jvalue(), count: 1 )
5353
var __locals = [jobject]()
54-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
54+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
5555
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedElementForward.getAnnotation_MethodID_8, args: &__args, locals: &__locals )
5656
defer { JNI.DeleteLocalRef( __return ) }
5757
return __return != nil ? AnnotationForward( javaObject: __return ) : nil
@@ -68,7 +68,7 @@ open class AnnotatedElementForward: JNIObjectForward, AnnotatedElement {
6868
open func isAnnotationPresent( arg0: java_swift.JavaClass? ) -> Bool {
6969
var __args = [jvalue]( repeating: jvalue(), count: 1 )
7070
var __locals = [jobject]()
71-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
71+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
7272
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "isAnnotationPresent", methodSig: "(Ljava/lang/Class;)Z", methodCache: &AnnotatedElementForward.isAnnotationPresent_MethodID_9, args: &__args, locals: &__locals )
7373
return JNIType.toSwift( type: Bool(), from: __return )
7474
}
@@ -84,7 +84,7 @@ open class AnnotatedElementForward: JNIObjectForward, AnnotatedElement {
8484
open func getAnnotationsByType( arg0: java_swift.JavaClass? ) -> [Annotation]! {
8585
var __args = [jvalue]( repeating: jvalue(), count: 1 )
8686
var __locals = [jobject]()
87-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
87+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
8888
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedElementForward.getAnnotationsByType_MethodID_10, args: &__args, locals: &__locals )
8989
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
9090
}
@@ -112,7 +112,7 @@ open class AnnotatedElementForward: JNIObjectForward, AnnotatedElement {
112112
open func getDeclaredAnnotation( arg0: java_swift.JavaClass? ) -> Annotation! {
113113
var __args = [jvalue]( repeating: jvalue(), count: 1 )
114114
var __locals = [jobject]()
115-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
115+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
116116
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedElementForward.getDeclaredAnnotation_MethodID_12, args: &__args, locals: &__locals )
117117
defer { JNI.DeleteLocalRef( __return ) }
118118
return __return != nil ? AnnotationForward( javaObject: __return ) : nil
@@ -129,7 +129,7 @@ open class AnnotatedElementForward: JNIObjectForward, AnnotatedElement {
129129
open func getDeclaredAnnotationsByType( arg0: java_swift.JavaClass? ) -> [Annotation]! {
130130
var __args = [jvalue]( repeating: jvalue(), count: 1 )
131131
var __locals = [jobject]()
132-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
132+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
133133
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedElementForward.getDeclaredAnnotationsByType_MethodID_13, args: &__args, locals: &__locals )
134134
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
135135
}

‎Sources/AnnotatedParameterizedType.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ open class AnnotatedParameterizedTypeForward: AnnotatedTypeForward, AnnotatedPar
5050
override open func getAnnotation( arg0: java_swift.JavaClass? ) -> Annotation! {
5151
var __args = [jvalue]( repeating: jvalue(), count: 1 )
5252
var __locals = [jobject]()
53-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
53+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
5454
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedParameterizedTypeForward.getAnnotation_MethodID_4, args: &__args, locals: &__locals )
5555
defer { JNI.DeleteLocalRef( __return ) }
5656
return __return != nil ? AnnotationForward( javaObject: __return ) : nil
@@ -67,7 +67,7 @@ open class AnnotatedParameterizedTypeForward: AnnotatedTypeForward, AnnotatedPar
6767
override open func isAnnotationPresent( arg0: java_swift.JavaClass? ) -> Bool {
6868
var __args = [jvalue]( repeating: jvalue(), count: 1 )
6969
var __locals = [jobject]()
70-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
70+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
7171
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "isAnnotationPresent", methodSig: "(Ljava/lang/Class;)Z", methodCache: &AnnotatedParameterizedTypeForward.isAnnotationPresent_MethodID_5, args: &__args, locals: &__locals )
7272
return JNIType.toSwift( type: Bool(), from: __return )
7373
}
@@ -83,7 +83,7 @@ open class AnnotatedParameterizedTypeForward: AnnotatedTypeForward, AnnotatedPar
8383
override open func getAnnotationsByType( arg0: java_swift.JavaClass? ) -> [Annotation]! {
8484
var __args = [jvalue]( repeating: jvalue(), count: 1 )
8585
var __locals = [jobject]()
86-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
86+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
8787
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedParameterizedTypeForward.getAnnotationsByType_MethodID_6, args: &__args, locals: &__locals )
8888
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
8989
}
@@ -111,7 +111,7 @@ open class AnnotatedParameterizedTypeForward: AnnotatedTypeForward, AnnotatedPar
111111
override open func getDeclaredAnnotation( arg0: java_swift.JavaClass? ) -> Annotation! {
112112
var __args = [jvalue]( repeating: jvalue(), count: 1 )
113113
var __locals = [jobject]()
114-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
114+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
115115
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedParameterizedTypeForward.getDeclaredAnnotation_MethodID_8, args: &__args, locals: &__locals )
116116
defer { JNI.DeleteLocalRef( __return ) }
117117
return __return != nil ? AnnotationForward( javaObject: __return ) : nil
@@ -128,7 +128,7 @@ open class AnnotatedParameterizedTypeForward: AnnotatedTypeForward, AnnotatedPar
128128
override open func getDeclaredAnnotationsByType( arg0: java_swift.JavaClass? ) -> [Annotation]! {
129129
var __args = [jvalue]( repeating: jvalue(), count: 1 )
130130
var __locals = [jobject]()
131-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
131+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
132132
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedParameterizedTypeForward.getDeclaredAnnotationsByType_MethodID_9, args: &__args, locals: &__locals )
133133
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
134134
}

0 commit comments

Comments
 (0)