bindings: Wrap enum sr_configcap as Capability class.

[libsigrok.git] / bindings / java / org / sigrok / core / classes / classes.i

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index dda333df09dc7762a6057779f93abede14995e91..1b303464ea34bf16c6eb28d656dfd09f7298401d 100644 (file)
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -195,14 +195,14 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
 
 /* Specialisation for ConfigKey->set<Capability> maps */
 
-MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
+MAP_COMMON(const sigrok::ConfigKey *, std::set<const sigrok::Capability *>,
   ConfigKey, java.util.Set<Capability>)
 
-%typemap(jni) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > "jobject"
-%typemap(jtype) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> >
+%typemap(jni) std::map<const sigrok::ConfigKey *, std::set<const sigrok::Capability *> > "jobject"
+%typemap(jtype) std::map<const sigrok::ConfigKey *, std::set<const sigrok::Capability *> >
   "java.util.Map<ConfigKey,java.util.Set<Capability>>"
 
-%typemap(out) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > {
+%typemap(out) std::map<const sigrok::ConfigKey *, std::set<const sigrok::Capability *> > {
   jclass HashMap = jenv->FindClass("java/util/HashMap");
   jmethodID HashMap_init = jenv->GetMethodID(HashMap, "<init>", "()V");
   jmethodID HashMap_put = jenv->GetMethodID(HashMap, "put",
@@ -214,8 +214,7 @@ MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
   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;");
+  jmethodID Capability_init = jenv->GetMethodID(Capability, "<init>", "(JZ)V");
   $result = jenv->NewObject(HashMap, HashMap_init);
   jlong key = 0;
   for (auto map_entry : $1)
@@ -224,8 +223,7 @@ MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
     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->NewObject(Capability, Capability_init, set_entry));
     jenv->CallObjectMethod($result, HashMap_put,
       jenv->NewObject(ConfigKey, ConfigKey_init, key, false), value);
   }
@@ -244,7 +242,6 @@ namespace {
   class ScopedEnv {
     public:
       ScopedEnv(JavaVM *jvm);
-      ScopedEnv(const ScopedEnv &ref) = delete;
       ~ScopedEnv();
       JNIEnv* operator-> () { return env; }
       operator bool () const { return (bool)env; }
@@ -279,7 +276,6 @@ namespace {
   {
     protected:
       GlobalRefBase (JavaVM *jvm, jobject ref);
-      GlobalRefBase (const GlobalRefBase &ref) = delete;
       ~GlobalRefBase ();
       JavaVM *jvm;
       jobject jref;