Skip to content

Commit 7ea2b57

Browse files
johnno1962johnno1962
committed
Tidyup version 2
1 parent df3ce94 commit 7ea2b57

File tree

219 files changed

+6283
-6250
lines changed

Some content is hidden

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

219 files changed

+6283
-6250
lines changed

‎Sources/AbstractCollection.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ open class AbstractCollection: java_swift.JavaObject, Collection {
3737
open func add( e: java_swift.JavaObject? ) -> Bool {
3838
var __args = [jvalue]( repeating: jvalue(), count: 1 )
3939
var __locals = [jobject]()
40-
__args[0] = JNIType.toJava( value: e != nil ? e! as JNIObject : nil, locals: &__locals )
40+
__args[0] = JNIType.toJava( value: e, locals: &__locals )
4141
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "add", methodSig: "(Ljava/lang/Object;)Z", methodCache: &AbstractCollection.add_MethodID_2, args: &__args, locals: &__locals )
4242
return JNIType.toSwift( type: Bool(), from: __return )
4343
}
@@ -53,7 +53,7 @@ open class AbstractCollection: java_swift.JavaObject, Collection {
5353
open func remove( o: java_swift.JavaObject? ) -> Bool {
5454
var __args = [jvalue]( repeating: jvalue(), count: 1 )
5555
var __locals = [jobject]()
56-
__args[0] = JNIType.toJava( value: o != nil ? o! as JNIObject : nil, locals: &__locals )
56+
__args[0] = JNIType.toJava( value: o, locals: &__locals )
5757
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "remove", methodSig: "(Ljava/lang/Object;)Z", methodCache: &AbstractCollection.remove_MethodID_3, args: &__args, locals: &__locals )
5858
return JNIType.toSwift( type: Bool(), from: __return )
5959
}
@@ -94,7 +94,7 @@ open class AbstractCollection: java_swift.JavaObject, Collection {
9494
open func contains( o: java_swift.JavaObject? ) -> Bool {
9595
var __args = [jvalue]( repeating: jvalue(), count: 1 )
9696
var __locals = [jobject]()
97-
__args[0] = JNIType.toJava( value: o != nil ? o! as JNIObject : nil, locals: &__locals )
97+
__args[0] = JNIType.toJava( value: o, locals: &__locals )
9898
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "contains", methodSig: "(Ljava/lang/Object;)Z", methodCache: &AbstractCollection.contains_MethodID_6, args: &__args, locals: &__locals )
9999
return JNIType.toSwift( type: Bool(), from: __return )
100100
}
@@ -233,7 +233,7 @@ open class AbstractCollection: java_swift.JavaObject, Collection {
233233
open func equals( o: java_swift.JavaObject? ) -> Bool {
234234
var __args = [jvalue]( repeating: jvalue(), count: 1 )
235235
var __locals = [jobject]()
236-
__args[0] = JNIType.toJava( value: o != nil ? o! as JNIObject : nil, locals: &__locals )
236+
__args[0] = JNIType.toJava( value: o, locals: &__locals )
237237
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "equals", methodSig: "(Ljava/lang/Object;)Z", methodCache: &AbstractCollection.equals_MethodID_15, args: &__args, locals: &__locals )
238238
return JNIType.toSwift( type: Bool(), from: __return )
239239
}

‎Sources/AbstractExecutorService.swift

Lines changed: 75 additions & 75 deletions
Large diffs are not rendered by default.

‎Sources/AbstractList.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ open class AbstractList: AbstractCollection, List {
5555
var __args = [jvalue]( repeating: jvalue(), count: 2 )
5656
var __locals = [jobject]()
5757
__args[0] = JNIType.toJava( value: index, locals: &__locals )
58-
__args[1] = JNIType.toJava( value: element != nil ? element! as JNIObject : nil, locals: &__locals )
58+
__args[1] = JNIType.toJava( value: element, locals: &__locals )
5959
JNIMethod.CallVoidMethod( object: javaObject, methodName: "add", methodSig: "(ILjava/lang/Object;)V", methodCache: &AbstractList.add_MethodID_2, args: &__args, locals: &__locals )
6060
}
6161

@@ -106,7 +106,7 @@ open class AbstractList: AbstractCollection, List {
106106
override open func equals( o: java_swift.JavaObject? ) -> Bool {
107107
var __args = [jvalue]( repeating: jvalue(), count: 1 )
108108
var __locals = [jobject]()
109-
__args[0] = JNIType.toJava( value: o != nil ? o! as JNIObject : nil, locals: &__locals )
109+
__args[0] = JNIType.toJava( value: o, locals: &__locals )
110110
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "equals", methodSig: "(Ljava/lang/Object;)Z", methodCache: &AbstractList.equals_MethodID_5, args: &__args, locals: &__locals )
111111
return JNIType.toSwift( type: Bool(), from: __return )
112112
}
@@ -124,7 +124,7 @@ open class AbstractList: AbstractCollection, List {
124124
open func indexOf( o: java_swift.JavaObject? ) -> Int {
125125
var __args = [jvalue]( repeating: jvalue(), count: 1 )
126126
var __locals = [jobject]()
127-
__args[0] = JNIType.toJava( value: o != nil ? o! as JNIObject : nil, locals: &__locals )
127+
__args[0] = JNIType.toJava( value: o, locals: &__locals )
128128
let __return = JNIMethod.CallIntMethod( object: javaObject, methodName: "indexOf", methodSig: "(Ljava/lang/Object;)I", methodCache: &AbstractList.indexOf_MethodID_6, args: &__args, locals: &__locals )
129129
return JNIType.toSwift( type: Int(), from: __return )
130130
}
@@ -142,7 +142,7 @@ open class AbstractList: AbstractCollection, List {
142142
open func lastIndexOf( o: java_swift.JavaObject? ) -> Int {
143143
var __args = [jvalue]( repeating: jvalue(), count: 1 )
144144
var __locals = [jobject]()
145-
__args[0] = JNIType.toJava( value: o != nil ? o! as JNIObject : nil, locals: &__locals )
145+
__args[0] = JNIType.toJava( value: o, locals: &__locals )
146146
let __return = JNIMethod.CallIntMethod( object: javaObject, methodName: "lastIndexOf", methodSig: "(Ljava/lang/Object;)I", methodCache: &AbstractList.lastIndexOf_MethodID_7, args: &__args, locals: &__locals )
147147
return JNIType.toSwift( type: Int(), from: __return )
148148
}
@@ -196,7 +196,7 @@ open class AbstractList: AbstractCollection, List {
196196
var __args = [jvalue]( repeating: jvalue(), count: 2 )
197197
var __locals = [jobject]()
198198
__args[0] = JNIType.toJava( value: index, locals: &__locals )
199-
__args[1] = JNIType.toJava( value: element != nil ? element! as JNIObject : nil, locals: &__locals )
199+
__args[1] = JNIType.toJava( value: element, locals: &__locals )
200200
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "set", methodSig: "(ILjava/lang/Object;)Ljava/lang/Object;", methodCache: &AbstractList.set_MethodID_10, args: &__args, locals: &__locals )
201201
defer { JNI.DeleteLocalRef( __return ) }
202202
return __return != nil ? java_swift.JavaObject( javaObject: __return ) : nil

‎Sources/AbstractMap.swift

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
5656
open func remove( arg0: java_swift.JavaObject? ) -> java_swift.JavaObject! {
5757
var __args = [jvalue]( repeating: jvalue(), count: 1 )
5858
var __locals = [jobject]()
59-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
59+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
6060
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "remove", methodSig: "(Ljava/lang/Object;)Ljava/lang/Object;", methodCache: &AbstractMap.remove_MethodID_2, args: &__args, locals: &__locals )
6161
defer { JNI.DeleteLocalRef( __return ) }
6262
return __return != nil ? java_swift.JavaObject( javaObject: __return ) : nil
@@ -73,7 +73,7 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
7373
open func get( arg0: java_swift.JavaObject? ) -> java_swift.JavaObject! {
7474
var __args = [jvalue]( repeating: jvalue(), count: 1 )
7575
var __locals = [jobject]()
76-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
76+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
7777
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "get", methodSig: "(Ljava/lang/Object;)Ljava/lang/Object;", methodCache: &AbstractMap.get_MethodID_3, args: &__args, locals: &__locals )
7878
defer { JNI.DeleteLocalRef( __return ) }
7979
return __return != nil ? java_swift.JavaObject( javaObject: __return ) : nil
@@ -90,8 +90,8 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
9090
open func put( arg0: java_swift.JavaObject?, arg1: java_swift.JavaObject? ) -> java_swift.JavaObject! {
9191
var __args = [jvalue]( repeating: jvalue(), count: 2 )
9292
var __locals = [jobject]()
93-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
94-
__args[1] = JNIType.toJava( value: arg1 != nil ? arg1! as JNIObject : nil, locals: &__locals )
93+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
94+
__args[1] = JNIType.toJava( value: arg1, locals: &__locals )
9595
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "put", methodSig: "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", methodCache: &AbstractMap.put_MethodID_4, args: &__args, locals: &__locals )
9696
defer { JNI.DeleteLocalRef( __return ) }
9797
return __return != nil ? java_swift.JavaObject( javaObject: __return ) : nil
@@ -108,7 +108,7 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
108108
override open func equals( arg0: java_swift.JavaObject? ) -> Bool {
109109
var __args = [jvalue]( repeating: jvalue(), count: 1 )
110110
var __locals = [jobject]()
111-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
111+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
112112
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "equals", methodSig: "(Ljava/lang/Object;)Z", methodCache: &AbstractMap.equals_MethodID_5, args: &__args, locals: &__locals )
113113
return JNIType.toSwift( type: Bool(), from: __return )
114114
}
@@ -235,7 +235,7 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
235235
open func containsValue( arg0: java_swift.JavaObject? ) -> Bool {
236236
var __args = [jvalue]( repeating: jvalue(), count: 1 )
237237
var __locals = [jobject]()
238-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
238+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
239239
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "containsValue", methodSig: "(Ljava/lang/Object;)Z", methodCache: &AbstractMap.containsValue_MethodID_14, args: &__args, locals: &__locals )
240240
return JNIType.toSwift( type: Bool(), from: __return )
241241
}
@@ -251,7 +251,7 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
251251
open func containsKey( arg0: java_swift.JavaObject? ) -> Bool {
252252
var __args = [jvalue]( repeating: jvalue(), count: 1 )
253253
var __locals = [jobject]()
254-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
254+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
255255
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "containsKey", methodSig: "(Ljava/lang/Object;)Z", methodCache: &AbstractMap.containsKey_MethodID_15, args: &__args, locals: &__locals )
256256
return JNIType.toSwift( type: Bool(), from: __return )
257257
}
@@ -271,7 +271,7 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
271271
open func computeIfAbsent( arg0: java_swift.JavaObject?, arg1: Function? ) -> java_swift.JavaObject! {
272272
var __args = [jvalue]( repeating: jvalue(), count: 2 )
273273
var __locals = [jobject]()
274-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
274+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
275275
__args[1] = JNIType.toJava( value: arg1, locals: &__locals )
276276
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "computeIfAbsent", methodSig: "(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;", methodCache: &AbstractMap.computeIfAbsent_MethodID_16, args: &__args, locals: &__locals )
277277
defer { JNI.DeleteLocalRef( __return ) }
@@ -289,8 +289,8 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
289289
open func remove( arg0: java_swift.JavaObject?, arg1: java_swift.JavaObject? ) -> Bool {
290290
var __args = [jvalue]( repeating: jvalue(), count: 2 )
291291
var __locals = [jobject]()
292-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
293-
__args[1] = JNIType.toJava( value: arg1 != nil ? arg1! as JNIObject : nil, locals: &__locals )
292+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
293+
__args[1] = JNIType.toJava( value: arg1, locals: &__locals )
294294
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "remove", methodSig: "(Ljava/lang/Object;Ljava/lang/Object;)Z", methodCache: &AbstractMap.remove_MethodID_17, args: &__args, locals: &__locals )
295295
return JNIType.toSwift( type: Bool(), from: __return )
296296
}
@@ -308,8 +308,8 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
308308
open func getOrDefault( arg0: java_swift.JavaObject?, arg1: java_swift.JavaObject? ) -> java_swift.JavaObject! {
309309
var __args = [jvalue]( repeating: jvalue(), count: 2 )
310310
var __locals = [jobject]()
311-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
312-
__args[1] = JNIType.toJava( value: arg1 != nil ? arg1! as JNIObject : nil, locals: &__locals )
311+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
312+
__args[1] = JNIType.toJava( value: arg1, locals: &__locals )
313313
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getOrDefault", methodSig: "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", methodCache: &AbstractMap.getOrDefault_MethodID_18, args: &__args, locals: &__locals )
314314
defer { JNI.DeleteLocalRef( __return ) }
315315
return __return != nil ? java_swift.JavaObject( javaObject: __return ) : nil
@@ -326,8 +326,8 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
326326
open func putIfAbsent( arg0: java_swift.JavaObject?, arg1: java_swift.JavaObject? ) -> java_swift.JavaObject! {
327327
var __args = [jvalue]( repeating: jvalue(), count: 2 )
328328
var __locals = [jobject]()
329-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
330-
__args[1] = JNIType.toJava( value: arg1 != nil ? arg1! as JNIObject : nil, locals: &__locals )
329+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
330+
__args[1] = JNIType.toJava( value: arg1, locals: &__locals )
331331
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "putIfAbsent", methodSig: "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", methodCache: &AbstractMap.putIfAbsent_MethodID_19, args: &__args, locals: &__locals )
332332
defer { JNI.DeleteLocalRef( __return ) }
333333
return __return != nil ? java_swift.JavaObject( javaObject: __return ) : nil
@@ -344,8 +344,8 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
344344
open func merge( arg0: java_swift.JavaObject?, arg1: java_swift.JavaObject?, arg2: BiFunction? ) -> java_swift.JavaObject! {
345345
var __args = [jvalue]( repeating: jvalue(), count: 3 )
346346
var __locals = [jobject]()
347-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
348-
__args[1] = JNIType.toJava( value: arg1 != nil ? arg1! as JNIObject : nil, locals: &__locals )
347+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
348+
__args[1] = JNIType.toJava( value: arg1, locals: &__locals )
349349
__args[2] = JNIType.toJava( value: arg2, locals: &__locals )
350350
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "merge", methodSig: "(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;", methodCache: &AbstractMap.merge_MethodID_20, args: &__args, locals: &__locals )
351351
defer { JNI.DeleteLocalRef( __return ) }
@@ -378,7 +378,7 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
378378
open func computeIfPresent( arg0: java_swift.JavaObject?, arg1: BiFunction? ) -> java_swift.JavaObject! {
379379
var __args = [jvalue]( repeating: jvalue(), count: 2 )
380380
var __locals = [jobject]()
381-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
381+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
382382
__args[1] = JNIType.toJava( value: arg1, locals: &__locals )
383383
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "computeIfPresent", methodSig: "(Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;", methodCache: &AbstractMap.computeIfPresent_MethodID_22, args: &__args, locals: &__locals )
384384
defer { JNI.DeleteLocalRef( __return ) }
@@ -396,8 +396,8 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
396396
open func replace( arg0: java_swift.JavaObject?, arg1: java_swift.JavaObject? ) -> java_swift.JavaObject! {
397397
var __args = [jvalue]( repeating: jvalue(), count: 2 )
398398
var __locals = [jobject]()
399-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
400-
__args[1] = JNIType.toJava( value: arg1 != nil ? arg1! as JNIObject : nil, locals: &__locals )
399+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
400+
__args[1] = JNIType.toJava( value: arg1, locals: &__locals )
401401
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "replace", methodSig: "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", methodCache: &AbstractMap.replace_MethodID_23, args: &__args, locals: &__locals )
402402
defer { JNI.DeleteLocalRef( __return ) }
403403
return __return != nil ? java_swift.JavaObject( javaObject: __return ) : nil
@@ -414,9 +414,9 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
414414
open func replace( arg0: java_swift.JavaObject?, arg1: java_swift.JavaObject?, arg2: java_swift.JavaObject? ) -> Bool {
415415
var __args = [jvalue]( repeating: jvalue(), count: 3 )
416416
var __locals = [jobject]()
417-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
418-
__args[1] = JNIType.toJava( value: arg1 != nil ? arg1! as JNIObject : nil, locals: &__locals )
419-
__args[2] = JNIType.toJava( value: arg2 != nil ? arg2! as JNIObject : nil, locals: &__locals )
417+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
418+
__args[1] = JNIType.toJava( value: arg1, locals: &__locals )
419+
__args[2] = JNIType.toJava( value: arg2, locals: &__locals )
420420
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "replace", methodSig: "(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z", methodCache: &AbstractMap.replace_MethodID_24, args: &__args, locals: &__locals )
421421
return JNIType.toSwift( type: Bool(), from: __return )
422422
}
@@ -447,7 +447,7 @@ open class AbstractMap: java_swift.JavaObject, java_swift.JavaMap {
447447
open func compute( arg0: java_swift.JavaObject?, arg1: BiFunction? ) -> java_swift.JavaObject! {
448448
var __args = [jvalue]( repeating: jvalue(), count: 2 )
449449
var __locals = [jobject]()
450-
__args[0] = JNIType.toJava( value: arg0 != nil ? arg0! as JNIObject : nil, locals: &__locals )
450+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
451451
__args[1] = JNIType.toJava( value: arg1, locals: &__locals )
452452
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "compute", methodSig: "(Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;", methodCache: &AbstractMap.compute_MethodID_26, args: &__args, locals: &__locals )
453453
defer { JNI.DeleteLocalRef( __return ) }

0 commit comments

Comments
 (0)