Mercurial > octave
diff libinterp/octave-value/ov-java.cc @ 31607:aac27ad79be6 stable
maint: Re-indent code after switch to using namespace macros.
* build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc,
__ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc,
__pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h,
besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc,
call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc,
debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc,
dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h,
error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h,
event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc,
file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h,
gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h,
graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc,
gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h,
interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h,
inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc,
latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h,
lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc,
matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h,
oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc,
oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h,
oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h,
octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc,
pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc,
settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc,
sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc,
syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h,
symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h,
text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc,
url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h,
variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc,
gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc,
cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h,
cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h,
cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc,
ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc,
ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc,
ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc,
ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc,
ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc,
ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h,
ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc,
ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h,
octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc,
op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h,
anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h,
comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h,
parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h,
pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h,
pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc,
pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc,
pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h,
pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h,
pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h,
pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h,
pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h,
pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h,
pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h,
pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h,
idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h,
aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h,
gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc,
lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h,
oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc,
oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h,
randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h,
sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc,
sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h,
file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h,
lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h,
oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc,
oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h,
action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h,
cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h,
lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h,
lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc,
oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc,
oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc,
oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc,
pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc,
url-transfer.h:
Re-indent code after switch to using namespace macros.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 01 Dec 2022 18:02:15 -0800 |
| parents | e88a07dec498 |
| children | 597f3ee61a48 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc Thu Dec 01 14:23:45 2022 -0800 +++ b/libinterp/octave-value/ov-java.cc Thu Dec 01 18:02:15 2022 -0800 @@ -89,10 +89,10 @@ #define TO_JNIENV(env) reinterpret_cast<JNIEnv *> (env) typedef jint (JNICALL *JNI_CreateJavaVM_t) (JavaVM **pvm, JNIEnv **penv, - void *args); + void *args); typedef jint (JNICALL *JNI_GetCreatedJavaVMs_t) (JavaVM **pvm, jsize bufLen, - jsize *nVMs); + jsize *nVMs); template <typename T> class java_local_ref @@ -210,8 +210,8 @@ static octave::dynamic_library jvm_lib; -static std::map<int,octave_value> listener_map; -static std::map<int,octave_value> octave_ref_map; +static std::map<int, octave_value> listener_map; +static std::map<int, octave_value> octave_ref_map; static int octave_java_refcount = 0; //! The thread id of the currently executing thread or @c -1 if this is @@ -226,98 +226,98 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class JVMArgs +class JVMArgs +{ +public: + + JVMArgs (void) + { + m_vm_args.version = JNI_VERSION_1_6; + m_vm_args.nOptions = 0; + m_vm_args.options = nullptr; + m_vm_args.ignoreUnrecognized = false; + } + + ~JVMArgs (void) + { + clean (); + } + + JavaVMInitArgs * to_args () + { + update (); + return &m_vm_args; + } + + void add (const std::string& opt) + { + m_java_opts.push_back (opt); + } + + void read_java_opts (const std::string& filename) { - public: - - JVMArgs (void) - { - m_vm_args.version = JNI_VERSION_1_6; - m_vm_args.nOptions = 0; - m_vm_args.options = nullptr; - m_vm_args.ignoreUnrecognized = false; - } - - ~JVMArgs (void) - { - clean (); - } - - JavaVMInitArgs * to_args () - { - update (); - return &m_vm_args; - } - - void add (const std::string& opt) - { - m_java_opts.push_back (opt); - } - - void read_java_opts (const std::string& filename) - { - std::ifstream js = sys::ifstream (filename.c_str ()); - - if (! js.bad () && ! js.fail ()) - { - std::string line; - - while (! js.eof () && ! js.fail ()) - { - std::getline (js, line); - - if (line.find ('-') == 0) - m_java_opts.push_back (line); - else if (line.length () > 0 && Vdebug_java) - warning ("invalid JVM option, skipping: %s", line.c_str ()); - } - } - } - - private: - - void clean (void) - { - if (m_vm_args.options != nullptr) - { - for (int i = 0; i < m_vm_args.nOptions; i++) - delete [] m_vm_args.options[i].optionString; - - delete [] m_vm_args.options; - - m_vm_args.options = nullptr; - m_vm_args.nOptions = 0; - } - } - - void update (void) - { - clean (); - - if (m_java_opts.size () > 0) - { - int index = 0; - - m_vm_args.nOptions = m_java_opts.size (); - m_vm_args.options = new JavaVMOption [m_vm_args.nOptions]; - - for (const auto& opt : m_java_opts) - { - if (Vdebug_java) - octave_stdout << opt << std::endl; - m_vm_args.options[index++].optionString = strsave (opt.c_str ()); - } - - m_java_opts.clear (); - } - } - - private: - - JavaVMInitArgs m_vm_args; - - std::list<std::string> m_java_opts; - }; + std::ifstream js = sys::ifstream (filename.c_str ()); + + if (! js.bad () && ! js.fail ()) + { + std::string line; + + while (! js.eof () && ! js.fail ()) + { + std::getline (js, line); + + if (line.find ('-') == 0) + m_java_opts.push_back (line); + else if (line.length () > 0 && Vdebug_java) + warning ("invalid JVM option, skipping: %s", line.c_str ()); + } + } + } + +private: + + void clean (void) + { + if (m_vm_args.options != nullptr) + { + for (int i = 0; i < m_vm_args.nOptions; i++) + delete [] m_vm_args.options[i].optionString; + + delete [] m_vm_args.options; + + m_vm_args.options = nullptr; + m_vm_args.nOptions = 0; + } + } + + void update (void) + { + clean (); + + if (m_java_opts.size () > 0) + { + int index = 0; + + m_vm_args.nOptions = m_java_opts.size (); + m_vm_args.options = new JavaVMOption [m_vm_args.nOptions]; + + for (const auto& opt : m_java_opts) + { + if (Vdebug_java) + octave_stdout << opt << std::endl; + m_vm_args.options[index++].optionString = strsave (opt.c_str ()); + } + + m_java_opts.clear (); + } + } + +private: + + JavaVMInitArgs m_vm_args; + + std::list<std::string> m_java_opts; +}; OCTAVE_END_NAMESPACE(octave) @@ -452,7 +452,8 @@ // The filename is "javaclasspath.txt", but historically has been // "classpath.txt" so both are supported. std::vector<std::string> cp_list = {"javaclasspath.txt", - "classpath.txt"}; + "classpath.txt" + }; for (std::string filename : cp_list) { @@ -517,10 +518,11 @@ const std::array<const std::string, 2> subdirs = {"bin/client", "bin/server"}; #else const std::array<const std::string, 8> subdirs = - {"jre/lib/server", "jre/lib", "lib/client", "lib/server", - "jre/lib/amd64/client", "jre/lib/amd64/server", - "jre/lib/i386/client", "jre/lib/i386/server" - }; + { + "jre/lib/server", "jre/lib", "lib/client", "lib/server", + "jre/lib/amd64/client", "jre/lib/amd64/server", + "jre/lib/i386/client", "jre/lib/i386/server" + }; #endif for (std::size_t i = 0; i < subdirs.size (); i++) @@ -536,10 +538,10 @@ #if defined (OCTAVE_USE_WINDOWS_API) OCTAVE_BEGIN_NAMESPACE(octave) - // Declare function defined in sysdep.cc - extern LONG - get_regkey_value (HKEY h_rootkey, const std::string subkey, - const std::string name, octave_value& value); +// Declare function defined in sysdep.cc +extern LONG +get_regkey_value (HKEY h_rootkey, const std::string subkey, + const std::string name, octave_value& value); OCTAVE_END_NAMESPACE(octave) static std::string @@ -808,8 +810,8 @@ // Additional options given by file java.opts. m_vm_args.read_java_opts (initial_java_dir () + - octave::sys::file_ops::dir_sep_str () + - "java.opts"); + octave::sys::file_ops::dir_sep_str () + + "java.opts"); if (create_vm (&jvm, ¤t_env, m_vm_args.to_args ()) != JNI_OK) error ("unable to start Java VM in %s", jvm_lib_path.c_str ()); @@ -982,7 +984,7 @@ "()Ljava/lang/String;"); jstring_ref js (jni_env, reinterpret_cast<jstring> (jni_env->CallObjectMethod (ex, - mID))); + mID))); std::string msg = jstring_to_string (jni_env, js); error ("[java] %s", msg.c_str ()); @@ -1012,9 +1014,9 @@ jclass_ref syscls (jni_env, jni_env->FindClass ("java/lang/System")); jmethodID mID = jni_env->GetStaticMethodID - (syscls, - "getProperty", - "(Ljava/lang/String;)Ljava/lang/String;"); + (syscls, + "getProperty", + "(Ljava/lang/String;)Ljava/lang/String;"); jstring_ref js (jni_env, jni_env->NewStringUTF ("octave.class.loader")); js = reinterpret_cast<jstring> (jni_env->CallStaticObjectMethod @@ -1037,7 +1039,7 @@ jclass_ref jcls2 (jni_env, jni_env->FindClass ("org/openide/util/Lookup")); jmethodID mID = jni_env->GetStaticMethodID - (jcls2, "getDefault", "()Lorg/openide/util/Lookup;"); + (jcls2, "getDefault", "()Lorg/openide/util/Lookup;"); jobject_ref lObj (jni_env, jni_env->CallStaticObjectMethod (jcls2, mID)); mID = jni_env->GetMethodID (jcls2, "lookup", @@ -1052,21 +1054,21 @@ jstring_ref js (jni_env, jni_env->NewStringUTF (class_loader.c_str ())); uicls = reinterpret_cast<jclass> - (jni_env->CallObjectMethod (cLoader, mID, jstring (js))); + (jni_env->CallObjectMethod (cLoader, mID, jstring (js))); } if (uicls) uiClass = reinterpret_cast<jclass> - (jni_env->NewGlobalRef (jclass (uicls))); + (jni_env->NewGlobalRef (jclass (uicls))); } if (uiClass) { jmethodID mID = jni_env->GetStaticMethodID - (uiClass, "findClass", "(Ljava/lang/String;)Ljava/lang/Class;"); + (uiClass, "findClass", "(Ljava/lang/String;)Ljava/lang/Class;"); jstring_ref js (jni_env, jni_env->NewStringUTF (name)); jcls = reinterpret_cast<jclass> - (jni_env->CallStaticObjectMethod (uiClass, mID, jstring (js))); + (jni_env->CallStaticObjectMethod (uiClass, mID, jstring (js))); } } @@ -1081,8 +1083,8 @@ jclass_ref ccls (jni_env, jni_env->GetObjectClass (jcls)); jmethodID isArray_ID = jni_env->GetMethodID (ccls, "isArray", "()Z"); jmethodID getComponentType_ID = jni_env->GetMethodID (ccls, - "getComponentType", - "()Ljava/lang/Class;"); + "getComponentType", + "()Ljava/lang/Class;"); dim_vector dv (1, 1); int idx = 0; @@ -1095,11 +1097,11 @@ dv.resize (idx+1); dv(idx) = len; jcls = reinterpret_cast<jclass> - (jni_env->CallObjectMethod (jcls, getComponentType_ID)); + (jni_env->CallObjectMethod (jcls, getComponentType_ID)); jobj = len > 0 - ? reinterpret_cast<jobjectArray> (jni_env->GetObjectArrayElement (jobj, - 0)) - : nullptr; + ? reinterpret_cast<jobjectArray> (jni_env->GetObjectArrayElement (jobj, + 0)) + : nullptr; idx++; } @@ -1155,12 +1157,12 @@ jclass_ref helperClass (jni_env, find_octave_class (jni_env, - "org/octave/ClassHelper")); + "org/octave/ClassHelper")); jmethodID mID = jni_env - ->GetStaticMethodID (helperClass, "arraySubsref", - "(Ljava/lang/Object;[[I)Ljava/lang/Object;"); + ->GetStaticMethodID (helperClass, "arraySubsref", + "(Ljava/lang/Object;[[I)Ljava/lang/Object;"); resObj = jni_env->CallStaticObjectMethod - (helperClass, mID, jobj, jobject (java_idx)); + (helperClass, mID, jobj, jobject (java_idx)); if (resObj) retval = box (jni_env, resObj); @@ -1187,11 +1189,11 @@ { jclass_ref helperClass (jni_env, find_octave_class (jni_env, - "org/octave/ClassHelper")); + "org/octave/ClassHelper")); jmethodID mID = jni_env->GetStaticMethodID (helperClass, "arraySubsasgn", - "(Ljava/lang/Object;[[ILjava/lang/Object;)" "Ljava/lang/Object;"); + "(Ljava/lang/Object;[[ILjava/lang/Object;)" "Ljava/lang/Object;"); resObj = jni_env->CallStaticObjectMethod - (helperClass, mID, jobj, jobject (java_idx), jobject (rhsObj)); + (helperClass, mID, jobj, jobject (java_idx), jobject (rhsObj)); } if (resObj) @@ -1216,9 +1218,9 @@ jclass_ref cls (jni_env, jni_env->GetObjectClass (jobj)); jclass_ref ccls (jni_env, jni_env->GetObjectClass (cls)); jmethodID getMethods_ID = jni_env->GetMethodID - (ccls, "getMethods", "()[Ljava/lang/reflect/Method;"); + (ccls, "getMethods", "()[Ljava/lang/reflect/Method;"); jmethodID getFields_ID = jni_env->GetMethodID - (ccls, "getFields", "()[Ljava/lang/reflect/Field;"); + (ccls, "getFields", "()[Ljava/lang/reflect/Field;"); jobjectArray_ref mList (jni_env, reinterpret_cast<jobjectArray> (jni_env->CallObjectMethod (cls, getMethods_ID))); @@ -1232,16 +1234,16 @@ jclass_ref fCls (jni_env, jni_env->FindClass ("java/lang/reflect/Field")); jmethodID m_getName_ID = jni_env->GetMethodID (mCls, "getName", - "()Ljava/lang/String;"); + "()Ljava/lang/String;"); jmethodID f_getName_ID = jni_env->GetMethodID (fCls, "getName", - "()Ljava/lang/String;"); + "()Ljava/lang/String;"); for (int i = 0; i < mLen; i++) { jobject_ref meth (jni_env, jni_env->GetObjectArrayElement (mList, i)); jstring_ref methName (jni_env, reinterpret_cast<jstring> - (jni_env->CallObjectMethod (meth, - m_getName_ID))); + (jni_env->CallObjectMethod (meth, + m_getName_ID))); name_list.push_back (jstring_to_string (jni_env, methName)); } @@ -1308,8 +1310,8 @@ "()Ljava/lang/String;"); jstring_ref js (jni_env, reinterpret_cast<jstring> - (jni_env->CallObjectMethod (m_java_object, - mID))); + (jni_env->CallObjectMethod (m_java_object, + mID))); if (js) retval = octave_value (jstring_to_string (jni_env, js), type); @@ -1470,7 +1472,7 @@ reinterpret_cast<jintArray> (jni_env->CallObjectMethod (jobj, mID))); jint *iv_data = jni_env->GetIntArrayElements (jintArray (iv), - nullptr); + nullptr); dim_vector dims; dims.resize (jni_env->GetArrayLength (jintArray (iv))); @@ -1492,8 +1494,8 @@ mID = jni_env->GetMethodID (cls, "toDouble", "()[D"); jdoubleArray_ref dv (jni_env, reinterpret_cast<jdoubleArray> - (jni_env->CallObjectMethod (jobj, - mID))); + (jni_env->CallObjectMethod (jobj, + mID))); jni_env->GetDoubleArrayRegion (dv, 0, m.numel (), m.fortran_vec ()); retval = m; @@ -1507,11 +1509,11 @@ mID = jni_env->GetMethodID (cls, "toByte", "()[B"); jbyteArray_ref dv (jni_env, reinterpret_cast<jbyteArray> - (jni_env->CallObjectMethod (jobj, - mID))); + (jni_env->CallObjectMethod (jobj, + mID))); jni_env->GetByteArrayRegion (dv, 0, m.numel (), reinterpret_cast<jbyte *> - (m.fortran_vec ())); + (m.fortran_vec ())); retval = m; break; } @@ -1521,11 +1523,11 @@ mID = jni_env->GetMethodID (cls, "toByte", "()[B"); jbyteArray_ref dv (jni_env, reinterpret_cast<jbyteArray> - (jni_env->CallObjectMethod (jobj, - mID))); + (jni_env->CallObjectMethod (jobj, + mID))); jni_env->GetByteArrayRegion (dv, 0, m.numel (), reinterpret_cast<jbyte *> - (m.fortran_vec ())); + (m.fortran_vec ())); retval = m; break; } @@ -1538,11 +1540,11 @@ mID = jni_env->GetMethodID (cls, "toInt", "()[I"); jintArray_ref dv (jni_env, reinterpret_cast<jintArray> - (jni_env->CallObjectMethod (jobj, - mID))); + (jni_env->CallObjectMethod (jobj, + mID))); jni_env->GetIntArrayRegion (dv, 0, m.numel (), reinterpret_cast<jint *> - (m.fortran_vec ())); + (m.fortran_vec ())); retval = m; break; } @@ -1552,11 +1554,11 @@ mID = jni_env->GetMethodID (cls, "toInt", "()[I"); jintArray_ref dv (jni_env, reinterpret_cast<jintArray> - (jni_env->CallObjectMethod (jobj, - mID))); + (jni_env->CallObjectMethod (jobj, + mID))); jni_env->GetIntArrayRegion (dv, 0, m.numel (), reinterpret_cast<jint *> - (m.fortran_vec ())); + (m.fortran_vec ())); retval = m; break; } @@ -1637,8 +1639,8 @@ { jdoubleArray_ref row (jni_env, reinterpret_cast<jdoubleArray> - (jni_env->GetObjectArrayElement - (jarr, r))); + (jni_env->GetObjectArrayElement + (jarr, r))); if (m.isempty ()) { @@ -1646,7 +1648,7 @@ m.resize (cols, rows); } jni_env->GetDoubleArrayRegion - (row, 0, cols, m.fortran_vec () + r * cols); + (row, 0, cols, m.fortran_vec () + r * cols); } retval = m.transpose (); } @@ -1745,7 +1747,7 @@ // into a String[], not into a char array if (val.is_double_type ()) - UNBOX_PRIMITIVE_ARRAY ( , , jdouble, Double); + UNBOX_PRIMITIVE_ARRAY (,, jdouble, Double); else if (val.islogical ()) UNBOX_PRIMITIVE_ARRAY (bool_, bool, jboolean, Boolean); else if (val.isfloat ()) @@ -1833,7 +1835,7 @@ && val.isreal ()) { jclass_ref mcls (jni_env, find_octave_class (jni_env, - "org/octave/Matrix")); + "org/octave/Matrix")); dim_vector dims = val.dims (); jintArray_ref iv (jni_env, jni_env->NewIntArray (dims.ndims ())); jint *iv_data = jni_env->GetIntArrayElements (jintArray (iv), nullptr); @@ -1863,7 +1865,7 @@ (m.fortran_vec ())); jmethodID mID = jni_env->GetMethodID (mcls, "<init>", "([B[I)V"); jobj = jni_env->NewObject - (jclass (mcls), mID, jbyteArray (bv), jintArray (iv)); + (jclass (mcls), mID, jbyteArray (bv), jintArray (iv)); jcls = jni_env->GetObjectClass (jobj); } else if (val.is_uint8_type ()) @@ -1875,7 +1877,7 @@ (m.fortran_vec ())); jmethodID mID = jni_env->GetMethodID (mcls, "<init>", "([B[I)V"); jobj = jni_env->NewObject - (jclass (mcls), mID, jbyteArray (bv), jintArray (iv)); + (jclass (mcls), mID, jbyteArray (bv), jintArray (iv)); jcls = jni_env->GetObjectClass (jobj); } else if (val.is_int32_type ()) @@ -1887,7 +1889,7 @@ (m.fortran_vec ())); jmethodID mID = jni_env->GetMethodID (mcls, "<init>", "([I[I)V"); jobj = jni_env->NewObject - (jclass (mcls), mID, jintArray (v), jintArray (iv)); + (jclass (mcls), mID, jintArray (v), jintArray (iv)); jcls = jni_env->GetObjectClass (jobj); } else @@ -1956,7 +1958,7 @@ // Call Java method static Thread java.lang.Thread.currentThread(). jclass_ref cls (jni_env, jni_env->FindClass ("java/lang/Thread")); jmethodID mID = jni_env->GetStaticMethodID (cls, "currentThread", - "()Ljava/lang/Thread;"); + "()Ljava/lang/Thread;"); jobject_ref jthread (jni_env, jni_env->CallStaticObjectMethod (cls, mID)); if (jthread) @@ -1985,9 +1987,9 @@ { // Invoke static void org.octave.Octave.checkPendingAction(). jclass_ref cls (current_env, find_octave_class (current_env, - "org/octave/Octave")); + "org/octave/Octave")); jmethodID mID = current_env->GetStaticMethodID - (cls, "checkPendingAction", "()V"); + (cls, "checkPendingAction", "()V"); current_env->CallStaticVoidMethod (cls, mID); octave_set_default_fpucw (); @@ -2220,7 +2222,7 @@ case '(': if (current_env) retval = get_array_elements - (current_env, TO_JOBJECT (to_java ()), idx.front ()); + (current_env, TO_JOBJECT (to_java ()), idx.front ()); break; default: @@ -2465,10 +2467,11 @@ { jclass_ref helperClass (jni_env, find_octave_class (jni_env, "org/octave/ClassHelper")); jmethodID mID = jni_env->GetStaticMethodID (helperClass, "invokeMethod", - "(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Class;)Ljava/lang/Object;"); + "(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Class;)Ljava/lang/Object;"); jstring_ref methName (jni_env, jni_env->NewStringUTF (name.c_str ())); - jobjectArray_ref resObj (jni_env, reinterpret_cast<jobjectArray> (jni_env->CallStaticObjectMethod (helperClass, mID, - to_java (), jstring (methName), jobjectArray (arg_objs), jobjectArray (arg_types)))); + jobjectArray_ref resObj (jni_env, + reinterpret_cast<jobjectArray> (jni_env->CallStaticObjectMethod (helperClass, mID, + to_java (), jstring (methName), jobjectArray (arg_objs), jobjectArray (arg_types)))); if (resObj) retval = box (jni_env, resObj); else @@ -2534,21 +2537,21 @@ { jclass_ref helperClass (jni_env, find_octave_class (jni_env, - "org/octave/ClassHelper")); + "org/octave/ClassHelper")); jmethodID mID = jni_env->GetStaticMethodID (helperClass, - "invokeStaticMethod", - "(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Class;)Ljava/lang/Object;"); + "invokeStaticMethod", + "(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Class;)Ljava/lang/Object;"); jstring_ref methName (jni_env, jni_env->NewStringUTF (name.c_str ())); jstring_ref clsName (jni_env, jni_env->NewStringUTF (class_name.c_str ())); jobject_ref resObj (jni_env, jni_env->CallStaticObjectMethod (helperClass, - mID, - jstring (clsName), - jstring (methName), - jobjectArray (arg_objs), - jobjectArray (arg_types))); + mID, + jstring (clsName), + jstring (methName), + jobjectArray (arg_objs), + jobjectArray (arg_types))); if (resObj) retval = box (jni_env, resObj); else @@ -2616,18 +2619,18 @@ { jclass_ref helperClass (jni_env, find_octave_class (jni_env, - "org/octave/ClassHelper")); + "org/octave/ClassHelper")); jmethodID mID = jni_env->GetStaticMethodID (helperClass, - "invokeConstructor", - "(Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Class;)Ljava/lang/Object;"); + "invokeConstructor", + "(Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Class;)Ljava/lang/Object;"); jstring_ref clsName (jni_env, jni_env->NewStringUTF (name.c_str ())); jobject_ref resObj (jni_env, jni_env->CallStaticObjectMethod (helperClass, - mID, - jstring (clsName), - jobjectArray (arg_objs), - jobjectArray (arg_types))); + mID, + jstring (clsName), + jobjectArray (arg_objs), + jobjectArray (arg_types))); if (resObj) retval = octave_value (new octave_java (resObj, nullptr)); @@ -2688,15 +2691,15 @@ { jclass_ref helperClass (jni_env, find_octave_class (jni_env, - "org/octave/ClassHelper")); + "org/octave/ClassHelper")); jmethodID mID = jni_env->GetStaticMethodID (helperClass, "getField", - "(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;"); + "(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;"); jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ())); jobject_ref resObj (jni_env, jni_env->CallStaticObjectMethod (helperClass, - mID, - to_java (), - jstring (fName))); + mID, + to_java (), + jstring (fName))); if (resObj) retval = box (jni_env, resObj); @@ -2754,16 +2757,16 @@ { jclass_ref helperClass (jni_env, find_octave_class (jni_env, - "org/octave/ClassHelper")); + "org/octave/ClassHelper")); jmethodID mID = jni_env->GetStaticMethodID (helperClass, - "getStaticField", - "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;"); + "getStaticField", + "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;"); jstring_ref cName (jni_env, jni_env->NewStringUTF (class_name.c_str ())); jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ())); jobject_ref resObj (jni_env, jni_env->CallStaticObjectMethod (helperClass, mID, - jstring (cName), - jstring (fName))); + jstring (cName), + jstring (fName))); if (resObj) retval = box (jni_env, resObj); else @@ -2828,9 +2831,9 @@ { jclass_ref helperClass (jni_env, find_octave_class (jni_env, - "org/octave/ClassHelper")); + "org/octave/ClassHelper")); jmethodID mID = jni_env->GetStaticMethodID (helperClass, "setField", - "(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V"); + "(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V"); jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ())); jni_env->CallStaticObjectMethod (helperClass, mID, to_java (), jstring (fName), jobject (jobj)); @@ -2895,10 +2898,10 @@ { jclass_ref helperClass (jni_env, find_octave_class (jni_env, - "org/octave/ClassHelper")); + "org/octave/ClassHelper")); jmethodID mID = jni_env->GetStaticMethodID (helperClass, - "setStaticField", - "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V"); + "setStaticField", + "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V"); jstring_ref cName (jni_env, jni_env->NewStringUTF (class_name.c_str ())); jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ())); @@ -2979,8 +2982,8 @@ jclass_ref clsCls (current_env, current_env->GetObjectClass (TO_JCLASS (m_java_class))); jmethodID mID = current_env->GetMethodID (clsCls, - "getCanonicalName", - "()Ljava/lang/String;"); + "getCanonicalName", + "()Ljava/lang/String;"); jobject_ref resObj (current_env, current_env->CallObjectMethod (TO_JCLASS (m_java_class), mID)); m_java_classname = jstring_to_string (current_env, resObj);