diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2016-02-05 20:12:58 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2016-02-06 16:34:24 +0000 |
| commit | a7370b7bc0519a374b2abb9de26243f29da74c8a (patch) | |
| tree | c380bd2256c6dd25067348e7c81d6b73e8cdd386 /Lib/java | |
| parent | a16a81852378d865517cae114ac0481271748fd4 (diff) | |
| download | swig-a7370b7bc0519a374b2abb9de26243f29da74c8a.tar.gz | |
Formatting fixes in generated code for interface feature
Diffstat (limited to 'Lib/java')
| -rw-r--r-- | Lib/java/feature_interface.i | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Lib/java/feature_interface.i b/Lib/java/feature_interface.i index 3acbeb248..3693488f6 100644 --- a/Lib/java/feature_interface.i +++ b/Lib/java/feature_interface.i @@ -1,19 +1,15 @@ %define DECLARE_INTERFACE_(CTYPE, INTERFACE, IMPL) %feature("interface", name = "INTERFACE", cptr = #INTERFACE ## "_getCPtr") CTYPE; -%typemap(jstype) CTYPE*, const CTYPE& "INTERFACE" -%typemap(jtype, nopgcpp="1") CTYPE*, const CTYPE& "long" -%typemap(javadirectorout) CTYPE*, const CTYPE& "$javacall." ## #INTERFACE ## "_getCPtr()" -%typemap(javadirectorin) CTYPE*, const CTYPE& -%{ - ($jniinput == 0) ? null : (INTERFACE)new IMPL($jniinput,false) -%} +%typemap(jstype) CTYPE *, const CTYPE & "INTERFACE" +%typemap(jtype, nopgcpp="1") CTYPE *, const CTYPE & "long" +%typemap(javadirectorout) CTYPE *, const CTYPE & "$javacall." ## #INTERFACE ## "_getCPtr()" +%typemap(javadirectorin) CTYPE *, const CTYPE & "($jniinput == 0) ? null : (INTERFACE)new IMPL($jniinput, false)" %typemap(javain) CTYPE * "($javainput == null) ? 0 : $javainput." ## #INTERFACE ## "_getCPtr()" %typemap(javain) const CTYPE & "$javainput." ## #INTERFACE ## "_getCPtr()" -%typemap(javaout) CTYPE*, const CTYPE& -{ - long cPtr = $jnicall; - return (cPtr == 0) ? null : (INTERFACE)new IMPL(cPtr,true); -} +%typemap(javaout) CTYPE *, const CTYPE & { + long cPtr = $jnicall; + return (cPtr == 0) ? null : (INTERFACE)new IMPL(cPtr, true); + } SWIG_JAVABODY_PROXY(public, protected, CTYPE) %enddef |