Skip to content

implement JNIObject.getField() #17

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 3 commits into from
Oct 15, 2020
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
6 changes: 3 additions & 3 deletions Sources/JNI/Array+JavaParameterConvertible.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ extension String {
}

extension Array where Element == JavaParameterConvertible {
func asJavaParameters() -> [JavaParameter] {
public func asJavaParameters() -> [JavaParameter] {
return self.map { $0.toJavaParameter() }
}

Expand All @@ -27,12 +27,12 @@ extension Array where Element == JavaParameterConvertible {

/// Returns the String of ordered arguments enclosed in brackets, followed by the `returnType`'s type string, or 'V'
/// (Void) if nil is provided. e.g. Returns "(II)V" for `[JavaInt(1), JavaInt(99)].methodSignature(returnType: nil)`
func methodSignature(returnType: JavaParameterConvertible.Type?) -> String {
public func methodSignature(returnType: JavaParameterConvertible.Type?) -> String {
let returnTypeString = returnType?.asJNIParameterString ?? "V"
return "(" + self.argumentSignature() + ")" + returnTypeString
}

func methodSignature(customReturnType: String) -> String {
public func methodSignature(customReturnType: String) -> String {
let returnTypeString = customReturnType.replacingFullstopsWithSlashes()
return "(" + self.argumentSignature() + ")" + returnTypeString
}
Expand Down
3 changes: 3 additions & 0 deletions Sources/JNI/JNIFields.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ public extension JNI {
func GetField<T: JavaInitializableFromField & JavaParameterConvertible>(_ fieldName: String, from javaObject: JavaObject) throws -> T {
let env = self._env
let javaClass = try GetObjectClass(obj: javaObject)
defer {
jni.DeleteLocalRef(javaClass)
}
let fieldID = env.pointee.pointee.GetFieldID(env, javaClass, fieldName, T.asJNIParameterString)
try checkAndThrowOnJNIError()
return try T.fromField(fieldID!, on: javaObject)
Expand Down
18 changes: 17 additions & 1 deletion Sources/JNI/JNIObjects.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import CJNI
import Dispatch
import Foundation

/// Designed to simplify calling a constructor and methods on a JavaClass
/// Subclass this and add the methods appropriate to the object you are constructing.
Expand All @@ -11,7 +12,7 @@ open class JNIObject {
private static var classInstances = [String: JavaClass]()

public static var javaClass: JavaClass {
return DispatchQueue.main.sync {
func getClassInstance() -> JavaClass {
if let classInstance = classInstances[className] {
return classInstance
}
Expand All @@ -23,6 +24,15 @@ open class JNIObject {

return classInstance
}

if Thread.isMainThread {
return getClassInstance()
} else {
return DispatchQueue.main.sync {
return getClassInstance()
}
}

}

public let instance: JavaObject
Expand Down Expand Up @@ -71,6 +81,12 @@ open class JNIObject {
return try jni.call(methodName, on: self.instance, arguments: arguments)
}

public func getField<T: JavaInitializableFromField & JavaParameterConvertible>(
_ fieldName: String
) throws -> T {
return try jni.GetField(fieldName, from: self.instance)
}

public static func callStatic(methodName: String, arguments: [JavaParameterConvertible] = []) throws {
try jni.callStatic(methodName, on: self.javaClass, arguments: arguments)
}
Expand Down