-%typemap(out) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > {
- jclass HashMap = jenv->FindClass("java/util/HashMap");
- jmethodID HashMap_init = jenv->GetMethodID(HashMap, "<init>", "()V");
- jmethodID HashMap_put = jenv->GetMethodID(HashMap, "put",
- "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
- jclass HashSet = jenv->FindClass("java/util/HashSet");
- jmethodID HashSet_init = jenv->GetMethodID(HashSet, "<init>", "()V");
- jmethodID HashSet_add = jenv->GetMethodID(HashSet, "add",
- "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
- jclass ConfigKey = jenv->FindClass("org/sigrok/core/classes/ConfigKey");
- jmethodID ConfigKey_init = jenv->GetMethodID(ConfigKey, "<init>", "(JZ)V");
- jclass Capability = jenv->FindClass("org/sigrok/core/classes/Capability");
- jmethodID Capability_swigToEnum = jenv->GetStaticMethodID(Capability,
- "swigToEnum", "(I)Lorg/sigrok/core/classes/Capability;");
- $result = jenv->NewObject(HashMap, HashMap_init);
- jlong key = 0;
- for (auto map_entry : $1)
- {
- *(const sigrok::ConfigKey **) &key = map_entry.first;
- jobject value = jenv->NewObject(HashSet, HashSet_init);
- for (auto &set_entry : map_entry.second)
- jenv->CallObjectMethod(value, HashSet_add,
- jenv->CallStaticObjectMethod(Capability,
- Capability_swigToEnum, set_entry));
- jenv->CallObjectMethod($result, HashMap_put,
- jenv->NewObject(ConfigKey, ConfigKey_init, key, false), value);
+%inline {
+namespace {
+ class ScopedEnv {
+ public:
+ ScopedEnv(JavaVM *jvm);
+ ~ScopedEnv();
+ JNIEnv* operator-> () { return env; }
+ operator bool () const { return (bool)env; }
+ private:
+ JavaVM *jvm;
+ JNIEnv *env;
+ int env_status;
+ };
+ ScopedEnv::ScopedEnv(JavaVM *jvm) : jvm(jvm), env(NULL) {
+ env_status = jvm->GetEnv((void **)&env, JNI_VERSION_1_2);
+ if (env_status == JNI_EDETACHED) {
+%#if defined(__ANDROID__)
+ jvm->AttachCurrentThread(&env, NULL);
+%#else
+ jvm->AttachCurrentThread((void **)&env, NULL);
+%#endif
+ }