Skip to content

Commit a2b9c15

Browse files
michaelknochephemer
authored andcommitted
implement JavaInt conformance to JavaParameterConvertible (#12)
* breaking change: Int does no longer conform to JavaParameterConvertible, use JavaInt instead * cleanup
1 parent 7053cb0 commit a2b9c15

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

Sources/JNI/JavaParameterConvertible+Primitives.swift

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,29 @@ extension Bool: JavaParameterConvertible, JavaInitializableFromMethod, JavaIniti
2525
}
2626

2727

28-
// Int
28+
// JavaInt
2929

30-
extension Int: JavaParameterConvertible, JavaInitializableFromMethod, JavaInitializableFromField {
30+
extension JavaInt: JavaParameterConvertible, JavaInitializableFromMethod, JavaInitializableFromField {
3131
public static var asJNIParameterString = "I"
3232

3333
public func toJavaParameter() -> JavaParameter {
34-
return JavaParameter(int: JavaInt(self))
34+
return JavaParameter(int: self)
3535
}
3636

37-
public static func fromStaticField(_ fieldID: JavaFieldID, of javaClass: JavaClass) throws -> Int {
38-
let result = try jni.GetStaticIntField(of: javaClass, id: fieldID)
39-
return Int(result)
37+
public static func fromStaticField(_ fieldID: JavaFieldID, of javaClass: JavaClass) throws -> JavaInt {
38+
return try jni.GetStaticIntField(of: javaClass, id: fieldID)
4039
}
4140

42-
public static func fromMethod(calling methodID: JavaMethodID, on object: JavaObject, args: [JavaParameter]) throws -> Int {
43-
let result = try jni.CallIntMethod(methodID, on: object, parameters: args)
44-
return Int(result)
41+
public static func fromMethod(calling methodID: JavaMethodID, on object: JavaObject, args: [JavaParameter]) throws -> JavaInt {
42+
return try jni.CallIntMethod(methodID, on: object, parameters: args)
4543
}
4644

47-
public static func fromStaticMethod(calling methodID: JavaMethodID, on javaClass: JavaClass, args: [JavaParameter]) throws -> Int {
48-
let result = try jni.CallStaticIntMethod(methodID, on: javaClass, parameters: args)
49-
return Int(result)
45+
public static func fromStaticMethod(calling methodID: JavaMethodID, on javaClass: JavaClass, args: [JavaParameter]) throws -> JavaInt {
46+
return try jni.CallStaticIntMethod(methodID, on: javaClass, parameters: args)
5047
}
5148

52-
public static func fromField(_ fieldID: JavaFieldID, on javaObject: JavaObject) throws -> Int {
53-
return try Int(jni.GetIntField(of: javaObject, id: fieldID))
49+
public static func fromField(_ fieldID: JavaFieldID, on javaObject: JavaObject) throws -> JavaInt {
50+
return try jni.GetIntField(of: javaObject, id: fieldID)
5451
}
5552
}
5653

0 commit comments

Comments
 (0)