BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

java: Remove need for conversion methods on container wrappers.

This commit is contained in:
Martin Ling 2015-10-21 00:18:03 +01:00 committed by Uwe Hermann
parent c7855def61
commit f3095e7e2e
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bindings/java/org/sigrok/core/classes/classes.i
View File

@ -54,20 +54,12 @@ namespace Glib {
%typemap(jstype) std::vector< CValue > "java.util.Vector<JValue>" %typemap(jstype) std::vector< CValue > "java.util.Vector<JValue>"
%typemap(javain, %typemap(javain,
pre=" $javaclassname temp$javainput = $javaclassname.convertVector($javainput);", pre=" $javaclassname temp$javainput = new $javaclassname();
for (JValue value : $javainput)
temp$javainput.add(value);",
pgcppname="temp$javainput") pgcppname="temp$javainput")
std::vector< CValue > "$javaclassname.getCPtr(temp$javainput)" std::vector< CValue > "$javaclassname.getCPtr(temp$javainput)"
%typemap(javacode) std::vector< CValue > %{
static $javaclassname convertVector(java.util.Vector<JValue> in)
{
$javaclassname out = new $javaclassname();
for (JValue value : in)
out.add(value);
return out;
}
%}
%typemap(javaout) std::vector< CValue > { %typemap(javaout) std::vector< CValue > {
return (java.util.Vector<JValue>)$jnicall; return (java.util.Vector<JValue>)$jnicall;
} }
@ -102,20 +94,12 @@ VECTOR(std::shared_ptr<sigrok::HardwareDevice>, HardwareDevice)
"java.util.Map<JKey, JValue>" "java.util.Map<JKey, JValue>"
%typemap(javain, %typemap(javain,
pre=" $javaclassname temp$javainput = $javaclassname.convertMap($javainput);", pre=" $javaclassname temp$javainput = new $javaclassname();
for (java.util.Map.Entry<JKey, JValue> entry : $javainput.entrySet())
temp$javainput.set(entry.getKey(), entry.getValue());",
pgcppname="temp$javainput") pgcppname="temp$javainput")
std::map< CKey, CValue > "$javaclassname.getCPtr(temp$javainput)" std::map< CKey, CValue > "$javaclassname.getCPtr(temp$javainput)"
%typemap(javacode) std::map< CKey, CValue > %{
static $javaclassname convertMap(java.util.Map<JKey,JValue> in)
{
$javaclassname out = new $javaclassname();
for (java.util.Map.Entry<JKey, JValue> entry : in.entrySet())
out.set(entry.getKey(), entry.getValue());
return out;
}
%}
%typemap(javaout) std::map< CKey, CValue > { %typemap(javaout) std::map< CKey, CValue > {
return (java.util.Map<JKey, JValue>)$jnicall; return (java.util.Map<JKey, JValue>)$jnicall;
} }