Skip to content

make Int64 aka JavaLong conform to JavaParameterConvertible #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Sources/JNI/JNIFields.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ public extension JNI {
return result
}

public func GetLongField(of javaObject: JavaObject, id: JavaFieldID) throws -> JavaLong {
let _env = self._env
let result = _env.pointee.pointee.GetLongField(_env, javaObject, id)
try checkAndThrowOnJNIError()
return result
}

public func GetDoubleField(of javaObject: JavaObject, id: JavaFieldID) throws -> JavaDouble {
let _env = self._env
let result = _env.pointee.pointee.GetDoubleField(_env, javaObject, id)
Expand Down Expand Up @@ -86,6 +93,13 @@ public extension JNI {
return result
}

public func GetStaticLongField(of javaClass: JavaClass, id: JavaFieldID) throws -> JavaLong {
let _env = self._env
let result = _env.pointee.pointee.GetStaticLongField(_env, javaClass, id)
try checkAndThrowOnJNIError()
return result
}

public func GetStaticDoubleField(of javaClass: JavaClass, id: JavaFieldID) throws -> JavaDouble {
let _env = self._env
let result = _env.pointee.pointee.GetStaticDoubleField(_env, javaClass, id)
Expand Down
16 changes: 16 additions & 0 deletions Sources/JNI/JNIMethods.swift
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@ extension JNI {
return result
}

public func CallLongMethod(_ method: JavaMethodID, on object: JavaObject, parameters: [JavaParameter]) throws -> JavaLong {
let _env = self._env
var methodArgs = parameters
let result = _env.pointee.pointee.CallLongMethod(_env, object, method, &methodArgs)
try checkAndThrowOnJNIError()
return result
}

public func CallDoubleMethod(_ method: JavaMethodID, on object: JavaObject, parameters: [JavaParameter]) throws -> JavaDouble {
let _env = self._env
var methodArgs = parameters
Expand Down Expand Up @@ -168,6 +176,14 @@ extension JNI {
return result
}

public func CallStaticLongMethod(_ method: JavaMethodID, on javaClass: JavaClass, parameters: [JavaParameter]) throws -> JavaLong {
let _env = self._env
var methodArgs = parameters
let result = _env.pointee.pointee.CallStaticLongMethodA(_env, javaClass, method, &methodArgs)
try checkAndThrowOnJNIError()
return result
}

public func CallStaticFloatMethod(_ method: JavaMethodID, on javaClass: JavaClass, parameters: [JavaParameter]) throws -> JavaFloat {
let _env = self._env
var methodArgs = parameters
Expand Down
26 changes: 26 additions & 0 deletions Sources/JNI/JavaParameterConvertible+Primitives.swift
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,29 @@ extension Float: JavaParameterConvertible, JavaInitializableFromMethod, JavaInit
return try jni.GetFloatField(of: javaObject, id: fieldID)
}
}

// JavaLong aka Int64

extension JavaLong: JavaParameterConvertible, JavaInitializableFromMethod, JavaInitializableFromField {
public static let asJNIParameterString = "J"

public func toJavaParameter() -> JavaParameter {
return JavaParameter(long: self)
}

public static func fromStaticField(_ fieldID: JavaFieldID, of javaClass: JavaClass) throws -> JavaLong {
return try JavaLong(jni.GetStaticLongField(of: javaClass, id: fieldID))
}

public static func fromMethod(calling methodID: JavaMethodID, on object: JavaObject, args: [JavaParameter]) throws -> JavaLong {
return try jni.CallLongMethod(methodID, on: object, parameters: args)
}

public static func fromStaticMethod(calling methodID: JavaMethodID, on javaClass: JavaClass, args: [JavaParameter]) throws -> JavaLong {
return try jni.CallStaticLongMethod(methodID, on: javaClass, parameters: args)
}

public static func fromField(_ fieldID: JavaFieldID, on javaObject: JavaObject) throws -> JavaLong {
return try jni.GetLongField(of: javaObject, id: fieldID)
}
}