SWIGJava: more work making macros more general
SWIGJava: more work making macros more general

ncorgan/swig-files,ncorgan/swig-files,ncorgan/swig-files,ncorgan/swig-files,ncorgan/swig-files,ncorgan/swig-files