Revert "Java: Avoid dangerous writes via casted pointers"

[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 7e1919e2dce0b1864272dd6d9e5de4df604d5362..5a020d7ec3b960837f676392485a5b91bdeb34c1 100644 (file)
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -193,69 +193,41 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
   }
 }
 
-/* Support Driver.scan() with no arguments. */
-%ignore sigrok::Driver::scan;
+/* Specialisation for ConfigKey->set<Capability> maps */
 
-%extend sigrok::Driver {
-  std::vector<std::shared_ptr<sigrok::HardwareDevice> > scan()
-  {
-    std::map<const sigrok::ConfigKey *, Glib::VariantBase> options;
-    return $self->scan(options);
-  }
-
-  std::vector<std::shared_ptr<sigrok::HardwareDevice> > scan(
-    std::map<const sigrok::ConfigKey *, Glib::VariantBase> options)
-  {
-    return $self->scan(options);
-  }
-}
+MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
+  ConfigKey, java.util.Set<Capability>)
 
-/* Support InputFormat.create_input() with or without options. */
-%ignore sigrok::InputFormat::create_input;
+%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> >
+  "java.util.Map<ConfigKey,java.util.Set<Capability>>"
 
-%extend sigrok::InputFormat {
-  std::shared_ptr<sigrok::Input> create_input()
-  {
-    return $self->create_input();
-  }
-
-  std::shared_ptr<sigrok::Input> create_input(
-    std::map<std::string, Glib::VariantBase> options)
-  {
-    return $self->create_input(options);
-  }
-}
-
-/* Support OutputFormat.create_output() with or without options. */
-%ignore sigrok::OutputFormat::create_output;
-
-%extend sigrok::OutputFormat {
-  std::shared_ptr<sigrok::Output> create_output(
-    std::shared_ptr<sigrok::Device> device)
-  {
-    return $self->create_output(device);
-  }
-
-  std::shared_ptr<sigrok::Output> create_output(
-    std::shared_ptr<sigrok::Device> device,
-    std::map<std::string, Glib::VariantBase> options)
-  {
-    return $self->create_output(device, options);
-  }
-
-  std::shared_ptr<sigrok::Output> create_output(
-    std::string filename,
-    std::shared_ptr<sigrok::Device> device)
-  {
-    return $self->create_output(filename, device);
-  }
-
-  std::shared_ptr<sigrok::Output> create_output(
-    std::string filename,
-    std::shared_ptr<sigrok::Device> device,
-    std::map<std::string, Glib::VariantBase> options)
+%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;
+  for (auto map_entry : $1)
   {
-    return $self->create_output(filename, device, options);
+    *(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);
   }
 }
 
@@ -359,20 +331,13 @@ typedef jobject jdatafeedcallback;
 
 %include "doc.i"
 
-%define %attributevector(Class, Type, Name, Get)
-%attributeval(sigrok::Class, Type, Name, Get);
-%enddef
-
-%define %attributemap(Class, Type, Name, Get)
-%attributeval(sigrok::Class, Type, Name, Get);
-%enddef
-
 %define %enumextras(Class)
 %enddef
 
 /* Ignore these for now, need fixes. */
 %ignore sigrok::Context::create_analog_packet;
 %ignore sigrok::Context::create_meta_packet;
+%ignore sigrok::Meta::config;
 
 %include "bindings/swig/classes.i"