Skip to content

Commit c5f459e

Browse files
committed
Swift 4.1
1 parent c9b8b55 commit c5f459e

16 files changed

+1370
-948
lines changed

Sources/Character_UnicodeScript.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public enum Character_UnicodeScript: Int, JNIObjectProtocol, JNIObjectInit {
99

1010
case COMMON, LATIN, GREEK, CYRILLIC, ARMENIAN, HEBREW, ARABIC, SYRIAC, THAANA, DEVANAGARI, BENGALI, GURMUKHI, GUJARATI, ORIYA, TAMIL, TELUGU, KANNADA, MALAYALAM, SINHALA, THAI, LAO, TIBETAN, MYANMAR, GEORGIAN, HANGUL, ETHIOPIC, CHEROKEE, CANADIAN_ABORIGINAL, OGHAM, RUNIC, KHMER, MONGOLIAN, HIRAGANA, KATAKANA, BOPOMOFO, HAN, YI, OLD_ITALIC, GOTHIC, DESERET, INHERITED, TAGALOG, HANUNOO, BUHID, TAGBANWA, LIMBU, TAI_LE, LINEAR_B, UGARITIC, SHAVIAN, OSMANYA, CYPRIOT, BRAILLE, BUGINESE, COPTIC, NEW_TAI_LUE, GLAGOLITIC, TIFINAGH, SYLOTI_NAGRI, OLD_PERSIAN, KHAROSHTHI, BALINESE, CUNEIFORM, PHOENICIAN, PHAGS_PA, NKO, SUNDANESE, BATAK, LEPCHA, OL_CHIKI, VAI, SAURASHTRA, KAYAH_LI, REJANG, LYCIAN, CARIAN, LYDIAN, CHAM, TAI_THAM, TAI_VIET, AVESTAN, EGYPTIAN_HIEROGLYPHS, SAMARITAN, MANDAIC, LISU, BAMUM, JAVANESE, MEETEI_MAYEK, IMPERIAL_ARAMAIC, OLD_SOUTH_ARABIAN, INSCRIPTIONAL_PARTHIAN, INSCRIPTIONAL_PAHLAVI, OLD_TURKIC, BRAHMI, KAITHI, MEROITIC_HIEROGLYPHS, MEROITIC_CURSIVE, SORA_SOMPENG, CHAKMA, SHARADA, TAKRI, MIAO, UNKNOWN
1111

12-
static let enumConstants = try! JavaClass.forName("java.lang.Character$UnicodeScript")
12+
static let enumConstants = JavaClass(loading: "java.lang.Character$UnicodeScript")
1313
.getEnumConstants()!.map { Character_UnicodeScriptForward( javaObject: $0.javaObject ) }
1414

1515
public func underlier() -> Character_UnicodeScriptForward {

Sources/ElementType.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public enum ElementType: Int, JNIObjectProtocol, JNIObjectInit {
99

1010
case TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE, PACKAGE, TYPE_PARAMETER, TYPE_USE
1111

12-
static let enumConstants = try! JavaClass.forName("java.lang.annotation.ElementType")
12+
static let enumConstants = JavaClass(loading: "java.lang.annotation.ElementType")
1313
.getEnumConstants()!.map { ElementTypeForward( javaObject: $0.javaObject ) }
1414

1515
public func underlier() -> ElementTypeForward {

Sources/InvocationHandler.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ fileprivate class InvocationHandlerLocal_: JNILocalProxy<InvocationHandler, Any>
7272
natives.append( JNINativeMethod( name: strdup("__finalize"), signature: strdup("(J)V"), fnPtr: unsafeBitCast( JNIReleasableProxy__finalize_thunk, to: UnsafeMutableRawPointer.self ) ) )
7373

7474
let clazz = JNI.FindClass( proxyClassName() )
75-
withUnsafePointer(to: &natives[0]) {
75+
natives.withUnsafeBufferPointer {
7676
nativesPtr in
77-
if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr, jint(natives.count) ) != jint(JNI_OK) {
77+
if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr.baseAddress, jint(nativesPtr.count) ) != jint(JNI_OK) {
7878
JNI.report( "Unable to register java natives" )
7979
}
8080
}

Sources/MemoryType.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public enum MemoryType: Int, JNIObjectProtocol, JNIObjectInit {
99

1010
case HEAP, NON_HEAP
1111

12-
static let enumConstants = try! JavaClass.forName("java.lang.management.MemoryType")
12+
static let enumConstants = JavaClass(loading: "java.lang.management.MemoryType")
1313
.getEnumConstants()!.map { MemoryTypeForward( javaObject: $0.javaObject ) }
1414

1515
public func underlier() -> MemoryTypeForward {

Sources/ProcessBuilder_Redirect_Type.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public enum ProcessBuilder_Redirect_Type: Int, JNIObjectProtocol, JNIObjectInit
99

1010
case PIPE, INHERIT, READ, WRITE, APPEND
1111

12-
static let enumConstants = try! JavaClass.forName("java.lang.ProcessBuilder$Redirect$Type")
12+
static let enumConstants = JavaClass(loading: "java.lang.ProcessBuilder$Redirect$Type")
1313
.getEnumConstants()!.map { ProcessBuilder_Redirect_TypeForward( javaObject: $0.javaObject ) }
1414

1515
public func underlier() -> ProcessBuilder_Redirect_TypeForward {

Sources/RetentionPolicy.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public enum RetentionPolicy: Int, JNIObjectProtocol, JNIObjectInit {
99

1010
case SOURCE, CLASS, RUNTIME
1111

12-
static let enumConstants = try! JavaClass.forName("java.lang.annotation.RetentionPolicy")
12+
static let enumConstants = JavaClass(loading: "java.lang.annotation.RetentionPolicy")
1313
.getEnumConstants()!.map { RetentionPolicyForward( javaObject: $0.javaObject ) }
1414

1515
public func underlier() -> RetentionPolicyForward {

Sources/Runtime.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ open class Runtime: java_swift.JavaObject {
5454

5555
private static var addShutdownHook_MethodID_3: jmethodID?
5656

57-
open func addShutdownHook( hook: Thread? ) {
57+
open func addShutdownHook( hook: java_swift.JavaThread? ) {
5858
var __locals = [jobject]()
5959
var __args = [jvalue]( repeating: jvalue(), count: 1 )
6060
__args[0] = JNIType.toJava( value: hook, locals: &__locals )
6161
JNIMethod.CallVoidMethod( object: javaObject, methodName: "addShutdownHook", methodSig: "(Ljava/lang/Thread;)V", methodCache: &Runtime.addShutdownHook_MethodID_3, args: &__args, locals: &__locals )
6262
}
6363

64-
open func addShutdownHook( _ _hook: Thread? ) {
64+
open func addShutdownHook( _ _hook: java_swift.JavaThread? ) {
6565
addShutdownHook( hook: _hook )
6666
}
6767

@@ -350,15 +350,15 @@ open class Runtime: java_swift.JavaObject {
350350

351351
private static var removeShutdownHook_MethodID_20: jmethodID?
352352

353-
open func removeShutdownHook( hook: Thread? ) -> Bool {
353+
open func removeShutdownHook( hook: java_swift.JavaThread? ) -> Bool {
354354
var __locals = [jobject]()
355355
var __args = [jvalue]( repeating: jvalue(), count: 1 )
356356
__args[0] = JNIType.toJava( value: hook, locals: &__locals )
357357
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "removeShutdownHook", methodSig: "(Ljava/lang/Thread;)Z", methodCache: &Runtime.removeShutdownHook_MethodID_20, args: &__args, locals: &__locals )
358358
return __return != jboolean(JNI_FALSE)
359359
}
360360

361-
open func removeShutdownHook( _ _hook: Thread? ) -> Bool {
361+
open func removeShutdownHook( _ _hook: java_swift.JavaThread? ) -> Bool {
362362
return removeShutdownHook( hook: _hook )
363363
}
364364

Sources/SecurityManager.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,33 +80,33 @@ open class SecurityManager: java_swift.JavaObject {
8080
checkAccept( arg0: _arg0, arg1: _arg1 )
8181
}
8282

83-
/// public void java.lang.SecurityManager.checkAccess(java.lang.Thread)
83+
/// public void java.lang.SecurityManager.checkAccess(java.lang.ThreadGroup)
8484

8585
private static var checkAccess_MethodID_3: jmethodID?
8686

87-
open func checkAccess( arg0: Thread? ) {
87+
open func checkAccess( arg0: ThreadGroup? ) {
8888
var __locals = [jobject]()
8989
var __args = [jvalue]( repeating: jvalue(), count: 1 )
9090
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
91-
JNIMethod.CallVoidMethod( object: javaObject, methodName: "checkAccess", methodSig: "(Ljava/lang/Thread;)V", methodCache: &SecurityManager.checkAccess_MethodID_3, args: &__args, locals: &__locals )
91+
JNIMethod.CallVoidMethod( object: javaObject, methodName: "checkAccess", methodSig: "(Ljava/lang/ThreadGroup;)V", methodCache: &SecurityManager.checkAccess_MethodID_3, args: &__args, locals: &__locals )
9292
}
9393

94-
open func checkAccess( _ _arg0: Thread? ) {
94+
open func checkAccess( _ _arg0: ThreadGroup? ) {
9595
checkAccess( arg0: _arg0 )
9696
}
9797

98-
/// public void java.lang.SecurityManager.checkAccess(java.lang.ThreadGroup)
98+
/// public void java.lang.SecurityManager.checkAccess(java.lang.Thread)
9999

100100
private static var checkAccess_MethodID_4: jmethodID?
101101

102-
open func checkAccess( arg0: ThreadGroup? ) {
102+
open func checkAccess( arg0: java_swift.JavaThread? ) {
103103
var __locals = [jobject]()
104104
var __args = [jvalue]( repeating: jvalue(), count: 1 )
105105
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
106-
JNIMethod.CallVoidMethod( object: javaObject, methodName: "checkAccess", methodSig: "(Ljava/lang/ThreadGroup;)V", methodCache: &SecurityManager.checkAccess_MethodID_4, args: &__args, locals: &__locals )
106+
JNIMethod.CallVoidMethod( object: javaObject, methodName: "checkAccess", methodSig: "(Ljava/lang/Thread;)V", methodCache: &SecurityManager.checkAccess_MethodID_4, args: &__args, locals: &__locals )
107107
}
108108

109-
open func checkAccess( _ _arg0: ThreadGroup? ) {
109+
open func checkAccess( _ _arg0: java_swift.JavaThread? ) {
110110
checkAccess( arg0: _arg0 )
111111
}
112112

0 commit comments

Comments
 (0)