octave: libinterp/octave-value/ov-java.cc annotate

annotate libinterp/octave-value/ov-java.cc @ 28527:9e7b2625e574 stable

ov-java.cc: Set reaper thread to use default stack size (bug #58641). * m4/acinclude.m4 (OCTAVE_CHECK_BROKEN_PTHREAD_STACKSIZE): New configure test. * configure.ac: Run new configure test. * ov-java.cc (initialize_jvm): Set jdk.lang.processReaperUseDefaultStackSize to true if the new configure test failed (work around a glibc bug).

author	Markus Mützel <markus.muetzel@gmx.de>
date	Fri, 26 Jun 2020 18:44:35 +0200
parents	d2fd4616829b
children	d5311ca8f945 a2fbb2074436

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 2007-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	25
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	26
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	27 //! @file ov-java.cc
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	28 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	29 //! Provides Octave's Java interface.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	30
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	31 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21211 diff changeset	32 # include "config.h"
15736 6faa01ff2967 build: Add --disable-java option to configure (bug #37838). Rik <rik@octave.org> parents: 15625 diff changeset	33 #endif
6faa01ff2967 build: Add --disable-java option to configure (bug #37838). Rik <rik@octave.org> parents: 15625 diff changeset	34
15755 3216dafbbd48 ov-java.cc: Correcty typo HAVE_WINDWOS_H to HAVE_WINDOWS_H Rik <rik@octave.org> parents: 15754 diff changeset	35 #if defined (HAVE_WINDOWS_H)
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21042 diff changeset	36 # include <windows.h>
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	37 #endif
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	38
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include <algorithm>
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	40 #include <fstream>
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	41 #include <map>
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	42 #include <string>
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	43 #include <vector>
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	44
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	45 #include <clocale>
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	46
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	47 #include "Cell.h"
23129 35e3d199527c Replace feval calls with direct call to C++ function (bug #50116). Rik <rik@octave.org> parents: 23084 diff changeset	48 #include "builtin-defun-decls.h"
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	49 #include "cmd-edit.h"
25460 627d6bde9b8d solve installation info initialization problem differently John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	50 #include "defaults.h"
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	51 #include "defun.h"
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	52 #include "error.h"
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	53 #include "errwarn.h"
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	54 #include "file-ops.h"
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	55 #include "file-stat.h"
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	56 #include "fpucw-wrappers.h"
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26009 diff changeset	57 #include "interpreter.h"
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26009 diff changeset	58 #include "interpreter-private.h"
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	59 #include "load-path.h"
25548 d6050ba12c0c Call get_ASCII_filename for std::ifstream (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25460 diff changeset	60 #include "lo-sysdep.h"
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	61 #include "oct-env.h"
27003 2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	62 #include "oct-process.h"
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	63 #include "oct-shlib.h"
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	64 #include "ov-java.h"
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	65 #include "parse.h"
15747 4be890c5527c * __java__.cc, __java__.h: Clean up lists of include files. John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	66 #include "variables.h"
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	67
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	68 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	69 #include <jni.h>
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	70 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	71
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	72 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	73
27003 2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	74 // FIXME: Should these values be configurable at run time?
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	75
25770 374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	76 #if defined (OCTAVE_USE_WINDOWS_API)
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	77 # define LIBJVM_FILE_NAME "jvm.dll"
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	78 #elif defined (__APPLE__)
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	79 # define LIBJVM_FILE_NAME "libjvm.dylib"
27003 2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	80 # define JAVA_HOME_CMD "/usr/libexec/java_home"
25770 374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	81 #else
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	82 # define LIBJVM_FILE_NAME "libjvm.so"
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	83 #endif
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	84
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	85 #define TO_JOBJECT(obj) reinterpret_cast<jobject> (obj)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	86 #define TO_JCLASS(obj) reinterpret_cast<jclass> (obj)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	87
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	88 #define TO_JNIENV(env) reinterpret_cast<JNIEnv *> (env)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	89
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	90 typedef jint (JNICALL JNI_CreateJavaVM_t) (JavaVM pvm, JNIEnv *penv,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	91 void *args);
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	92
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	93 typedef jint (JNICALL JNI_GetCreatedJavaVMs_t) (JavaVM *pvm, jsize bufLen,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	94 jsize *nVMs);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	95
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	96 template <typename T>
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	97 class java_local_ref
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	98 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	99 public:
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	100
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	101 java_local_ref (JNIEnv *_env)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	102 : jobj (nullptr), detached (false), env (_env) { }
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	103
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	104 java_local_ref (JNIEnv *_env, T obj)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	105 : jobj (obj), detached (false), env (_env) { }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	106
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	107 ~java_local_ref (void) { release (); }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	108
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	109 T& operator = (T obj)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	110 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	111 release ();
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	112
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	113 jobj = obj;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	114 detached = false;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	115
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	116 return jobj;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	117 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	118
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	119 operator bool () const { return (jobj != 0); }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	120 operator T () { return jobj; }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	121
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	122 void detach (void) { detached = true; }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	123
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	124 private:
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	125
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	126 void release (void)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	127 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	128 if (env && jobj && ! detached)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	129 env->DeleteLocalRef (jobj);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	130
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	131 jobj = nullptr;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	132 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	133
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	134 java_local_ref (void)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	135 : jobj (0), detached (false), env (0)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	136 { }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	137
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	138 protected:
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	139
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	140 T jobj;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	141 bool detached;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	142 JNIEnv *env;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	143 };
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	144
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	145 typedef java_local_ref<jobject> jobject_ref;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	146 typedef java_local_ref<jclass> jclass_ref;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	147 typedef java_local_ref<jstring> jstring_ref;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	148 typedef java_local_ref<jobjectArray> jobjectArray_ref;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	149 typedef java_local_ref<jintArray> jintArray_ref;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	150 typedef java_local_ref<jbyteArray> jbyteArray_ref;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	151 typedef java_local_ref<jdoubleArray> jdoubleArray_ref;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	152 typedef java_local_ref<jthrowable> jthrowable_ref;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	153
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	154 static std::string
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	155 jstring_to_string (JNIEnv *jni_env, jstring s);
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	156
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	157 static std::string
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	158 jstring_to_string (JNIEnv *jni_env, jobject obj);
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	159
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	160 static octave_value
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23449 diff changeset	161 box (JNIEnv jni_env, void jobj, void *jcls_arg = nullptr);
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	162
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	163 static octave_value
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23449 diff changeset	164 box_more (JNIEnv jni_env, void jobj_arg, void *jcls_arg = nullptr);
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	165
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	166 static bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	167 unbox (JNIEnv *jni_env, const octave_value& val, jobject_ref& jobj,
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	168 jclass_ref& jcls);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	169
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	170 static bool
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23447 diff changeset	171 unbox (JNIEnv *jni_env, const octave_value_list& args,
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	172 jobjectArray_ref& jobjs, jobjectArray_ref& jclss);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	173
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	174 extern "C"
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	175 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	176 JNIEXPORT jboolean JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	177 Java_org_octave_Octave_call (JNIEnv *, jclass, jstring, jobjectArray,
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	178 jobjectArray);
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	179
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	180 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	181 Java_org_octave_OctaveReference_doFinalize (JNIEnv *, jclass, jint);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	182
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	183 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	184 Java_org_octave_Octave_doInvoke (JNIEnv *, jclass, jint, jobjectArray);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	185
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	186 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	187 Java_org_octave_Octave_doEvalString (JNIEnv *, jclass, jstring);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	188
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	189 JNIEXPORT jboolean JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	190 Java_org_octave_Octave_needThreadedInvokation (JNIEnv *, jclass);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	191 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	192
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	193 //! The pointer to a java virtual machine either created in the current thread
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	194 //! or attached this thread to it.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	195
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23449 diff changeset	196 static JavaVM *jvm = nullptr;
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	197
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	198 //! Whether the current thread is attached to the jvm given by #jvm.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	199 //! This is @c false also if no jvm exists, i.e. if #jvm is @c nullptr.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	200 //! @see #initialize_jvm()
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	201 //! @see #terminate_jvm()
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	202
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	203 static bool jvm_attached = false;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	204
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	205 //! Need to keep hold of the shared library handle until exit.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	206 //! @see #initialize_jvm()
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	207 //! @see #terminate_jvm()
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	208
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21748 diff changeset	209 static octave::dynamic_library jvm_lib;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	210
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	211 static std::map<int,octave_value> listener_map;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	212 static std::map<int,octave_value> octave_ref_map;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	213 static int octave_java_refcount = 0;
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	214
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	215 //! The thread id of the currently executing thread or @c -1 if this is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	216 //! unknown.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	217 //! @see #initialize_java()
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	218
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	219 static long octave_thread_ID = -1;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	220
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	221 bool Vjava_matrix_autoconversion = false;
d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	222 bool Vjava_unsigned_autoconversion = true;
d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	223 bool Vdebug_java = false;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	224
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	225 namespace octave
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	226 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	227 class JVMArgs
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	228 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	229 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	230
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	231 JVMArgs (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	232 {
23929 20c83f619102 bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803) Mike Miller <mtmiller@octave.org> parents: 23807 diff changeset	233 vm_args.version = JNI_VERSION_1_6;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	234 vm_args.nOptions = 0;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	235 vm_args.options = nullptr;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	236 vm_args.ignoreUnrecognized = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	237 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	238
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	239 ~JVMArgs (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	240 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	241 clean ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	242 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	243
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23405 diff changeset	244 JavaVMInitArgs * to_args ()
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	245 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	246 update ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	247 return &vm_args;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	248 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	249
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	250 void add (const std::string& opt)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	251 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	252 java_opts.push_back (opt);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	253 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	254
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	255 void read_java_opts (const std::string& filename)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	256 {
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27006 diff changeset	257 std::string ascii_fname = sys::get_ASCII_filename (filename);
25604 ca413f326224 Fix lifetime issues with temporary char arrays returned by get_ASCII_filename (bug #54299). Markus Mützel <markus.muetzel@gmx.de> parents: 25548 diff changeset	258
ca413f326224 Fix lifetime issues with temporary char arrays returned by get_ASCII_filename (bug #54299). Markus Mützel <markus.muetzel@gmx.de> parents: 25548 diff changeset	259 std::ifstream js (ascii_fname.c_str ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	260
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	261 if (! js.bad () && ! js.fail ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	262 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	263 std::string line;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	264
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	265 while (! js.eof () && ! js.fail ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	266 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	267 std::getline (js, line);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	268
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	269 if (line.find ('-') == 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	270 java_opts.push_back (line);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	271 else if (line.length () > 0 && Vdebug_java)
26009 3fc9d7453ba6 where possible, use octave_stdout and avoid including <iostream> John W. Eaton <jwe@octave.org> parents: 25770 diff changeset	272 warning ("invalid JVM option, skipping: %s", line.c_str ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	273 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	274 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	275 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	276
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	277 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	278
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	279 void clean (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	280 {
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	281 if (vm_args.options != nullptr)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	282 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	283 for (int i = 0; i < vm_args.nOptions; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	284 delete [] vm_args.options[i].optionString;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	285
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	286 delete [] vm_args.options;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	287
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	288 vm_args.options = nullptr;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	289 vm_args.nOptions = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	290 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	291 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	292
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	293 void update (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	294 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	295 clean ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	296
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	297 if (java_opts.size () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	298 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	299 int index = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	300
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	301 vm_args.nOptions = java_opts.size ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	302 vm_args.options = new JavaVMOption [vm_args.nOptions];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	303
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22755 diff changeset	304 for (const auto& opt : java_opts)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	305 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	306 if (Vdebug_java)
26009 3fc9d7453ba6 where possible, use octave_stdout and avoid including <iostream> John W. Eaton <jwe@octave.org> parents: 25770 diff changeset	307 octave_stdout << opt << std::endl;
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22755 diff changeset	308 vm_args.options[index++].optionString = strsave (opt.c_str ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	309 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	310
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	311 java_opts.clear ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	312 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	313 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	314
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	315 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	316
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	317 JavaVMInitArgs vm_args;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	318
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	319 std::list<std::string> java_opts;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	320 };
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	321 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	322
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	323
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	324 //! The java initialization directory is given by the environment variable
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	325 //! @c OCTAVE_JAVA_DIR if defined; otherwise it is the directory of Octave's
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	326 //! m-files defining Java functions.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	327 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	328 //! The Java initialization directory is the directory where resides:
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	329 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	330 //! - @c octave.jar, defining the java classes implementing octave's java
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	331 //! interface,
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	332 //! - @c javaclasspath.txt, defining the installation defined portion of the
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	333 //! (static) classpath,
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	334 //! - @c java.opts, defining the configurable options of the java virtual
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	335 //! machine.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	336 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	337 //! Note that the (static) java classpath of the java virtual machine starts
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	338 //! with @c octave.jar, and that the static java classpath ends with what
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	339 //! is read from @c javaclasspath.txt located in the initial java directory.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	340 //! Moreover, the java virtual machine is created essentially with
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	341 //! the options given by @c java.opts.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	342
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	343 static std::string
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	344 initial_java_dir (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	345 {
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	346 static std::string java_dir;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	347
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	348 if (java_dir.empty ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	349 {
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	350 java_dir = octave::sys::env::getenv ("OCTAVE_JAVA_DIR");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	351
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	352 if (java_dir.empty ())
25460 627d6bde9b8d solve installation info initialization problem differently John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	353 java_dir = (octave::config::fcn_file_dir ()
627d6bde9b8d solve installation info initialization problem differently John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	354 + octave::sys::file_ops::dir_sep_str () + "java");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	355 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	356
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	357 return java_dir;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	358 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	359
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	360 //! Return the classpath in the given file @c filepath as a string.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	361 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	362 //! In the classpath file, each line which is neither empty nor a comment, is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	363 //! interpreted as a segment of a path. Comment lines are those starting with
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	364 //! a @c # or with a @c % in the very first column.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	365 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	366 //! @param filepath The path to the file (usually @c classpath.txt) containing
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	367 //! a portion of the classpath.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	368 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	369 //! @returns A string consisting of the lines of @c filepath which are neither
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	370 //! comments nor empty without trailing whitespace separated by
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27126 diff changeset	371 //! 'octave::directory_path::path_sep_str()'. The returned string also
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	372 //! starts with that path separator.
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	373
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	374 static std::string
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	375 read_classpath_txt (const std::string& filepath)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	376 {
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	377 std::string classpath;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	378
25604 ca413f326224 Fix lifetime issues with temporary char arrays returned by get_ASCII_filename (bug #54299). Markus Mützel <markus.muetzel@gmx.de> parents: 25548 diff changeset	379 std::string ascii_fname = octave::sys::get_ASCII_filename (filepath);
ca413f326224 Fix lifetime issues with temporary char arrays returned by get_ASCII_filename (bug #54299). Markus Mützel <markus.muetzel@gmx.de> parents: 25548 diff changeset	380
ca413f326224 Fix lifetime issues with temporary char arrays returned by get_ASCII_filename (bug #54299). Markus Mützel <markus.muetzel@gmx.de> parents: 25548 diff changeset	381 std::ifstream fs (ascii_fname.c_str ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	382
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	383 if (! fs.bad () && ! fs.fail ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	384 {
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	385 std::string line;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	386
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	387 while (! fs.eof () && ! fs.fail ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	388 {
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	389 std::getline (fs, line);
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	390 if (line.length () > 0 && line[0] != '#' && line[0] != '%')
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	391 {
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	392 // prepend separator character
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	393 classpath.append (octave::directory_path::path_sep_str ());
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	394
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	395 // append content of line without whitespace
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	396 int last = line.find_last_not_of (" \t\f\v\r\n");
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	397
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	398 classpath.append (octave::sys::file_ops::tilde_expand (line.substr (0, last+1)));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	399 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	400 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	401 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	402
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	403 return (classpath);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	404 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	405
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	406
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	407 //! Return the initial classpath.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	408 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	409 //! The initial classpath starts with a pointer to @c octave.jar which is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	410 //! located in the initial java directory given by #java_init_dir().
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	411 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	412 //! @attention This is nowhere documented and also the script
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	413 //! @c javaclasspath.m drops this. On the other hand, this is vital because
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	414 //! @c octave.jar contains the java core classes of octave's java interface.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	415 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	416 //! The rest of the classpath is read sequentially from files
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	417 //! @c javaclasspath.txt located in either:
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	418 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	419 //! - the current directory,
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	420 //! - the user's home directory,
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	421 //! - the initial java directory returned by #initial_java_dir()
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	422 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	423 //! @returns The initial classpath.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	424
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	425 static std::string
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	426 initial_class_path (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	427 {
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	428 std::string java_dir = initial_java_dir ();
f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	429
f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	430 std::string retval = java_dir;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	431
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	432 // Find octave.jar file.
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	433 if (! retval.empty ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	434 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	435 std::string sep = octave::sys::file_ops::dir_sep_str ();
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	436
f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	437 std::string jar_file = java_dir + sep + "octave.jar";
f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	438
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	439 octave::sys::file_stat jar_exists (jar_file);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	440
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	441 if (jar_exists)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	442 {
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	443 // Initialize static classpath to octave.jar.
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	444 retval = jar_file;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	445
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	446 // The base classpath has been set.
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	447 // Try to find an optional file specifying classpaths in 3 places.
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	448 // 1) Current directory
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	449 // 2) User's home directory
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	450 // 3) Octave installation directory where octave.jar resides
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	451
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	452 std::string cwd = octave::sys::env::get_current_directory ();
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	453 std::string home_dir = octave::sys::env::get_home_directory ();
20422 4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	454
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	455 // The filename is "javaclasspath.txt", but historically has been
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	456 // "classpath.txt" so both are supported.
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	457 std::vector<std::string> cp_list = {"javaclasspath.txt",
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	458 "classpath.txt"};
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	459
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	460 for (std::string filename : cp_list)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	461 {
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	462 std::string cp_file = filename;
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	463 octave::sys::file_stat cp_exists;
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	464
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	465 // Try to find classpath file in the current directory.
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	466
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	467 cp_exists = octave::sys::file_stat (cp_file);
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	468 if (cp_exists)
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	469 {
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	470 // File found. Add its contents to the static classpath.
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	471 std::string classpath = read_classpath_txt (cp_file);
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	472 retval.append (classpath);
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	473 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	474
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	475 // Try to find classpath file in the user's home directory.
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	476
20422 4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	477 if (cwd != home_dir)
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	478 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	479 cp_file = '~' + sep + filename;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	480 cp_file = octave::sys::file_ops::tilde_expand (cp_file);
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	481 cp_exists = octave::sys::file_stat (cp_file);
20422 4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	482 if (cp_exists)
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	483 {
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	484 // File found. Add its contents to the static classpath.
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	485 std::string classpath = read_classpath_txt (cp_file);
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	486 retval.append (classpath);
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	487 }
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	488 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	489
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	490 // Try to find classpath file in the Octave install directory.
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	491
20422 4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	492 if (cwd != java_dir)
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	493 {
20422 4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	494 cp_file = java_dir + sep + filename;
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	495 cp_exists = octave::sys::file_stat (cp_file);
20422 4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	496 if (cp_exists)
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	497 {
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	498 // File found. Add its contents to the static classpath.
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	499 std::string classpath = read_classpath_txt (cp_file);
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	500 retval.append (classpath);
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	501 }
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	502 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	503 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	504 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	505 else
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	506 error ("octave.jar does not exist: %s", jar_file.c_str ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	507 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	508 else
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	509 error ("initial java dir is empty");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	510
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	511 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	512 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	513
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	514 static std::string
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	515 get_jvm_lib_path_in_subdir (std::string java_home_path)
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	516 {
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	517 // This assumes that whatever architectures are installed are appropriate for
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	518 // this machine
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	519 #if defined (OCTAVE_USE_WINDOWS_API)
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	520 std::string subdirs[] = {"bin/client", "bin/server"};
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	521 #else
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	522 std::string subdirs[] = {"jre/lib/server", "jre/lib",
b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	523 "lib/client", "lib/server",
b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	524 "jre/lib/amd64/client", "jre/lib/amd64/server",
b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	525 "jre/lib/i386/client", "jre/lib/i386/server"
b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	526 };
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	527 #endif
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	528
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	529 for (size_t i = 0; i < sizeof (subdirs) / sizeof (subdirs[0]); i++)
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	530 {
25770 374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	531 std::string candidate = java_home_path + "/" + subdirs[i]
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	532 + "/" LIBJVM_FILE_NAME;
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	533 if (octave::sys::file_stat (candidate))
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	534 return candidate;
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	535 }
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	536 return "";
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	537 }
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	538
24684 037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	539 #if defined (OCTAVE_USE_WINDOWS_API)
27126 3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	540
3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	541 namespace octave
3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	542 {
3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	543 // Declare function defined in sysdep.cc
3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	544 extern LONG
3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	545 get_regkey_value (HKEY h_rootkey, const std::string subkey,
3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	546 const std::string name, octave_value& value);
3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	547 }
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	548
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	549 static std::string
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	550 get_jvm_lib_path_from_registry ()
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	551 {
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	552 // In Windows, find the location of the JRE from the registry
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	553 // and load the symbol from the dll.
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	554 std::string key, jversion, value;
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	555
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	556 // First search for JRE >= 9
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	557 key = R"(software\javasoft\jre)";
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	558
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	559 jversion = octave::sys::env::getenv ("JAVA_VERSION");
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	560 octave_value regval;
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	561 LONG retval;
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	562 if (jversion.empty ())
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	563 {
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	564 value = "CurrentVersion";
27126 3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	565 retval = octave::get_regkey_value (HKEY_LOCAL_MACHINE, key, value, regval);
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	566
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	567 if (retval != ERROR_SUCCESS)
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	568 {
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	569 // Search for JRE < 9
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	570 key = R"(software\javasoft\java runtime environment)";
27126 3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	571 retval = octave::get_regkey_value (HKEY_LOCAL_MACHINE, key, value, regval);
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	572 }
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	573
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	574 if (retval != ERROR_SUCCESS)
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	575 error ("unable to find Java Runtime Environment: %s::%s",
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	576 key.c_str (), value.c_str ());
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	577
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	578 jversion = regval.xstring_value ("initialize_jvm: registry value \"%s\" at \"%s\" must be a string",
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	579 value.c_str (), key.c_str ());
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	580 }
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	581
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	582 key = key + '\\' + jversion;
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	583 value = "RuntimeLib";
27126 3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	584 retval = octave::get_regkey_value (HKEY_LOCAL_MACHINE, key, value, regval);
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	585 if (retval != ERROR_SUCCESS)
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	586 {
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	587 // Search for JRE < 9
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	588 key = R"(software\javasoft\java runtime environment\)" + jversion;
27126 3d9e72cac668 allow Windows build to work again John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	589 retval = octave::get_regkey_value (HKEY_LOCAL_MACHINE, key, value, regval);
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	590 }
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	591
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	592 if (retval != ERROR_SUCCESS)
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	593 error ("unable to find Java Runtime Environment: %s::%s",
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	594 key.c_str (), value.c_str ());
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	595
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	596 std::string jvm_lib_path
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	597 = regval.xstring_value ("initialize_jvm: registry value \"%s\" at \"%s\" must be a string",
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	598 value.c_str (), key.c_str ());
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	599
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	600 if (jvm_lib_path.empty ())
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	601 error ("unable to find Java Runtime Environment: %s::%s",
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	602 key.c_str (), value.c_str ());
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	603
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	604 return jvm_lib_path;
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	605 }
24684 037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	606 #endif
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	607
27003 2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	608
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	609 //! Initialize the java virtual machine (jvm) and field #jvm if necessary.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	610 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	611 //! If the jvm exists and is initialized, #jvm points to it, i.e. is not 0
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	612 //! and there is nothing to do.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	613 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	614 //! If #jvm is 0 and if at least one jvm exists, attach the current thread to
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	615 //! it by setting #jvm_attached. Otherwise, create a #jvm with some hard-
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	616 //! coded options:
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	617 //!
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27126 diff changeset	618 //! - '-Djava.class.path=classpath', where @c classpath is given by
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	619 //! #initial_class_path().
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27126 diff changeset	620 //! - '-Xrs'
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	621 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	622 //! Further options are read from the file @c java.opts in the directory given
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	623 //! by #java_init_dir().
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	624 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	625 //! Note that #initial_class_path() determines the initial classpath. This
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	626 //! is the static classpath which cannot be changed. Elements of the dynamic
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	627 //! classpath can be added and removed using the m-file scripts
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	628 //! @c javaaddpath.m and @c javarmpath.m.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	629 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	630 //! @see #terminate_jvm()
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	631
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	632 static void
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	633 initialize_jvm (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	634 {
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	635 // Most of the time JVM already exists and has been initialized.
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	636 // Also it seems, as if jvm is set, the jvm is already attached.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	637 // This does not fit terminate_jvm.
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	638 if (jvm)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	639 return;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	640
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	641 JNIEnv *current_env;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	642 const char *static_locale = setlocale (LC_ALL, nullptr);
26532 4dae224112a1 ov-java.cc: Fix static analyzer detected issue (bug #55464). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	643 std::string locale;
4dae224112a1 ov-java.cc: Fix static analyzer detected issue (bug #55464). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	644 if (static_locale)
4dae224112a1 ov-java.cc: Fix static analyzer detected issue (bug #55464). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	645 locale = std::string (static_locale);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	646
24684 037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	647 octave::dynamic_library lib ("");
27003 2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	648 std::string jvm_lib_path;
24684 037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	649
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	650 // Check whether the Java VM library is already loaded or linked in.
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	651 JNI_CreateJavaVM_t create_vm = reinterpret_cast<JNI_CreateJavaVM_t>
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	652 (lib.search ("JNI_CreateJavaVM"));
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	653 JNI_GetCreatedJavaVMs_t get_vm = reinterpret_cast<JNI_GetCreatedJavaVMs_t>
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	654 (lib.search ("JNI_GetCreatedJavaVMs"));
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	655
27003 2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	656 if (create_vm && get_vm)
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	657 jvm_lib_path = "linked in or loaded libraries";
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	658 else
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	659 {
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	660 // JAVA_HOME environment variable takes precedence
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	661 std::string java_home_env = octave::sys::env::getenv ("JAVA_HOME");
3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	662 if (! java_home_env.empty ())
25770 374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	663 {
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	664 jvm_lib_path = get_jvm_lib_path_in_subdir (java_home_env);
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	665
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	666 // If JAVA_HOME does not look like a Java directory, use it anyway
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	667 // to fail with a useful error message indicating the directory
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	668 if (jvm_lib_path.empty ())
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	669 jvm_lib_path = java_home_env + "/" LIBJVM_FILE_NAME;
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	670 }
27003 2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	671
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	672 # if defined (__APPLE__)
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	673 // Use standard /usr/libexec/java_home if available.
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	674 if (jvm_lib_path.empty ())
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	675 {
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	676 octave::sys::file_stat libexec_java_home_exists (JAVA_HOME_CMD);
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	677 if (libexec_java_home_exists)
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	678 {
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	679 // FIXME: Should this command be fully configurable at run
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	680 // time? Or is it OK for the options to be fixed here?
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	681
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	682 std::string java_home_cmd = std::string (JAVA_HOME_CMD)
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	683 + " --failfast --version 1.6+ 2>/dev/null";
27003 2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	684
27006 cdc67ea473d1 Fix build failure on macOS due to missing namespace qualification. Andrew Janke <andrew@apjanke.net> parents: 27003 diff changeset	685 octave::process_execution_result rslt
27003 2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	686 = octave::run_command_and_return_output (java_home_cmd);
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	687
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	688 if (rslt.exit_status () == 0)
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	689 {
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	690 std::string output = rslt.stdout_output ();
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	691 std::string found_path = output.substr (0, output.length() - 1);
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	692 std::string jvm_lib_found = get_jvm_lib_path_in_subdir (found_path);
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	693 if (!jvm_lib_found.empty ())
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	694 jvm_lib_path = jvm_lib_found;
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	695 }
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	696 }
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	697 }
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	698 # endif
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	699
2a57165f892c detect JVM at run time on macOS (bug #54219) Andrew Janke <andrew@apjanke.net> parents: 26568 diff changeset	700 if (jvm_lib_path.empty ())
25770 374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	701 {
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	702 #if defined (OCTAVE_USE_WINDOWS_API)
25770 374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	703 jvm_lib_path = get_jvm_lib_path_from_registry ();
20945 9d9270e2f98f eliminate comments after preprocessor conditionals John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	704 #else
25770 374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	705 // Fall back to JAVA_LDPATH, determined by the build system
374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	706 jvm_lib_path = std::string (JAVA_LDPATH) + "/" LIBJVM_FILE_NAME;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	707 #endif
25770 374edade7b1b fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111) Mike Miller <mtmiller@octave.org> parents: 25744 diff changeset	708 }
25744 3ddd74bd7b11 Use JAVA_HOME for JVM detection at run-time (bug #40111). Andrew Janke <andrew@apjanke.net> parents: 25604 diff changeset	709
24684 037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	710 lib = octave::dynamic_library (jvm_lib_path);
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	711
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	712 if (! lib)
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	713 error ("unable to load Java Runtime Environment from %s",
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	714 jvm_lib_path.c_str ());
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	715
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	716 create_vm = reinterpret_cast<JNI_CreateJavaVM_t>
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	717 (lib.search ("JNI_CreateJavaVM"));
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	718 get_vm = reinterpret_cast<JNI_GetCreatedJavaVMs_t>
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	719 (lib.search ("JNI_GetCreatedJavaVMs"));
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	720
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	721 if (! create_vm)
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	722 error ("unable to find JNI_CreateJavaVM in %s", jvm_lib_path.c_str ());
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	723
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	724 if (! get_vm)
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	725 error ("unable to find JNI_GetCreatedJavaVMs in %s",
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	726 jvm_lib_path.c_str ());
037ace76257d ov-java.cc: Use new functions in initialization of JVM. Markus Mützel <markus.muetzel@gmx.de> parents: 24671 diff changeset	727 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	728
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	729 //! The number of created jvm's.
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	730 jsize nVMs = 0;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	731
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	732 if (get_vm (&jvm, 1, &nVMs) == 0 && nVMs > 0)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	733 {
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	734 // At least one JVM exists, try to attach the current thread to it.
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	735
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	736 switch (jvm->GetEnv (reinterpret_cast<void **> (&current_env),
23929 20c83f619102 bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803) Mike Miller <mtmiller@octave.org> parents: 23807 diff changeset	737 JNI_VERSION_1_6))
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	738 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	739 case JNI_EDETACHED:
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	740 // Attach the current thread
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	741 JavaVMAttachArgs vm_args;
23929 20c83f619102 bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803) Mike Miller <mtmiller@octave.org> parents: 23807 diff changeset	742 vm_args.version = JNI_VERSION_1_6;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	743 vm_args.name = const_cast<char *> ("octave");
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	744 vm_args.group = nullptr;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	745 if (jvm->AttachCurrentThread (reinterpret_cast<void **> (&current_env),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	746 &vm_args) < 0)
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	747 error ("JVM internal error, unable to attach octave to existing JVM");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	748 break;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	749
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	750 case JNI_EVERSION:
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	751 error ("JVM internal error, the required JNI version is not supported");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	752 break;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	753
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	754 case JNI_OK:
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	755 // Don't do anything, the current thread is already attached to JVM
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	756 break;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	757 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	758
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	759 jvm_attached = true;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	760 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	761 else
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	762 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	763 // No JVM exists, create one
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	764
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	765 octave::JVMArgs vm_args;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	766
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	767 // Hard-coded options for the jvm.
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	768 vm_args.add ("-Djava.class.path=" + initial_class_path ());
28527 9e7b2625e574 ov-java.cc: Set reaper thread to use default stack size (bug #58641). Markus Mützel <markus.muetzel@gmx.de> parents: 28490 diff changeset	769 #if defined (HAVE_BROKEN_PTHREAD_STACKSIZE)
9e7b2625e574 ov-java.cc: Set reaper thread to use default stack size (bug #58641). Markus Mützel <markus.muetzel@gmx.de> parents: 28490 diff changeset	770 vm_args.add ("-Djdk.lang.processReaperUseDefaultStackSize=true");
9e7b2625e574 ov-java.cc: Set reaper thread to use default stack size (bug #58641). Markus Mützel <markus.muetzel@gmx.de> parents: 28490 diff changeset	771 #endif
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	772 vm_args.add ("-Xrs");
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	773
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	774 // Additional options given by file java.opts.
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22331 diff changeset	775 vm_args.read_java_opts (initial_java_dir () +
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22331 diff changeset	776 octave::sys::file_ops::dir_sep_str () +
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	777 "java.opts");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	778
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	779 if (create_vm (&jvm, &current_env, vm_args.to_args ()) != JNI_OK)
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	780 error ("unable to start Java VM in %s", jvm_lib_path.c_str ());
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	781 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	782
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	783 jvm_lib = lib;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	784
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	785 setlocale (LC_ALL, locale.c_str ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	786 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	787
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	788 //! Terminate the current jvm, if there is any.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	789 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	790 //! Otherwise, detach the jvm if this thread is attached to it and unload it
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	791 //! if this thread created it itself.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	792 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	793 //! @see #initialize_jvm()
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	794
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	795 static void
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	796 terminate_jvm (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	797 {
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	798 // There is nothing to do if jvm is not set (= nullptr).
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	799 if (jvm)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	800 {
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	801 // FIXME: Seems that if jvm_attached is always true if jvm is not null.
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	802 if (jvm_attached)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	803 jvm->DetachCurrentThread ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	804 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	805 jvm->DestroyJavaVM ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	806
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	807 jvm = nullptr;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	808 jvm_attached = false;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	809
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	810 if (jvm_lib)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	811 jvm_lib.close ();
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	812
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	813 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	814 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	815 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	816
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	817 //! Converts a Java string object to std::string.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	818 //!{
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	819 static std::string
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	820 jstring_to_string (JNIEnv *jni_env, jstring s)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	821 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	822 std::string retval;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	823
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	824 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	825 {
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	826 const char *cstr = jni_env->GetStringUTFChars (s, nullptr);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	827 retval = cstr;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	828 jni_env->ReleaseStringUTFChars (s, cstr);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	829 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	830
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	831 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	832 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	833
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	834 static std::string
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	835 jstring_to_string (JNIEnv *jni_env, jobject obj)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	836 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	837 std::string retval;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	838
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	839 if (jni_env && obj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	840 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	841 jclass_ref cls (jni_env, jni_env->FindClass ("java/lang/String"));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	842 if (cls)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	843 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	844 if (jni_env->IsInstanceOf (obj, cls))
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	845 retval = jstring_to_string (jni_env,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	846 reinterpret_cast<jstring> (obj));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	847 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	848 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	849
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	850 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	851 }
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	852 //!}
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	853
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	854 //! Returns a reference to the jni (java native interface) environment of the
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	855 //! Java virtual machine #jvm.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	856 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	857 //! @returns A reference to jni, if #jvm is present, otherwise @c nullptr.
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	858
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	859 static inline JNIEnv *
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	860 thread_jni_env (void)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	861 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23449 diff changeset	862 JNIEnv *env = nullptr;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	863
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	864 if (jvm)
23929 20c83f619102 bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803) Mike Miller <mtmiller@octave.org> parents: 23807 diff changeset	865 jvm->GetEnv (reinterpret_cast<void **> (&env), JNI_VERSION_1_6);
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	866
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	867 return env;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	868 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	869
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	870 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	871
15824 abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	872 bool
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	873 octave_java::is_java_string (void) const
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	874 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	875 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	876
15824 abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	877 JNIEnv *current_env = thread_jni_env ();
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	878
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	879 if (current_env && java_object)
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	880 {
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	881 jclass_ref cls (current_env, current_env->FindClass ("java/lang/String"));
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	882 return current_env->IsInstanceOf (TO_JOBJECT (java_object), cls);
15824 abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	883 }
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	884
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	885 return false;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	886
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	887 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	888
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	889 // This shouldn't happen because construction of octave_java objects is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	890 // supposed to be impossible if Java is not available.
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	891
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	892 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	893
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	894 #endif
15824 abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	895 }
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	896
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	897 bool
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	898 octave_java::is_instance_of (const std::string& cls_name) const
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	899 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	900 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	901
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	902 JNIEnv *current_env = thread_jni_env ();
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	903
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	904 std::string cls_cpp = cls_name;
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	905 std::replace (cls_cpp.begin (), cls_cpp.end (), '.', '/');
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	906
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	907 if (current_env && java_object)
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	908 {
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	909 jclass_ref cls (current_env, current_env->FindClass (cls_cpp.c_str ()));
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	910 if (current_env->ExceptionCheck ())
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	911 current_env->ExceptionClear ();
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	912 else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	913 return current_env->IsInstanceOf (TO_JOBJECT (java_object), cls);
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	914 }
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	915 return false;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	916
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	917 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	918
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	919 octave_unused_parameter (cls_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	920
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	921 // This shouldn't happen because construction of octave_java objects is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	922 // supposed to be impossible if Java is not available.
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	923
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	924 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	925
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	926 #endif
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	927 }
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	928
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	929 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	930
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	931 static octave_value
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	932 check_exception (JNIEnv *jni_env)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	933 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	934 octave_value retval;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	935
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	936 jthrowable_ref ex (jni_env, jni_env->ExceptionOccurred ());
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	937
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	938 if (ex)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	939 {
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	940 if (Vdebug_java)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	941 jni_env->ExceptionDescribe ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	942
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	943 jni_env->ExceptionClear ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	944
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	945 jclass_ref jcls (jni_env, jni_env->GetObjectClass (ex));
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	946 jmethodID mID = jni_env->GetMethodID (jcls, "toString",
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	947 "()Ljava/lang/String;");
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	948 jstring_ref js (jni_env,
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	949 reinterpret_cast<jstring> (jni_env->CallObjectMethod (ex,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	950 mID)));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	951 std::string msg = jstring_to_string (jni_env, js);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	952
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	953 error ("[java] %s", msg.c_str ());
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	954 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	955 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	956 retval = Matrix ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	957
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	958 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	959 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	960
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	961 static jclass
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	962 find_octave_class (JNIEnv jni_env, const char name)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	963 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	964 static std::string class_loader;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	965 static jclass uiClass = nullptr;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	966
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	967 jclass jcls = jni_env->FindClass (name);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	968
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	969 if (jcls == nullptr)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	970 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	971 jni_env->ExceptionClear ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	972
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	973 if (! uiClass)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	974 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	975 if (class_loader.empty ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	976 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	977 jclass_ref syscls (jni_env,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	978 jni_env->FindClass ("java/lang/System"));
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	979 jmethodID mID = jni_env->GetStaticMethodID
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	980 (syscls,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	981 "getProperty",
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	982 "(Ljava/lang/String;)Ljava/lang/String;");
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	983 jstring_ref js (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	984 jni_env->NewStringUTF ("octave.class.loader"));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	985 js = reinterpret_cast<jstring> (jni_env->CallStaticObjectMethod
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	986 (syscls, mID, jstring (js)));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	987 class_loader = jstring_to_string (jni_env, jstring (js));
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	988 std::replace (class_loader.begin (), class_loader.end (),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	989 '.', '/');
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	990 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	991
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	992 jclass_ref uicls (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	993 jni_env->FindClass (class_loader.c_str ()));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	994
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	995 if (! uicls)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	996 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	997 jni_env->ExceptionClear ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	998
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20945 diff changeset	999 // Try the netbeans way
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	1000 std::replace (class_loader.begin (), class_loader.end (),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	1001 '/', '.');
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1002 jclass_ref jcls2 (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1003 jni_env->FindClass ("org/openide/util/Lookup"));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1004 jmethodID mID = jni_env->GetStaticMethodID
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1005 (jcls2, "getDefault", "()Lorg/openide/util/Lookup;");
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1006 jobject_ref lObj (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1007 jni_env->CallStaticObjectMethod (jcls2, mID));
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	1008 mID = jni_env->GetMethodID (jcls2, "lookup",
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	1009 "(Ljava/lang/Class;)Ljava/lang/Object;");
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1010 jclass_ref cLoaderCls (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1011 jni_env->FindClass ("java/lang/ClassLoader"));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1012 jobject_ref cLoader (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1013 jni_env->CallObjectMethod
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1014 (lObj, mID, jclass (cLoaderCls)));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1015 mID = jni_env->GetMethodID (cLoaderCls, "loadClass",
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1016 "(Ljava/lang/String;)Ljava/lang/Class;");
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1017 jstring_ref js (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1018 jni_env->NewStringUTF (class_loader.c_str ()));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1019 uicls = reinterpret_cast<jclass>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1020 (jni_env->CallObjectMethod (cLoader, mID, jstring (js)));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1021 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1022
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1023 if (uicls)
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1024 uiClass = reinterpret_cast<jclass>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1025 (jni_env->NewGlobalRef (jclass (uicls)));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1026 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1027
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1028 if (uiClass)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1029 {
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1030 jmethodID mID = jni_env->GetStaticMethodID
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1031 (uiClass, "findClass", "(Ljava/lang/String;)Ljava/lang/Class;");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1032 jstring_ref js (jni_env, jni_env->NewStringUTF (name));
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1033 jcls = reinterpret_cast<jclass>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1034 (jni_env->CallStaticObjectMethod (uiClass, mID, jstring (js)));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1035 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1036 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1037
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1038 return jcls;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1039 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1040
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1041 static dim_vector
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1042 compute_array_dimensions (JNIEnv *jni_env, jobject obj)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1043 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1044 jobjectArray_ref jobj (jni_env, reinterpret_cast<jobjectArray> (obj));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1045 jclass_ref jcls (jni_env, jni_env->GetObjectClass (obj));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1046 jclass_ref ccls (jni_env, jni_env->GetObjectClass (jcls));
15859 0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	1047 jmethodID isArray_ID = jni_env->GetMethodID (ccls, "isArray", "()Z");
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1048 jmethodID getComponentType_ID = jni_env->GetMethodID (ccls,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1049 "getComponentType",
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1050 "()Ljava/lang/Class;");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1051
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1052 dim_vector dv (1, 1);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1053 int idx = 0;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1054
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1055 jobj.detach ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1056 while (jcls && jni_env->CallBooleanMethod (jcls, isArray_ID))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1057 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1058 int len = (jobj ? jni_env->GetArrayLength (jobj) : 0);
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21580 diff changeset	1059 if (idx >= dv.ndims ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1060 dv.resize (idx+1);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1061 dv(idx) = len;
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1062 jcls = reinterpret_cast<jclass>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1063 (jni_env->CallObjectMethod (jcls, getComponentType_ID));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1064 jobj = len > 0
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1065 ? reinterpret_cast<jobjectArray> (jni_env->GetObjectArrayElement (jobj,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1066 0))
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1067 : nullptr;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1068 idx++;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1069 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1070
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1071 octave_set_default_fpucw ();
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1072
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1073 return dv;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1074 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1075
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1076 static jobject
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1077 make_java_index (JNIEnv *jni_env, const octave_value_list& idx)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1078 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1079 jclass_ref ocls (jni_env, jni_env->FindClass ("[I"));
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1080 jobjectArray retval = jni_env->NewObjectArray (idx.length (), ocls, nullptr);
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	1081 // Here retval has the same length as idx
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1082
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1083 // Fill in entries of idx into retval
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1084 for (int i = 0; i < idx.length (); i++)
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	1085 try
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	1086 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	1087 idx_vector v = idx(i).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	1088
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1089 jintArray_ref i_array (jni_env, jni_env->NewIntArray (v.length ()));
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1090 jint *buf = jni_env->GetIntArrayElements (i_array, nullptr);
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1091 // Here, buf points to the beginning of i_array
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1092
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1093 // Copy v to buf.
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1094 for (int k = 0; k < v.length (); k++)
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1095 buf[k] = v(k);
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1096
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1097 // Set retval[i] = i_array
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1098 jni_env->ReleaseIntArrayElements (i_array, buf, 0);
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1099 jni_env->SetObjectArrayElement (retval, i, i_array);
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1100
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1101 check_exception (jni_env);
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	1102 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1103 catch (octave::index_exception& e)
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	1104 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	1105 // Rethrow to allow more info to be reported later.
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1106 e.set_pos_if_unset (idx.length (), i + 1);
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	1107 throw;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	1108 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1109
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1110 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1111 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1112
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1113 static octave_value
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1114 get_array_elements (JNIEnv *jni_env, jobject jobj,
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1115 const octave_value_list& idx)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1116 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1117 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1118 jobject_ref resObj (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1119 jobject_ref java_idx (jni_env, make_java_index (jni_env, idx));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1120
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1121 jclass_ref helperClass (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1122 find_octave_class (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1123 "org/octave/ClassHelper"));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1124 jmethodID mID = jni_env
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1125 ->GetStaticMethodID (helperClass, "arraySubsref",
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1126 "(Ljava/lang/Object;[[I)Ljava/lang/Object;");
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1127 resObj = jni_env->CallStaticObjectMethod
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1128 (helperClass, mID, jobj, jobject (java_idx));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1129
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1130 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1131 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1132 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1133 retval = check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1134
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1135 octave_set_default_fpucw ();
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1136
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1137 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1138 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1139
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1140 static octave_value
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1141 set_array_elements (JNIEnv *jni_env, jobject jobj,
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1142 const octave_value_list& idx, const octave_value& rhs)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1143 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1144 octave_value retval;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1145
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1146 jclass_ref rhsCls (jni_env);
15859 0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	1147 jobject_ref resObj (jni_env);
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	1148 jobject_ref rhsObj (jni_env);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1149 jobject_ref java_idx (jni_env, make_java_index (jni_env, idx));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1150
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1151 if (unbox (jni_env, rhs, rhsObj, rhsCls))
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1152 {
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1153 jclass_ref helperClass (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1154 find_octave_class (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1155 "org/octave/ClassHelper"));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1156 jmethodID mID = jni_env->GetStaticMethodID (helperClass, "arraySubsasgn",
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1157 "(Ljava/lang/Object;[[ILjava/lang/Object;)" "Ljava/lang/Object;");
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1158 resObj = jni_env->CallStaticObjectMethod
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1159 (helperClass, mID, jobj, jobject (java_idx), jobject (rhsObj));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1160 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1161
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1162 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1163 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1164 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1165 retval = check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1166
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1167 octave_set_default_fpucw ();
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1168
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1169 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1170 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1171
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1172 static string_vector
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1173 get_invoke_list (JNIEnv jni_env, void jobj_arg)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1174 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1175 jobject jobj = TO_JOBJECT (jobj_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1176
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1177 std::list<std::string> name_list;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1178
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1179 if (jni_env)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1180 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1181 jclass_ref cls (jni_env, jni_env->GetObjectClass (jobj));
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1182 jclass_ref ccls (jni_env, jni_env->GetObjectClass (cls));
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1183 jmethodID getMethods_ID = jni_env->GetMethodID
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1184 (ccls, "getMethods", "()[Ljava/lang/reflect/Method;");
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1185 jmethodID getFields_ID = jni_env->GetMethodID
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1186 (ccls, "getFields", "()[Ljava/lang/reflect/Field;");
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1187 jobjectArray_ref mList (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1188 reinterpret_cast<jobjectArray>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1189 (jni_env->CallObjectMethod (cls, getMethods_ID)));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1190 jobjectArray_ref fList (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1191 reinterpret_cast<jobjectArray>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1192 (jni_env->CallObjectMethod (cls, getFields_ID)));
15859 0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	1193 int mLen = jni_env->GetArrayLength (mList);
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	1194 int fLen = jni_env->GetArrayLength (fList);
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1195 jclass_ref mCls (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1196 jni_env->FindClass ("java/lang/reflect/Method"));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1197 jclass_ref fCls (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1198 jni_env->FindClass ("java/lang/reflect/Field"));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1199 jmethodID m_getName_ID = jni_env->GetMethodID (mCls, "getName",
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1200 "()Ljava/lang/String;");
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1201 jmethodID f_getName_ID = jni_env->GetMethodID (fCls, "getName",
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1202 "()Ljava/lang/String;");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1203
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1204 for (int i = 0; i < mLen; i++)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1205 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1206 jobject_ref meth (jni_env, jni_env->GetObjectArrayElement (mList, i));
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1207 jstring_ref methName (jni_env, reinterpret_cast<jstring>
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1208 (jni_env->CallObjectMethod (meth,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1209 m_getName_ID)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1210 name_list.push_back (jstring_to_string (jni_env, methName));
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1211 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1212
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1213 for (int i = 0; i < fLen; i++)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1214 {
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1215 jobject_ref field (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1216 jni_env->GetObjectArrayElement (fList, i));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1217 jstring_ref fieldName (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1218 reinterpret_cast<jstring>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1219 (jni_env->CallObjectMethod
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1220 (field, f_getName_ID)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1221 name_list.push_back (jstring_to_string (jni_env, fieldName));
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1222 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1223
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1224 octave_set_default_fpucw ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1225 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1226
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1227 string_vector v (name_list);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1228
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1229 return v.sort (true);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1230 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1231
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1232 static octave_value
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1233 convert_to_string (JNIEnv *jni_env, jobject java_object, bool force, char type)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1234 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1235 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1236
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1237 if (jni_env && java_object)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1238 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1239 jclass_ref cls (jni_env, jni_env->FindClass ("java/lang/String"));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1240
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1241 if (jni_env->IsInstanceOf (java_object, cls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1242 retval = octave_value (jstring_to_string (jni_env, java_object), type);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1243 else if (force)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1244 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1245 cls = jni_env->FindClass ("[Ljava/lang/String;");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1246
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1247 if (jni_env->IsInstanceOf (java_object, cls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1248 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1249 jobjectArray array = reinterpret_cast<jobjectArray> (java_object);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1250 int len = jni_env->GetArrayLength (array);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1251 Cell c (len, 1);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1252
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1253 for (int i = 0; i < len; i++)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1254 {
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1255 jstring_ref js (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1256 reinterpret_cast<jstring>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1257 (jni_env->GetObjectArrayElement (array, i)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1258
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1259 if (js)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1260 c(i) = octave_value (jstring_to_string (jni_env, js), type);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1261 else
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1262 c(i) = check_exception (jni_env);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1263 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1264
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1265 retval = octave_value (c);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1266 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1267 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1268 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1269 cls = jni_env->FindClass ("java/lang/Object");
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1270 jmethodID mID = jni_env->GetMethodID (cls, "toString",
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1271 "()Ljava/lang/String;");
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1272 jstring_ref js (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1273 reinterpret_cast<jstring>
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1274 (jni_env->CallObjectMethod (java_object,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1275 mID)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1276
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1277 if (js)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1278 retval = octave_value (jstring_to_string (jni_env, js), type);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1279 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1280 retval = check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1281 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1282 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1283 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1284 error ("unable to convert Java object to string");
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1285
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1286 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1287 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1288
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1289 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1290 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1291
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23446 diff changeset	1292 #define TO_JAVA(obj) dynamic_cast<octave_java *> ((obj).internal_rep ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1293
22202 f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1294 //! Return whether @c jobj shall be automatically converted to an Octave
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1295 //! numeric value.
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1296 //!
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1297 //! If @c jobj is an instance of any of the numeric wrapper classes @c Byte,
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1298 //! @c Integer, @c Long, @c Short, @c Float, or @c Double, then it will be
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1299 //! converted using the @c java.lang.Number.doubleValue() method.
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1300 //!
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1301 //! @param jobj Java object being returned to Octave
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1302 //! @return @c true if @c jobj shall be converted into a numeric value
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1303 //! automatically, @c false otherwise
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1304 static bool
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1305 is_auto_convertible_number (JNIEnv *jni_env, jobject jobj)
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1306 {
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1307 jclass_ref cls (jni_env);
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1308 cls = jni_env->FindClass ("java/lang/Double");
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1309 if (jni_env->IsInstanceOf (jobj, cls))
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1310 return true;
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1311 cls = jni_env->FindClass ("java/lang/Float");
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1312 if (jni_env->IsInstanceOf (jobj, cls))
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1313 return true;
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1314 cls = jni_env->FindClass ("java/lang/Byte");
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1315 if (jni_env->IsInstanceOf (jobj, cls))
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1316 return true;
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1317 cls = jni_env->FindClass ("java/lang/Short");
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1318 if (jni_env->IsInstanceOf (jobj, cls))
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1319 return true;
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1320 cls = jni_env->FindClass ("java/lang/Integer");
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1321 if (jni_env->IsInstanceOf (jobj, cls))
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1322 return true;
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1323 cls = jni_env->FindClass ("java/lang/Long");
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1324 if (jni_env->IsInstanceOf (jobj, cls))
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1325 return true;
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1326
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1327 return false;
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1328 }
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1329
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1330 //! Convert the Java object pointed to by @c jobj_arg with class @c jcls_arg
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1331 //! to an Octave value.
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1332 //!
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1333 //! @param jni_env JNI environment pointer.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1334 //! @param jobj_arg Pointer to a Java object.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1335 //! @param jcls_arg Optional pointer to the Java class of @c jobj_arg.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1336 //!
22202 f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1337 //! @return
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1338 //! @arg numeric value as a @c double if @c jobj_arg is of type @c Byte,
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1339 //! @c Short, @c Integer, @c Long, @c Float or @c Double
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1340 //! @arg logical value if @c jobj_arg is of type @c Boolean
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1341 //! @arg string value if @c jobj_arg is of type @c Character or @c String
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1342 //! @arg Octave array of numeric, logical, or char type if @c jobj_arg is
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1343 //! a Java array of primitive types
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1344 //! @arg Octave matrix if @c jobj_arg is of type @c org.octave.Matrix and
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1345 //! #Vjava_matrix_autoconversion is enabled
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1346 //! @arg Octave object if @c jobj_arg is of type
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1347 //! @c org.octave.OctaveReference
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1348 //! @arg @c octave_java object wrapping the Java object otherwise.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1349
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1350 static octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1351 box (JNIEnv jni_env, void jobj_arg, void *jcls_arg)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1352 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1353 octave_value retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1354
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1355 jobject jobj = TO_JOBJECT (jobj_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1356 jclass jcls = TO_JCLASS (jcls_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1357
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1358 jclass_ref cls (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1359
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1360 if (! jobj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1361 retval = Matrix ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1362
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1363 while (retval.is_undefined ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1364 {
22202 f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1365 // Convert a scalar of any numeric class wrapping a primitive class
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1366 // (byte, short, integer, long, float, double) to a double value.
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1367 // Test whether java.lang.Number before testing for each type.
15820 00172e5c2302 Add autoconversion of Java numeric types (byte, short, integer, long, float) to Octave double. Rik <rik@octave.org> parents: 15816 diff changeset	1368 cls = jni_env->FindClass ("java/lang/Number");
22202 f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1369 if (jni_env->IsInstanceOf (jobj, cls)
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1370 && is_auto_convertible_number (jni_env, jobj))
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1371 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1372 jmethodID m = jni_env->GetMethodID (cls, "doubleValue", "()D");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1373 retval = jni_env->CallDoubleMethod (jobj, m);
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1374 break;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1375 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1376
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1377 cls = jni_env->FindClass ("java/lang/Boolean");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1378 if (jni_env->IsInstanceOf (jobj, cls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1379 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1380 jmethodID m = jni_env->GetMethodID (cls, "booleanValue", "()Z");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1381 retval = (jni_env->CallBooleanMethod (jobj, m) ? true : false);
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1382 break;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1383 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1384
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1385 cls = jni_env->FindClass ("java/lang/String");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1386 if (jni_env->IsInstanceOf (jobj, cls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1387 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1388 retval = jstring_to_string (jni_env, jobj);
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1389 break;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1390 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1391
15815 f28b3dcbaa9a Add autoconversion between java.lang.Character class and Octave string class. Rik <rik@octave.org> parents: 15813 diff changeset	1392 cls = jni_env->FindClass ("java/lang/Character");
f28b3dcbaa9a Add autoconversion between java.lang.Character class and Octave string class. Rik <rik@octave.org> parents: 15813 diff changeset	1393 if (jni_env->IsInstanceOf (jobj, cls))
f28b3dcbaa9a Add autoconversion between java.lang.Character class and Octave string class. Rik <rik@octave.org> parents: 15813 diff changeset	1394 {
f28b3dcbaa9a Add autoconversion between java.lang.Character class and Octave string class. Rik <rik@octave.org> parents: 15813 diff changeset	1395 jmethodID m = jni_env->GetMethodID (cls, "charValue", "()C");
f28b3dcbaa9a Add autoconversion between java.lang.Character class and Octave string class. Rik <rik@octave.org> parents: 15813 diff changeset	1396 retval = jni_env->CallCharMethod (jobj, m);
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17898 diff changeset	1397 retval = retval.convert_to_str (false, true);
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1398 break;
15815 f28b3dcbaa9a Add autoconversion between java.lang.Character class and Octave string class. Rik <rik@octave.org> parents: 15813 diff changeset	1399 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1400
20120 2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1401 #define BOX_PRIMITIVE_ARRAY(JAVA_TYPE, JAVA_ID, JAVA_TYPE_CAP, OCTAVE_ID) \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1402 cls = jni_env->FindClass (JAVA_ID); \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1403 if (jni_env->IsInstanceOf (jobj, cls)) \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1404 { \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1405 const JAVA_TYPE ## Array jarr = reinterpret_cast<JAVA_TYPE ## Array> (jobj); \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1406 const jsize len = jni_env->GetArrayLength (jarr); \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1407 OCTAVE_ID ## NDArray d (dim_vector (len, 1)); \
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1408 JAVA_TYPE buffer = reinterpret_cast<JAVA_TYPE > (d.fortran_vec ()); \
20120 2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1409 jni_env->Get ## JAVA_TYPE_CAP ## ArrayRegion (jarr, 0, len, buffer); \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1410 retval = d; \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1411 break; \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1412 }
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1413
20254 a51fe1b60e3f Put most used conversions first in Java box/unbox routines. Rik <rik@octave.org> parents: 20253 diff changeset	1414 BOX_PRIMITIVE_ARRAY (jdouble, "[D", Double, )
a51fe1b60e3f Put most used conversions first in Java box/unbox routines. Rik <rik@octave.org> parents: 20253 diff changeset	1415 BOX_PRIMITIVE_ARRAY (jboolean, "[Z", Boolean, bool)
a51fe1b60e3f Put most used conversions first in Java box/unbox routines. Rik <rik@octave.org> parents: 20253 diff changeset	1416 BOX_PRIMITIVE_ARRAY (jfloat, "[F", Float, Float)
a51fe1b60e3f Put most used conversions first in Java box/unbox routines. Rik <rik@octave.org> parents: 20253 diff changeset	1417 BOX_PRIMITIVE_ARRAY (jchar, "[C", Char, char)
a51fe1b60e3f Put most used conversions first in Java box/unbox routines. Rik <rik@octave.org> parents: 20253 diff changeset	1418 BOX_PRIMITIVE_ARRAY (jbyte, "[B", Byte, int8)
a51fe1b60e3f Put most used conversions first in Java box/unbox routines. Rik <rik@octave.org> parents: 20253 diff changeset	1419 BOX_PRIMITIVE_ARRAY (jshort, "[S", Short, int16)
a51fe1b60e3f Put most used conversions first in Java box/unbox routines. Rik <rik@octave.org> parents: 20253 diff changeset	1420 BOX_PRIMITIVE_ARRAY (jint, "[I", Int, int32)
a51fe1b60e3f Put most used conversions first in Java box/unbox routines. Rik <rik@octave.org> parents: 20253 diff changeset	1421 BOX_PRIMITIVE_ARRAY (jlong, "[J", Long, int64)
20120 2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1422
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1423 #undef BOX_PRIMITIVE_ARRAY
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1424
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1425 if (Vjava_matrix_autoconversion)
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1426 {
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1427 cls = find_octave_class (jni_env, "org/octave/Matrix");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1428
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1429 if (jni_env->IsInstanceOf (jobj, cls))
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1430 {
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1431 jmethodID mID = jni_env->GetMethodID (cls, "getDims", "()[I");
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1432 jintArray_ref iv (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1433 reinterpret_cast<jintArray>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1434 (jni_env->CallObjectMethod (jobj, mID)));
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1435 jint *iv_data = jni_env->GetIntArrayElements (jintArray (iv),
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1436 nullptr);
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1437 dim_vector dims;
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1438 dims.resize (jni_env->GetArrayLength (jintArray (iv)));
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1439
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21580 diff changeset	1440 for (int i = 0; i < dims.ndims (); i++)
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1441 dims(i) = iv_data[i];
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1442
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1443 jni_env->ReleaseIntArrayElements (jintArray (iv), iv_data, 0);
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1444 mID = jni_env->GetMethodID (cls, "getClassName",
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1445 "()Ljava/lang/String;");
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1446 jstring_ref js (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1447 reinterpret_cast<jstring>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1448 (jni_env->CallObjectMethod (jobj, mID)));
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1449
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1450 std::string s = jstring_to_string (jni_env, js);
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1451
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1452 if (s == "double")
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1453 {
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1454 NDArray m (dims);
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1455 mID = jni_env->GetMethodID (cls, "toDouble", "()[D");
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1456 jdoubleArray_ref dv (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1457 reinterpret_cast<jdoubleArray>
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1458 (jni_env->CallObjectMethod (jobj,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1459 mID)));
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1460 jni_env->GetDoubleArrayRegion (dv, 0, m.numel (),
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1461 m.fortran_vec ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1462 retval = m;
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1463 break;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1464 }
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1465 else if (s == "byte")
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1466 {
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1467 if (Vjava_unsigned_autoconversion)
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1468 {
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1469 uint8NDArray m (dims);
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1470 mID = jni_env->GetMethodID (cls, "toByte", "()[B");
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1471 jbyteArray_ref dv (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1472 reinterpret_cast<jbyteArray>
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1473 (jni_env->CallObjectMethod (jobj,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1474 mID)));
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1475 jni_env->GetByteArrayRegion (dv, 0, m.numel (),
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1476 reinterpret_cast<jbyte *>
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1477 (m.fortran_vec ()));
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1478 retval = m;
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1479 break;
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1480 }
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1481 else
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1482 {
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1483 int8NDArray m (dims);
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1484 mID = jni_env->GetMethodID (cls, "toByte", "()[B");
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1485 jbyteArray_ref dv (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1486 reinterpret_cast<jbyteArray>
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1487 (jni_env->CallObjectMethod (jobj,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1488 mID)));
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1489 jni_env->GetByteArrayRegion (dv, 0, m.numel (),
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1490 reinterpret_cast<jbyte *>
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1491 (m.fortran_vec ()));
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1492 retval = m;
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1493 break;
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1494 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1495 }
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1496 else if (s == "integer")
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1497 {
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1498 if (Vjava_unsigned_autoconversion)
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1499 {
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1500 uint32NDArray m (dims);
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1501 mID = jni_env->GetMethodID (cls, "toInt", "()[I");
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1502 jintArray_ref dv (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1503 reinterpret_cast<jintArray>
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1504 (jni_env->CallObjectMethod (jobj,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1505 mID)));
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1506 jni_env->GetIntArrayRegion (dv, 0, m.numel (),
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1507 reinterpret_cast<jint *>
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1508 (m.fortran_vec ()));
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1509 retval = m;
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1510 break;
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1511 }
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1512 else
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1513 {
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1514 int32NDArray m (dims);
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1515 mID = jni_env->GetMethodID (cls, "toInt", "()[I");
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1516 jintArray_ref dv (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1517 reinterpret_cast<jintArray>
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1518 (jni_env->CallObjectMethod (jobj,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1519 mID)));
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1520 jni_env->GetIntArrayRegion (dv, 0, m.numel (),
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1521 reinterpret_cast<jint *>
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1522 (m.fortran_vec ()));
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1523 retval = m;
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1524 break;
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1525 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1526 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1527 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1528 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1529
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	1530 cls = find_octave_class (jni_env, "org/octave/OctaveReference");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1531 if (jni_env->IsInstanceOf (jobj, cls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1532 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1533 jmethodID mID = jni_env->GetMethodID (cls, "getID", "()I");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1534 int ID = jni_env->CallIntMethod (jobj, mID);
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25305 diff changeset	1535 auto it = octave_ref_map.find (ID);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1536
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1537 if (it != octave_ref_map.end ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1538 retval = it->second;
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1539 break;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1540 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1541
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1542 // No suitable class found. Return a generic octave_java object.
15821 72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1543 retval = octave_value (new octave_java (jobj, jcls));
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1544 break;
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1545 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1546
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1547 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1548 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1549
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1550 static octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1551 box_more (JNIEnv jni_env, void jobj_arg, void *jcls_arg)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1552 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1553 jobject jobj = TO_JOBJECT (jobj_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1554 jclass jcls = TO_JCLASS (jcls_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1555
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1556 octave_value retval = box (jni_env, jobj, jcls);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1557
23578 7b47b7c2d6c7 maint: Deprecate is_java and replace with isjava. Rik <rik@octave.org> parents: 23577 diff changeset	1558 if (retval.isjava ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1559 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1560 retval = octave_value ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1561
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1562 jclass_ref cls (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1563
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1564 if (retval.is_undefined ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1565 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1566 cls = jni_env->FindClass ("[D");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1567
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1568 if (jni_env->IsInstanceOf (jobj, cls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1569 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1570 jdoubleArray jarr = reinterpret_cast<jdoubleArray> (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1571 int len = jni_env->GetArrayLength (jarr);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1572
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1573 if (len > 0)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1574 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1575 Matrix m (1, len);
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1576 jni_env->GetDoubleArrayRegion (jarr, 0, len,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1577 m.fortran_vec ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1578 retval = m;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1579 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1580 else
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1581 retval = Matrix ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1582 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1583 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1584
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1585 if (retval.is_undefined ())
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1586 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1587 cls = jni_env->FindClass ("[[D");
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1588
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1589 if (jni_env->IsInstanceOf (jobj, cls))
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1590 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1591 jobjectArray jarr = reinterpret_cast<jobjectArray> (jobj);
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17898 diff changeset	1592 int rows = jni_env->GetArrayLength (jarr);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17898 diff changeset	1593 int cols = 0;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1594
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1595 if (rows > 0)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1596 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1597 Matrix m;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1598
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1599 for (int r = 0; r < rows; r++)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1600 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1601 jdoubleArray_ref row (jni_env,
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1602 reinterpret_cast<jdoubleArray>
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1603 (jni_env->GetObjectArrayElement
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	1604 (jarr, r)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1605
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	1606 if (m.isempty ())
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1607 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1608 cols = jni_env->GetArrayLength (row);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1609 m.resize (cols, rows);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1610 }
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1611 jni_env->GetDoubleArrayRegion
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1612 (row, 0, cols, m.fortran_vec () + r * cols);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1613 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1614 retval = m.transpose ();
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1615 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1616 else
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1617 retval = Matrix ();
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1618 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1619 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1620
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1621 if (retval.is_undefined ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1622 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1623 cls = jni_env->FindClass ("[Ljava/lang/String;");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1624
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1625 if (jni_env->IsInstanceOf (jobj, cls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1626 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1627 jobjectArray jarr = reinterpret_cast<jobjectArray> (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1628 int len = jni_env->GetArrayLength (jarr);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1629 Cell m (len, 1);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1630
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1631 for (int i = 0; i < len; i++)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1632 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1633 jstring_ref js (jni_env,
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1634 reinterpret_cast<jstring>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1635 (jni_env->GetObjectArrayElement (jarr, i)));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1636 m(i) = jstring_to_string (jni_env, js);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1637 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1638
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1639 retval = m;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1640 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1641 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1642 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1643
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1644 if (retval.is_undefined ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1645 retval = octave_value (new octave_java (jobj, jcls));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1646
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1647 octave_set_default_fpucw ();
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1648
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1649 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1650 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1651
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1652 static bool
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1653 unbox (JNIEnv *jni_env, const octave_value& val, jobject_ref& jobj,
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1654 jclass_ref& jcls)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1655 {
20121 41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	1656 bool found = true;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1657
23578 7b47b7c2d6c7 maint: Deprecate is_java and replace with isjava. Rik <rik@octave.org> parents: 23577 diff changeset	1658 if (val.isjava ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1659 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1660 octave_java *ovj = TO_JAVA (val);
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1661 jobj = TO_JOBJECT (ovj->to_java ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1662 jobj.detach ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1663 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1664 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1665 else if (val.is_string ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1666 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1667 std::string s = val.string_value ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1668
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1669 jobj = jni_env->NewStringUTF (s.c_str ());
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1670 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1671 }
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23573 diff changeset	1672 else if (val.iscellstr ())
20260 137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1673 {
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1674 const Array<std::string> str_arr = val.cellstr_value ();
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1675 const octave_idx_type n = str_arr.numel ();
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1676
20260 137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1677 jclass_ref scls (jni_env, jni_env->FindClass ("java/lang/String"));
23459 ddcbf10c8c39 maint: Use C++11 nullptr rather than 0 or NULL for remaining instances in code. Rik <rik@octave.org> parents: 23457 diff changeset	1678 jobjectArray array = jni_env->NewObjectArray (n, scls, nullptr);
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1679
20260 137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1680 for (octave_idx_type i = 0; i < n; i++)
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1681 {
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1682 jstring_ref jstr (jni_env, jni_env->NewStringUTF
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1683 (str_arr(i).c_str ()));
20260 137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1684 jni_env->SetObjectArrayElement (array, i, jstr);
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1685 }
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1686
20260 137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1687 jobj = array;
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1688 jcls = jni_env->GetObjectClass (jobj);
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1689 }
23592 80e3bfb7bd5a maint: Deprecate is_vector and replace with isvector. Rik <rik@octave.org> parents: 23585 diff changeset	1690 else if (val.numel () > 1 && val.dims ().isvector ())
20122 81fcf4aa9e03 Automatically convert octave vectors into java primitive arrays (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20121 diff changeset	1691 {
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1692 // FIXME: Is there any way to avoid code duplication here without
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1693 // using a macro?
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1694
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1695 #define UNBOX_PRIMITIVE_ARRAY(METHOD_T, OCTAVE_T, JAVA_T, JAVA_T_CAP) \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1696 do \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1697 { \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1698 const OCTAVE_T ## NDArray v = val.METHOD_T ## array_value (); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1699 JAVA_T ## Array jarr = jni_env->New ## JAVA_T_CAP ## Array (v.numel ()); \
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23446 diff changeset	1700 const JAVA_T jv = reinterpret_cast<const JAVA_T > (v.data ()); \
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1701 jni_env->Set ## JAVA_T_CAP ## ArrayRegion (jarr, 0, v.numel (), jv); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1702 jobj = reinterpret_cast<jobject> (jarr); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1703 jcls = jni_env->GetObjectClass (jobj); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1704 } \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1705 while (0)
20122 81fcf4aa9e03 Automatically convert octave vectors into java primitive arrays (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20121 diff changeset	1706
81fcf4aa9e03 Automatically convert octave vectors into java primitive arrays (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20121 diff changeset	1707 // Note that we do NOT handle char here because they are unboxed
81fcf4aa9e03 Automatically convert octave vectors into java primitive arrays (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20121 diff changeset	1708 // into a String[], not into a char array
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1709
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1710 if (val.is_double_type ())
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	1711 UNBOX_PRIMITIVE_ARRAY ( , , jdouble, Double);
23579 c20a0fa91c0c maint: Deprecate is_bool_type and replace with islogical. Rik <rik@octave.org> parents: 23578 diff changeset	1712 else if (val.islogical ())
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1713 UNBOX_PRIMITIVE_ARRAY (bool_, bool, jboolean, Boolean);
23585 570170b6eb09 maint: Deprecate is_float_type and replace with isfloat. Rik <rik@octave.org> parents: 23582 diff changeset	1714 else if (val.isfloat ())
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1715 UNBOX_PRIMITIVE_ARRAY (float_, Float, jfloat, Float);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1716 else if (val.is_int8_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1717 UNBOX_PRIMITIVE_ARRAY (int8_, int8, jbyte, Byte);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1718 else if (val.is_uint8_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1719 UNBOX_PRIMITIVE_ARRAY (uint8_, uint8, jbyte, Byte);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1720 else if (val.is_int16_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1721 UNBOX_PRIMITIVE_ARRAY (int16_, int16, jshort, Short);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1722 else if (val.is_uint16_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1723 UNBOX_PRIMITIVE_ARRAY (uint16_, uint16, jshort, Short);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1724 else if (val.is_int32_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1725 UNBOX_PRIMITIVE_ARRAY (int32_, int32, jint, Int);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1726 else if (val.is_uint32_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1727 UNBOX_PRIMITIVE_ARRAY (uint32_, uint32, jint, Int);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1728 else if (val.is_int64_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1729 UNBOX_PRIMITIVE_ARRAY (int64_, int64, jlong, Long);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1730 else if (val.is_uint64_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1731 UNBOX_PRIMITIVE_ARRAY (uint64_, uint64, jlong, Long);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1732
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1733 #undef UNBOX_PRIMITIVE_ARRAY
20122 81fcf4aa9e03 Automatically convert octave vectors into java primitive arrays (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20121 diff changeset	1734 }
20123 8261c4a11250 Convert octave integer scalars into closest java type (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20122 diff changeset	1735 else if (val.is_real_scalar () \|\| val.is_bool_scalar ())
15822 e7d9db9531d1 Add conversion for Octave integer and single classes to Java int and float classes. Rik <rik@octave.org> parents: 15821 diff changeset	1736 {
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1737 // FIXME: Is there any way to avoid code duplication here without
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1738 // using a macro?
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1739
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1740 #define UNBOX_PRIMITIVE_SCALAR(OCTAVE_T, METHOD_T, JAVA_T, JAVA_CON) \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1741 do \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1742 { \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1743 const OCTAVE_T ov = val.METHOD_T ## _value (); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1744 jclass_ref dcls (jni_env, jni_env->FindClass (JAVA_T)); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1745 const jfieldID fid = jni_env->GetStaticFieldID (dcls, "TYPE", "Ljava/lang/Class;"); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1746 const jmethodID mid = jni_env->GetMethodID (dcls, "<init>", JAVA_CON); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1747 jcls = reinterpret_cast<jclass> (jni_env->GetStaticObjectField (dcls, fid)); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1748 jobj = jni_env->NewObject (dcls, mid, ov); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1749 } \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1750 while (0)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1751
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1752 if (val.is_double_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1753 UNBOX_PRIMITIVE_SCALAR (double, double, "java/lang/Double", "(D)V");
23579 c20a0fa91c0c maint: Deprecate is_bool_type and replace with islogical. Rik <rik@octave.org> parents: 23578 diff changeset	1754 else if (val.islogical ())
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1755 UNBOX_PRIMITIVE_SCALAR (bool, bool, "java/lang/Boolean", "(Z)V");
23585 570170b6eb09 maint: Deprecate is_float_type and replace with isfloat. Rik <rik@octave.org> parents: 23582 diff changeset	1756 else if (val.isfloat ())
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1757 UNBOX_PRIMITIVE_SCALAR (float, float, "java/lang/Float", "(F)V");
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1758 else if (val.is_int8_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1759 UNBOX_PRIMITIVE_SCALAR (int8_t, int8_scalar, "java/lang/Byte", "(B)V");
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1760 else if (val.is_uint8_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1761 UNBOX_PRIMITIVE_SCALAR (uint8_t, uint8_scalar, "java/lang/Byte", "(B)V");
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1762 else if (val.is_int16_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1763 UNBOX_PRIMITIVE_SCALAR (int16_t, int16_scalar, "java/lang/Short", "(S)V");
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1764 else if (val.is_uint16_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1765 UNBOX_PRIMITIVE_SCALAR (uint16_t, uint16_scalar, "java/lang/Short", "(S)V");
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1766 else if (val.is_int32_type ())
21823 49d999dc443f maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21781 21822 diff changeset	1767 UNBOX_PRIMITIVE_SCALAR (int32_t, int32_scalar, "java/lang/Integer", "(I)V");
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1768 else if (val.is_uint32_type ())
21823 49d999dc443f maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21781 21822 diff changeset	1769 UNBOX_PRIMITIVE_SCALAR (uint32_t, uint32_scalar, "java/lang/Integer", "(I)V");
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1770 else if (val.is_int64_type ())
21823 49d999dc443f maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21781 21822 diff changeset	1771 UNBOX_PRIMITIVE_SCALAR (int64_t, int64_scalar, "java/lang/Long", "(J)V");
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1772 else if (val.is_uint64_type ())
21823 49d999dc443f maint: Periodic merge of stable to default. Mike Miller <mtmiller@octave.org> parents: 21781 21822 diff changeset	1773 UNBOX_PRIMITIVE_SCALAR (uint64_t, uint64_scalar, "java/lang/Long", "(J)V");
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1774
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1775 #undef UNBOX_PRIMITIVE_SCALAR
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22331 diff changeset	1776 }
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	1777 else if (val.isempty ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1778 {
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1779 jobj = nullptr;
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1780 jcls = nullptr;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1781 //jcls = jni_env->FindClass ("java/lang/Object");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1782 }
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20946 diff changeset	1783 else if (! Vjava_matrix_autoconversion
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1784 && ((val.is_real_matrix ()
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1785 && (val.rows () == 1 \|\| val.columns () == 1))
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1786 \|\| val.is_range ()))
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1787 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1788 Matrix m = val.matrix_value ();
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1789 jdoubleArray dv = jni_env->NewDoubleArray (m.numel ());
a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1790 jni_env->SetDoubleArrayRegion (dv, 0, m.numel (), m.fortran_vec ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1791 jobj = dv;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1792 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1793 }
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	1794 else if (Vjava_matrix_autoconversion
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1795 && (val.is_matrix_type () \|\| val.is_range ())
23582 0cc2011d800e maint: Deprecate is_real_type and replace with isreal. Rik <rik@octave.org> parents: 23579 diff changeset	1796 && val.isreal ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1797 {
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1798 jclass_ref mcls (jni_env, find_octave_class (jni_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1799 "org/octave/Matrix"));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1800 dim_vector dims = val.dims ();
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21580 diff changeset	1801 jintArray_ref iv (jni_env, jni_env->NewIntArray (dims.ndims ()));
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1802 jint *iv_data = jni_env->GetIntArrayElements (jintArray (iv), nullptr);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1803
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21580 diff changeset	1804 for (int i = 0; i < dims.ndims (); i++)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1805 iv_data[i] = dims(i);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1806
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1807 jni_env->ReleaseIntArrayElements (jintArray (iv), iv_data, 0);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1808
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1809 if (val.is_double_type ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1810 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1811 NDArray m = val.array_value ();
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1812 jdoubleArray_ref dv (jni_env, jni_env->NewDoubleArray (m.numel ()));
a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1813 jni_env->SetDoubleArrayRegion (jdoubleArray (dv), 0, m.numel (),
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1814 m.fortran_vec ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1815 jmethodID mID = jni_env->GetMethodID (mcls, "<init>", "([D[I)V");
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1816 jobj = jni_env->NewObject (jclass (mcls), mID, jdoubleArray (dv),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1817 jintArray (iv));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1818 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1819 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1820 else if (val.is_int8_type ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1821 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1822 int8NDArray m = val.int8_array_value ();
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1823 jbyteArray_ref bv (jni_env, jni_env->NewByteArray (m.numel ()));
a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1824 jni_env->SetByteArrayRegion (jbyteArray (bv), 0, m.numel (),
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1825 reinterpret_cast<jbyte *>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1826 (m.fortran_vec ()));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1827 jmethodID mID = jni_env->GetMethodID (mcls, "<init>", "([B[I)V");
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1828 jobj = jni_env->NewObject
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1829 (jclass (mcls), mID, jbyteArray (bv), jintArray (iv));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1830 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1831 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1832 else if (val.is_uint8_type ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1833 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1834 uint8NDArray m = val.uint8_array_value ();
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1835 jbyteArray_ref bv (jni_env, jni_env->NewByteArray (m.numel ()));
a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1836 jni_env->SetByteArrayRegion (jbyteArray (bv), 0, m.numel (),
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1837 reinterpret_cast<jbyte *>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1838 (m.fortran_vec ()));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1839 jmethodID mID = jni_env->GetMethodID (mcls, "<init>", "([B[I)V");
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1840 jobj = jni_env->NewObject
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1841 (jclass (mcls), mID, jbyteArray (bv), jintArray (iv));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1842 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1843 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1844 else if (val.is_int32_type ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1845 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1846 int32NDArray m = val.int32_array_value ();
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1847 jintArray_ref v (jni_env, jni_env->NewIntArray (m.numel ()));
a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1848 jni_env->SetIntArrayRegion (jintArray (v), 0, m.numel (),
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1849 reinterpret_cast<jint *>
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1850 (m.fortran_vec ()));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1851 jmethodID mID = jni_env->GetMethodID (mcls, "<init>", "([I[I)V");
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1852 jobj = jni_env->NewObject
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1853 (jclass (mcls), mID, jintArray (v), jintArray (iv));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1854 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1855 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1856 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1857 {
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1858 error ("cannot convert matrix of type '%s'",
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1859 val.class_name ().c_str ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1860 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1861 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1862 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1863 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	1864 jclass rcls = find_octave_class (jni_env, "org/octave/OctaveReference");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1865 jmethodID mID = jni_env->GetMethodID (rcls, "<init>", "(I)V");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1866 int ID = octave_java_refcount++;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1867
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1868 jobj = jni_env->NewObject (rcls, mID, ID);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1869 jcls = rcls;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1870 octave_ref_map[ID] = val;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1871 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1872
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1873 return found;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1874 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1875
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1876 static bool
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1877 unbox (JNIEnv *jni_env, const octave_value_list& args,
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1878 jobjectArray_ref& jobjs, jobjectArray_ref& jclss)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1879 {
20121 41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	1880 bool found = true;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1881
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1882 jclass_ref ocls (jni_env, jni_env->FindClass ("java/lang/Object"));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1883 jclass_ref ccls (jni_env, jni_env->FindClass ("java/lang/Class"));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1884
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1885 if (! jobjs)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1886 jobjs = jni_env->NewObjectArray (args.length (), ocls, nullptr);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1887
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1888 if (! jclss)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	1889 jclss = jni_env->NewObjectArray (args.length (), ccls, nullptr);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1890
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1891 for (int i = 0; i < args.length (); i++)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1892 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1893 jobject_ref jobj (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1894 jclass_ref jcls (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1895
20121 41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	1896 found = unbox (jni_env, args(i), jobj, jcls);
41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	1897 if (! found)
41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	1898 break;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1899
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1900 jni_env->SetObjectArrayElement (jobjs, i, jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1901 jni_env->SetObjectArrayElement (jclss, i, jcls);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1902 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1903
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1904 return found;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1905 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1906
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1907 //! Returns the id of the current thread.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1908 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1909 //! @param jni_env The current environment or @c nullptr.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1910 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1911 //! @returns The id of the current thread or -1 otherwise. The latter happens
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1912 //! if @c jni_env is @c nullptr, for example.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1913
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1914 static long
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1915 get_current_thread_ID (JNIEnv *jni_env)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1916 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1917 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1918 {
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1919 // Call Java method static Thread java.lang.Thread.currentThread().
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1920 jclass_ref cls (jni_env, jni_env->FindClass ("java/lang/Thread"));
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1921 jmethodID mID = jni_env->GetStaticMethodID (cls, "currentThread",
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1922 "()Ljava/lang/Thread;");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1923 jobject_ref jthread (jni_env, jni_env->CallStaticObjectMethod (cls, mID));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1924
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1925 if (jthread)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1926 {
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1927 // Call Java method long java.lang.Thread.getId().
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1928 jclass_ref jth_cls (jni_env, jni_env->GetObjectClass (jthread));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1929 mID = jni_env->GetMethodID (jth_cls, "getId", "()J");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1930 long result = jni_env->CallLongMethod (jthread, mID);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1931 return result;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1932 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1933 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1934
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1935 return -1;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1936 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1937
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1938 //! Run the java method @c org.octave.Octave.checkPendingAction().
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1939 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1940 //! @returns 0 in any case for good reason.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1941
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1942 static int
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1943 java_event_hook (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1944 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1945 JNIEnv *current_env = thread_jni_env ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1946
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1947 if (current_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1948 {
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1949 // Invoke static void org.octave.Octave.checkPendingAction().
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1950 jclass_ref cls (current_env, find_octave_class (current_env,
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1951 "org/octave/Octave"));
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1952 jmethodID mID = current_env->GetStaticMethodID
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	1953 (cls, "checkPendingAction", "()V");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1954 current_env->CallStaticVoidMethod (cls, mID);
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1955
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1956 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1957 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1958
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1959 return 0;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1960 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1961
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1962 //! Initialize java including the virtual machine (jvm) if necessary.
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1963 //!
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1964 //! Initializes the fields #jvm, #jvm_attached, #jvm_lib, and
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1965 //! #octave_thread_ID. To ensure that java is initialized, this method is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1966 //! used as part of octave functions @c javaObject, @c javaMethod,
25041 d5d61f1b6de0 Deprecate java2mat function. Rik <rik@octave.org> parents: 24853 diff changeset	1967 //! @c __java_get__, @c __java_set__, and @c __java2mat__.
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	1968
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1969 static void
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1970 initialize_java (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1971 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1972 if (! jvm)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1973 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1974 try
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1975 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1976 initialize_jvm ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1977
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1978 JNIEnv *current_env = thread_jni_env ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1979
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21745 diff changeset	1980 octave::command_editor::add_event_hook (java_event_hook);
15754 bf77f7f66bdf register octave_java type at Octave startup John W. Eaton <jwe@octave.org> parents: 15752 diff changeset	1981
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1982 octave_thread_ID = get_current_thread_ID (current_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1983 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1984 catch (std::string msg)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1985 {
26149 242aa7b2c783 Silence unnecessary warnings about security-format (bug #55046). Rik <rik@octave.org> parents: 26113 diff changeset	1986 error ("%s", msg.c_str ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1987 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1988
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1989 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1990 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1991 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1992
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1993 JNIEXPORT jboolean JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1994 Java_org_octave_Octave_call (JNIEnv *env, jclass, jstring funcName,
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1995 jobjectArray argin, jobjectArray argout)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1996 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1997 std::string fname = jstring_to_string (env, funcName);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1998
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1999 int nargout = env->GetArrayLength (argout);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2000 int nargin = env->GetArrayLength (argin);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2001
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2002 octave_value_list varargin, varargout;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2003
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2004 for (int i = 0; i < nargin; i++)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	2005 varargin(i) = box (env, env->GetObjectArrayElement (argin, i), nullptr);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2006
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22871 diff changeset	2007 varargout = octave::feval (fname, varargin, nargout);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2008
20121 41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	2009 jobjectArray_ref out_objs (env, argout), out_clss (env);
41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	2010 out_objs.detach ();
41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	2011 return unbox (env, varargout, out_objs, out_clss);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2012 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2013
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2014 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2015 Java_org_octave_OctaveReference_doFinalize (JNIEnv *, jclass, jint ID)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2016 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2017 octave_ref_map.erase (ID);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2018 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2019
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2020 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2021 Java_org_octave_Octave_doInvoke (JNIEnv *env, jclass, jint ID,
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2022 jobjectArray args)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2023 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25305 diff changeset	2024 auto it = octave_ref_map.find (ID);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2025
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2026 if (it != octave_ref_map.end ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2027 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2028 octave_value val = it->second;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2029 int len = env->GetArrayLength (args);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2030 octave_value_list oct_args;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2031
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2032 for (int i = 0; i < len; i++)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2033 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2034 jobject_ref jobj (env, env->GetObjectArrayElement (args, i));
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	2035 oct_args(i) = box (env, jobj, nullptr);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2036 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2037
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2038 if (val.is_function_handle ())
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2039 {
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2040 octave_function *fcn = val.function_value ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22871 diff changeset	2041 octave::feval (fcn, oct_args);
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2042 }
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23575 diff changeset	2043 else if (val.iscell () && val.length () > 0
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2044 && (val.rows () == 1 \|\| val.columns () == 1)
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2045 && val.cell_value()(0).is_function_handle ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2046 {
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2047 Cell c = val.cell_value ();
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2048 octave_function *fcn = c(0).function_value ();
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2049
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2050 for (int i=1; i<c.numel (); i++)
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2051 oct_args(len+i-1) = c(i);
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2052
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22871 diff changeset	2053 octave::feval (fcn, oct_args);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2054 }
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2055 else
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2056 error ("trying to invoke non-invocable object");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2057 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2058 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2059
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2060 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2061 Java_org_octave_Octave_doEvalString (JNIEnv *env, jclass, jstring cmd)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2062 {
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26009 diff changeset	2063 octave::interpreter& interp
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26009 diff changeset	2064 = octave::__get_interpreter__ ("Java_org_octave_Octave_doEvalString");
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26009 diff changeset	2065
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2066 std::string s = jstring_to_string (env, cmd);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2067 int pstatus;
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 26009 diff changeset	2068 interp.eval_string (s, false, pstatus, 0);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2069 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2070
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2071 JNIEXPORT jboolean JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2072 Java_org_octave_Octave_needThreadedInvokation (JNIEnv *env, jclass)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2073 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2074 return (get_current_thread_ID (env) != octave_thread_ID);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2075 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2076
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2077 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2078
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2079 //! Ctor.
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2080
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2081 octave_java::octave_java (void)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	2082 : octave_base_value (), java_object (nullptr), java_class (nullptr)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2083 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2084 #if ! defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2085
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2086 err_disabled_feature ("Java Objects", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2087
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2088 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2089 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2090
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2091 octave_java::octave_java (const voidptr& jobj, void *jcls)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	2092 : octave_base_value (), java_object (nullptr), java_class (nullptr)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2093 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2094 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2095
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2096 init (jobj, jcls);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2097
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2098 #else
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2099
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2100 octave_unused_parameter (jobj);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2101 octave_unused_parameter (jcls);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2102
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2103 err_disabled_feature ("Java Objects", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2104
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2105 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2106 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2107
15813 10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	2108 int octave_java::t_id (-1);
10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	2109
10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	2110 const std::string octave_java::t_name ("octave_java");
10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	2111
10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	2112 void
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2113 octave_java::register_type (octave::type_info& ti)
15813 10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	2114 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2115 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2116
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2117 t_id = ti.register_type (octave_java::t_name, "<unknown>",
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2118 octave_value (new octave_java ()));
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2119
24571 7b6a5336ddb3 * ov-java.cc (octave_java::register_type): Eliminate unused variable warning. John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	2120 #else
7b6a5336ddb3 * ov-java.cc (octave_java::register_type): Eliminate unused variable warning. John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	2121
7b6a5336ddb3 * ov-java.cc (octave_java::register_type): Eliminate unused variable warning. John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	2122 octave_unused_parameter (ti);
7b6a5336ddb3 * ov-java.cc (octave_java::register_type): Eliminate unused variable warning. John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	2123
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2124 #endif
15813 10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	2125 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2126
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2127 dim_vector
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2128 octave_java::dims (void) const
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2129 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2130 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2131
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2132 JNIEnv *current_env = thread_jni_env ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2133
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2134 if (current_env && java_object)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2135 return compute_array_dimensions (current_env, TO_JOBJECT (java_object));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2136 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2137 return dim_vector (1, 1);
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2138
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2139 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2140
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2141 // This shouldn't happen because construction of octave_java objects is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2142 // supposed to be impossible if Java is not available.
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2143
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2144 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2145
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2146 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2147 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2148
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2149 octave_value_list
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2150 octave_java::subsref (const std::string& type,
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2151 const std::list<octave_value_list>& idx, int nargout)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2152 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2153 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2154
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2155 octave_value_list retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2156 int skip = 1;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2157
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2158 JNIEnv *current_env = thread_jni_env ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2159
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2160 switch (type[0])
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2161 {
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2162 case '.':
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2163 if (type.length () > 1 && type[1] == '(')
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2164 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2165 octave_value_list ovl;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2166 count++;
15790 921912c92102 Deprecate java_invoke, replace with javaMethod. Rik <rik@octave.org> parents: 15771 diff changeset	2167 ovl(1) = octave_value (this);
921912c92102 Deprecate java_invoke, replace with javaMethod. Rik <rik@octave.org> parents: 15771 diff changeset	2168 ovl(0) = (idx.front ())(0);
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25305 diff changeset	2169 auto it = idx.begin ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2170 ovl.append (*++it);
23129 35e3d199527c Replace feval calls with direct call to C++ function (bug #50116). Rik <rik@octave.org> parents: 23084 diff changeset	2171 retval = FjavaMethod (ovl, 1);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2172 skip++;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2173 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2174 else
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2175 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2176 octave_value_list ovl;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2177 count++;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2178 ovl(0) = octave_value (this);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2179 ovl(1) = (idx.front ())(0);
23129 35e3d199527c Replace feval calls with direct call to C++ function (bug #50116). Rik <rik@octave.org> parents: 23084 diff changeset	2180 retval = F__java_get__ (ovl, 1);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2181 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2182 break;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2183
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2184 case '(':
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2185 if (current_env)
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	2186 retval = get_array_elements
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	2187 (current_env, TO_JOBJECT (to_java ()), idx.front ());
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2188 break;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2189
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2190 default:
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2191 error ("subsref: Java object cannot be indexed with %c", type[0]);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2192 break;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2193 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2194
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2195 if (idx.size () > 1 && type.length () > 1)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2196 retval = retval(0).next_subsref (nargout, type, idx, skip);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2197
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2198 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2199
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2200 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2201
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2202 octave_unused_parameter (type);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2203 octave_unused_parameter (idx);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2204 octave_unused_parameter (nargout);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2205
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2206 // This shouldn't happen because construction of octave_java objects is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2207 // supposed to be impossible if Java is not available.
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2208
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2209 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2210
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2211 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2212 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2213
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2214 octave_value
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2215 octave_java::subsasgn (const std::string& type,
21661 1b9a36a66b01 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21660 diff changeset	2216 const std::list<octave_value_list>& idx,
1b9a36a66b01 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21660 diff changeset	2217 const octave_value& rhs)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2218 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2219 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2220
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2221 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2222
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2223 JNIEnv *current_env = thread_jni_env ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2224
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2225 switch (type[0])
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2226 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2227 case '.':
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2228 if (type.length () == 1)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2229 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2230 // field assignment
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2231 octave_value_list ovl;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2232 count++;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2233 ovl(0) = octave_value (this);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2234 ovl(1) = (idx.front ())(0);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2235 ovl(2) = rhs;
23129 35e3d199527c Replace feval calls with direct call to C++ function (bug #50116). Rik <rik@octave.org> parents: 23084 diff changeset	2236 F__java_set__ (ovl);
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2237
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2238 count++;
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2239 retval = octave_value (this);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2240 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2241 else if (type.length () > 2 && type[1] == '(')
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2242 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2243 std::list<octave_value_list> new_idx;
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25305 diff changeset	2244 auto it = idx.begin ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2245 new_idx.push_back (*it++);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2246 new_idx.push_back (*it++);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2247 octave_value_list u = subsref (type.substr (0, 2), new_idx, 1);
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2248
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2249 std::list<octave_value_list> next_idx (idx);
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2250 next_idx.erase (next_idx.begin ());
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2251 next_idx.erase (next_idx.begin ());
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2252 u(0).subsasgn (type.substr (2), next_idx, rhs);
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2253
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2254 count++;
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2255 retval = octave_value (this);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2256 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2257 else if (type[1] == '.')
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2258 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2259 octave_value_list u = subsref (type.substr (0, 1), idx, 1);
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2260
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2261 std::list<octave_value_list> next_idx (idx);
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2262 next_idx.erase (next_idx.begin ());
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2263 u(0).subsasgn (type.substr (1), next_idx, rhs);
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2264
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2265 count++;
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2266 retval = octave_value (this);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2267 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2268 else
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2269 error ("invalid indexing/assignment on Java object");
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2270 break;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2271
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2272 case '(':
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2273 if (current_env)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2274 {
22303 0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	2275 set_array_elements (current_env, TO_JOBJECT (to_java ()),
0448bf26fe98 style fixes (patch #9059) Ernst Reissner <rei3ner@arcor.de> parents: 22203 diff changeset	2276 idx.front (), rhs);
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2277
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2278 count++;
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2279 retval = octave_value (this);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2280 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2281 break;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2282
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2283 default:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2284 error ("Java object cannot be indexed with %c", type[0]);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2285 break;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2286 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2287
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2288 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2289
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2290 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2291
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2292 octave_unused_parameter (type);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2293 octave_unused_parameter (idx);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2294 octave_unused_parameter (rhs);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2295
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2296 // This shouldn't happen because construction of octave_java objects is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2297 // supposed to be impossible if Java is not available.
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2298
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2299 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2300
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2301 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2302 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2303
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2304 string_vector
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2305 octave_java::map_keys (void) const
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2306 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2307 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2308
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2309 JNIEnv *current_env = thread_jni_env ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2310
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2311 if (current_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2312 return get_invoke_list (current_env, to_java ());
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2313 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2314 return string_vector ();
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2315
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2316 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2317
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2318 // This shouldn't happen because construction of octave_java objects is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2319 // supposed to be impossible if Java is not available.
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2320
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2321 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2322
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2323 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2324 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2325
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2326 octave_value
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2327 octave_java::convert_to_str_internal (bool, bool force, char type) const
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2328 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2329 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2330
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2331 JNIEnv *current_env = thread_jni_env ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2332
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2333 if (current_env)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2334 return convert_to_string (current_env, TO_JOBJECT (to_java ()), force, type);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2335 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2336 return octave_value ("");
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2337
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2338 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2339
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2340 octave_unused_parameter (force);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2341 octave_unused_parameter (type);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2342
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2343 // This shouldn't happen because construction of octave_java objects is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2344 // supposed to be impossible if Java is not available.
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2345
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2346 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2347
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2348 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2349 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2350
15859 0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2351 void
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18100 diff changeset	2352 octave_java::print (std::ostream& os, bool)
15859 0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2353 {
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2354 print_raw (os);
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2355 newline (os);
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2356 }
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2357
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2358 void
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2359 octave_java::print_raw (std::ostream& os, bool) const
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2360 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	2361 os << "<Java object: " << java_classname << '>';
15859 0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2362 }
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2363
20441 b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2364 // FIXME: Need routines to actually save/load java objects through Serialize.
20531 dcfbf4c1c3c8 eliminate trailing whitespace and tabs from sources John W. Eaton <jwe@octave.org> parents: 20468 diff changeset	2365 // See bug #42112.
20441 b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2366
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2367 bool
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2368 octave_java::save_ascii (std::ostream& /* os */)
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2369 {
20531 dcfbf4c1c3c8 eliminate trailing whitespace and tabs from sources John W. Eaton <jwe@octave.org> parents: 20468 diff changeset	2370 warning ("save: unable to save java objects, skipping");
20441 b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2371
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2372 return true;
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2373 }
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2374
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2375 bool
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2376 octave_java::load_ascii (std::istream& /* is */)
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2377 {
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2378 // Silently skip over java object that was not saved
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2379 return true;
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2380 }
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2381
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2382 bool
26399 586413770c7f pass save_as_floats by value in octave_value save_binary functions John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	2383 octave_java::save_binary (std::ostream& /* os /, bool / save_as_floats */)
20441 b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2384 {
20531 dcfbf4c1c3c8 eliminate trailing whitespace and tabs from sources John W. Eaton <jwe@octave.org> parents: 20468 diff changeset	2385 warning ("save: unable to save java objects, skipping");
20441 b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2386
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2387 return true;
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2388 }
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2389
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2390 bool
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2391 octave_java::load_binary (std::istream& /* is /, bool / swap*/,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	2392 octave::mach_info::float_format /* fmt */)
20441 b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2393 {
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2394 // Silently skip over java object that was not saved
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2395 return true;
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2396 }
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2397
20468 2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2398 bool
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2399 octave_java::save_hdf5 (octave_hdf5_id /* loc_id /, const char /* name */,
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2400 bool /* save_as_floats */)
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2401 {
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2402 warning ("save: unable to save java objects, skipping");
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2403
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2404 return true;
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2405 }
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2406
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2407 bool
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2408 octave_java::load_hdf5 (octave_hdf5_id /* loc_id /, const char /* name */)
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2409 {
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2410 // Silently skip object that was not saved
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2411 return true;
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2412 }
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2413
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2414 octave_value
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2415 octave_java::do_javaMethod (void *jni_env_arg, const std::string& name,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2416 const octave_value_list& args)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2417 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2418 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2419
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2420 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2421
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2422 JNIEnv *jni_env = TO_JNIENV (jni_env_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2423
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2424 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2425 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2426 jobjectArray_ref arg_objs (jni_env), arg_types (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2427 if (unbox (jni_env, args, arg_objs, arg_types))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2428 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	2429 jclass_ref helperClass (jni_env, find_octave_class (jni_env, "org/octave/ClassHelper"));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2430 jmethodID mID = jni_env->GetStaticMethodID (helperClass, "invokeMethod",
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2431 "(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Class;)Ljava/lang/Object;");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2432 jstring_ref methName (jni_env, jni_env->NewStringUTF (name.c_str ()));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2433 jobjectArray_ref resObj (jni_env, reinterpret_cast<jobjectArray> (jni_env->CallStaticObjectMethod (helperClass, mID,
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2434 to_java (), jstring (methName), jobjectArray (arg_objs), jobjectArray (arg_types))));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2435 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2436 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2437 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2438 retval = check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2439 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2440
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2441 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2442 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2443
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2444 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2445
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2446 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2447
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2448 octave_unused_parameter (jni_env_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2449 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2450 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2451
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2452 // This shouldn't happen because construction of octave_java objects is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2453 // supposed to be impossible if Java is not available.
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2454
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2455 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2456
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2457 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2458 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2459
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2460 octave_value
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22331 diff changeset	2461 octave_java::do_javaMethod (const std::string& name,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22331 diff changeset	2462 const octave_value_list& args)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2463 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2464 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2465
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2466 return do_javaMethod (thread_jni_env (), name, args);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2467
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2468 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2469
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2470 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2471 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2472
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2473 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2474 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2475
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2476 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2477
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2478 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2479 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2480
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2481 octave_value
24199 2ac103974d00 Remove extra space between scope operator '::' and function. Rik <rik@octave.org> parents: 24141 diff changeset	2482 octave_java::do_javaMethod (void *jni_env_arg,
2ac103974d00 Remove extra space between scope operator '::' and function. Rik <rik@octave.org> parents: 24141 diff changeset	2483 const std::string& class_name,
2ac103974d00 Remove extra space between scope operator '::' and function. Rik <rik@octave.org> parents: 24141 diff changeset	2484 const std::string& name,
2ac103974d00 Remove extra space between scope operator '::' and function. Rik <rik@octave.org> parents: 24141 diff changeset	2485 const octave_value_list& args)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2486 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2487 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2488
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2489 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2490
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2491 JNIEnv *jni_env = TO_JNIENV (jni_env_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2492
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2493 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2494 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2495 jobjectArray_ref arg_objs (jni_env), arg_types (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2496 if (unbox (jni_env, args, arg_objs, arg_types))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2497 {
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2498 jclass_ref helperClass (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2499 find_octave_class (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2500 "org/octave/ClassHelper"));
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2501 jmethodID mID = jni_env->GetStaticMethodID (helperClass,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2502 "invokeStaticMethod",
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2503 "(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Class;)Ljava/lang/Object;");
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2504 jstring_ref methName (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2505 jni_env->NewStringUTF (name.c_str ()));
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2506 jstring_ref clsName (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2507 jni_env->NewStringUTF (class_name.c_str ()));
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2508 jobject_ref resObj (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2509 jni_env->CallStaticObjectMethod (helperClass,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2510 mID,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2511 jstring (clsName),
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2512 jstring (methName),
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2513 jobjectArray (arg_objs),
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2514 jobjectArray (arg_types)));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2515 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2516 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2517 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2518 retval = check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2519 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2520
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2521 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2522 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2523
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2524 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2525
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2526 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2527
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2528 octave_unused_parameter (jni_env_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2529 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2530 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2531 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2532
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2533 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2534 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2535
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2536 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2537
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2538 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2539 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2540
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2541 octave_value
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2542 octave_java::do_javaMethod (const std::string& class_name,
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2543 const std::string& name,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2544 const octave_value_list& args)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2545 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2546 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2547
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2548 return do_javaMethod (thread_jni_env (), class_name, name, args);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2549
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2550 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2551
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2552 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2553 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2554 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2555
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2556 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2557 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2558
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2559 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2560
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2561 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2562 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2563
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2564 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2565 octave_java::do_javaObject (void *jni_env_arg, const std::string& name,
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2566 const octave_value_list& args)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2567 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2568 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2569
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2570 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2571
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2572 JNIEnv *jni_env = TO_JNIENV (jni_env_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2573
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2574 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2575 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2576 jobjectArray_ref arg_objs (jni_env), arg_types (jni_env);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2577
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2578 if (unbox (jni_env, args, arg_objs, arg_types))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2579 {
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2580 jclass_ref helperClass (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2581 find_octave_class (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2582 "org/octave/ClassHelper"));
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2583 jmethodID mID = jni_env->GetStaticMethodID (helperClass,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2584 "invokeConstructor",
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2585 "(Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Class;)Ljava/lang/Object;");
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2586 jstring_ref clsName (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2587 jni_env->NewStringUTF (name.c_str ()));
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2588 jobject_ref resObj (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2589 jni_env->CallStaticObjectMethod (helperClass,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2590 mID,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2591 jstring (clsName),
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2592 jobjectArray (arg_objs),
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2593 jobjectArray (arg_types)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2594
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2595 if (resObj)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	2596 retval = octave_value (new octave_java (resObj, nullptr));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2597 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2598 check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2599 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2600
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2601 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2602 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2603
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2604 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2605
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2606 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2607
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2608 octave_unused_parameter (jni_env_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2609 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2610 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2611
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2612 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2613 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2614
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2615 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2616
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2617 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2618 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2619
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2620 octave_value
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22331 diff changeset	2621 octave_java::do_javaObject (const std::string& name,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22331 diff changeset	2622 const octave_value_list& args)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2623 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2624 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2625
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2626 return do_javaObject (thread_jni_env (), name, args);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2627
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2628 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2629
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2630 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2631 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2632
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2633 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2634 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2635
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2636 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2637
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2638 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2639 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2640
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2641 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2642 octave_java::do_java_get (void *jni_env_arg, const std::string& name)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2643 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2644 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2645
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2646 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2647
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2648 JNIEnv *jni_env = TO_JNIENV (jni_env_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2649
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2650 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2651 {
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2652 jclass_ref helperClass (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2653 find_octave_class (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2654 "org/octave/ClassHelper"));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2655 jmethodID mID = jni_env->GetStaticMethodID (helperClass, "getField",
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2656 "(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2657 jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ()));
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2658 jobject_ref resObj (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2659 jni_env->CallStaticObjectMethod (helperClass,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2660 mID,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2661 to_java (),
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2662 jstring (fName)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2663
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2664 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2665 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2666 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2667 retval = check_exception (jni_env);
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2668
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2669 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2670 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2671
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2672 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2673
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2674 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2675
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2676 octave_unused_parameter (jni_env_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2677 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2678
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2679 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2680 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2681
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2682 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2683
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2684 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2685 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2686
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2687 octave_value
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2688 octave_java::do_java_get (const std::string& name)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2689 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2690 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2691
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2692 return do_java_get (thread_jni_env (), name);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2693
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2694 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2695
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2696 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2697
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2698 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2699 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2700
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2701 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2702
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2703 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2704 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2705
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2706 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2707 octave_java::do_java_get (void *jni_env_arg, const std::string& class_name,
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2708 const std::string& name)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2709 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2710 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2711
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2712 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2713
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2714 JNIEnv *jni_env = TO_JNIENV (jni_env_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2715
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2716 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2717 {
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2718 jclass_ref helperClass (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2719 find_octave_class (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2720 "org/octave/ClassHelper"));
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2721 jmethodID mID = jni_env->GetStaticMethodID (helperClass,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2722 "getStaticField",
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2723 "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2724 jstring_ref cName (jni_env, jni_env->NewStringUTF (class_name.c_str ()));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2725 jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ()));
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2726 jobject_ref resObj (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2727 jni_env->CallStaticObjectMethod (helperClass, mID,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2728 jstring (cName),
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2729 jstring (fName)));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2730 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2731 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2732 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2733 retval = check_exception (jni_env);
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2734
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2735 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2736 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2737
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2738 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2739
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2740 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2741
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2742 octave_unused_parameter (jni_env_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2743 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2744 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2745
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2746 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2747 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2748
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2749 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2750
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2751 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2752 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2753
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2754 octave_value
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22331 diff changeset	2755 octave_java::do_java_get (const std::string& class_name,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22331 diff changeset	2756 const std::string& name)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2757 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2758 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2759
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2760 return do_java_get (thread_jni_env (), class_name, name);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2761
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2762 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2763
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2764 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2765 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2766
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2767 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2768 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2769
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2770 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2771
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2772 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2773 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2774
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2775 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2776 octave_java::do_java_set (void *jni_env_arg, const std::string& name,
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2777 const octave_value& val)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2778 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2779 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2780
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2781 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2782
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2783 JNIEnv *jni_env = TO_JNIENV (jni_env_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2784
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2785 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2786 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2787 jobject_ref jobj (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2788 jclass_ref jcls (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2789
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2790 if (unbox (jni_env, val, jobj, jcls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2791 {
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2792 jclass_ref helperClass (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2793 find_octave_class (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2794 "org/octave/ClassHelper"));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2795 jmethodID mID = jni_env->GetStaticMethodID (helperClass, "setField",
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2796 "(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2797 jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ()));
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2798 jni_env->CallStaticObjectMethod (helperClass, mID, to_java (),
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2799 jstring (fName), jobject (jobj));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2800 check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2801 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2802
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2803 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2804 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2805
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2806 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2807
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2808 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2809
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2810 octave_unused_parameter (jni_env_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2811 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2812 octave_unused_parameter (val);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2813
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2814 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2815 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2816
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2817 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2818
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2819 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2820 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2821
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2822 octave_value
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2823 octave_java::do_java_set (const std::string& name, const octave_value& val)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2824 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2825 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2826
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2827 return do_java_set (thread_jni_env (), name, val);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2828
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2829 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2830
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2831 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2832 octave_unused_parameter (val);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2833
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2834 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2835 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2836
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2837 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2838
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2839 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2840 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2841
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2842 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2843 octave_java::do_java_set (void *jni_env_arg, const std::string& class_name,
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2844 const std::string& name, const octave_value& val)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2845 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2846 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2847
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2848 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2849
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2850 JNIEnv *jni_env = TO_JNIENV (jni_env_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2851
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2852 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2853 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2854 jobject_ref jobj (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2855 jclass_ref jcls (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2856
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2857 if (unbox (jni_env, val, jobj, jcls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2858 {
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2859 jclass_ref helperClass (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2860 find_octave_class (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2861 "org/octave/ClassHelper"));
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2862 jmethodID mID = jni_env->GetStaticMethodID (helperClass,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2863 "setStaticField",
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2864 "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V");
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2865 jstring_ref cName (jni_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2866 jni_env->NewStringUTF (class_name.c_str ()));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2867 jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ()));
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2868 jni_env->CallStaticObjectMethod (helperClass, mID, jstring (cName),
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2869 jstring (fName), jobject (jobj));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2870 check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2871 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2872
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2873 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2874 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2875
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2876 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2877
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2878 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2879
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2880 octave_unused_parameter (jni_env_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2881 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2882 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2883 octave_unused_parameter (val);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2884
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2885 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2886 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2887
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2888 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2889
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2890 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2891 }
15736 6faa01ff2967 build: Add --disable-java option to configure (bug #37838). Rik <rik@octave.org> parents: 15625 diff changeset	2892
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2893 octave_value
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22331 diff changeset	2894 octave_java::do_java_set (const std::string& class_name,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22331 diff changeset	2895 const std::string& name,
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2896 const octave_value& val)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2897 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2898 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2899
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2900 return do_java_set (thread_jni_env (), class_name, name, val);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2901
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2902 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2903
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2904 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2905 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2906 octave_unused_parameter (val);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2907
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2908 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2909 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2910
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2911 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2912
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2913 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2914 }
15736 6faa01ff2967 build: Add --disable-java option to configure (bug #37838). Rik <rik@octave.org> parents: 15625 diff changeset	2915
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2916 void
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2917 octave_java::init (void jobj_arg, void jcls_arg)
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2918 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2919 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2920
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2921 jobject jobj = TO_JOBJECT (jobj_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2922 jclass jcls = TO_JCLASS (jcls_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2923
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2924 JNIEnv *current_env = thread_jni_env ();
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2925
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2926 if (current_env)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2927 {
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2928 if (jobj)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2929 java_object = current_env->NewGlobalRef (jobj);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2930
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2931 if (jcls)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2932 java_class = current_env->NewGlobalRef (jcls);
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2933 else if (java_object)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2934 {
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2935 jclass_ref ocls (current_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2936 current_env->GetObjectClass(TO_JOBJECT (java_object)));
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2937 java_class = current_env->NewGlobalRef (jclass (ocls));
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2938 }
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2939
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2940 if (java_class)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2941 {
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2942 jclass_ref clsCls (current_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2943 current_env->GetObjectClass (TO_JCLASS (java_class)));
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2944 jmethodID mID = current_env->GetMethodID (clsCls,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2945 "getCanonicalName",
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2946 "()Ljava/lang/String;");
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2947 jobject_ref resObj (current_env,
af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	2948 current_env->CallObjectMethod (TO_JCLASS (java_class), mID));
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2949 java_classname = jstring_to_string (current_env, resObj);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2950 }
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2951 }
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2952
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2953 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2954
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2955 octave_unused_parameter (jobj_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2956 octave_unused_parameter (jcls_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2957
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2958 // This shouldn't happen because construction of octave_java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2959 // objects is supposed to be impossible if Java is not available.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2960
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2961 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2962
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2963 #endif
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2964 }
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2965
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2966 void
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2967 octave_java::release (void)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2968 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2969 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2970
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2971 JNIEnv *current_env = thread_jni_env ();
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2972
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2973 if (current_env)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2974 {
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2975 if (java_object)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2976 current_env->DeleteGlobalRef (TO_JOBJECT (java_object));
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2977
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2978 if (java_class)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2979 current_env->DeleteGlobalRef (TO_JCLASS (java_class));
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2980
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	2981 java_object = nullptr;
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	2982 java_class = nullptr;
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2983 }
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2984
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2985 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2986
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2987 // This shouldn't happen because construction of octave_java objects is
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2988 // supposed to be impossible if Java is not available.
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2989
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2990 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2991
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2992 #endif
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2993 }
15806 01d4f742d75d doc: Re-organize and improve Java Interface documentation. Rik <rik@octave.org> parents: 15800 diff changeset	2994
24140 0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2995 // DEFUN blocks below must be outside of HAVE_JAVA block so that documentation
0b7662d8bd02 doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments. Ernst Reissner <rei3ner@arcor.de> parents: 23929 diff changeset	2996 // strings are always available, even when functions are not.
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2997
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2998 DEFUN (__java_init__, , ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2999 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3000 @deftypefn {} {} __java_init__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3001 Internal function used @strong{only} when debugging Java interface.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3002
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3003 Function will directly call initialize_java to create an instance of a JVM.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3004 @end deftypefn */)
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3005 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3006 #if defined (HAVE_JAVA)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3007
24141 af577de75e68 maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24140 diff changeset	3008 octave_value retval = 0;
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3009
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3010 initialize_java ();
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3011
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3012 retval = 1;
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3013
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3014 return retval;
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3015
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3016 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3017
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3018 err_disabled_feature ("__java_init__", "Java");
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3019
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3020 #endif
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3021 }
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3022
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3023 DEFUN (__java_exit__, , ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3024 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3025 @deftypefn {} {} __java_exit__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3026 Internal function used @strong{only} when debugging Java interface.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3027
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3028 Function will directly call terminate_jvm to destroy the current JVM
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3029 instance.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3030 @end deftypefn */)
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3031 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3032 #if defined (HAVE_JAVA)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3033
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3034 terminate_jvm ();
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20955 diff changeset	3035
9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20955 diff changeset	3036 return ovl ();
9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20955 diff changeset	3037
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3038 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3039
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3040 err_disabled_feature ("__java_exit__", "Java");
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3041
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3042 #endif
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3043 }
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	3044
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3045 DEFUN (javaObject, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3046 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3047 @deftypefn {} {@var{jobj} =} javaObject (@var{classname})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3048 @deftypefnx {} {@var{jobj} =} javaObject (@var{classname}, @var{arg1}, @dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3049 Create a Java object of class @var{classsname}, by calling the class
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3050 constructor with the arguments @var{arg1}, @dots{}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3051
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3052 The first example below creates an uninitialized object, while the second
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3053 example supplies an initial argument to the constructor.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3054
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3055 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3056 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3057 x = javaObject ("java.lang.StringBuffer")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3058 x = javaObject ("java.lang.StringBuffer", "Initial string")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3059 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3060 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3061
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3062 @seealso{javaMethod, javaArray}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3063 @end deftypefn */)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3064 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3065 #if defined (HAVE_JAVA)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3066
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3067 if (args.length () == 0)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3068 print_usage ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3069
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3070 std::string classname = args(0).xstring_value ("javaObject: CLASSNAME must be a string");
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3071
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3072 initialize_java ();
15790 921912c92102 Deprecate java_invoke, replace with javaMethod. Rik <rik@octave.org> parents: 15771 diff changeset	3073
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3074 JNIEnv *current_env = thread_jni_env ();
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3075
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3076 octave_value_list tmp;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3077 for (int i=1; i<args.length (); i++)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3078 tmp(i-1) = args(i);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3079
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3080 return ovl (octave_java::do_javaObject (current_env, classname, tmp));
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	3081
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3082 #else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3083
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3084 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3085
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3086 err_disabled_feature ("javaObject", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3087
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3088 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3089 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3090
15825 9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	3091 /*
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	3092 ## The tests below merely check if javaObject works at all. Whether
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	3093 ## it works properly, i.e., creates the right values, is a matter of
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	3094 ## Java itself. Create a Short and check if it really is a short, i.e.,
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	3095 ## whether it overflows.
23405 32ec90068be5 use %!testif runtime tests to properly skip java tests John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3096 %!testif HAVE_JAVA; usejava ("jvm")
15825 9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	3097 %! assert (javaObject ("java.lang.Short", 40000).doubleValue < 0);
9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	3098 */
9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	3099
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3100 DEFUN (javaMethod, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3101 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3102 @deftypefn {} {@var{ret} =} javaMethod (@var{methodname}, @var{obj})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3103 @deftypefnx {} {@var{ret} =} javaMethod (@var{methodname}, @var{obj}, @var{arg1}, @dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3104 Invoke the method @var{methodname} on the Java object @var{obj} with the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3105 arguments @var{arg1}, @dots{}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3106
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3107 For static methods, @var{obj} can be a string representing the fully
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3108 qualified name of the corresponding class.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3109
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3110 When @var{obj} is a regular Java object, structure-like indexing can be
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3111 used as a shortcut syntax. For instance, the two following statements are
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3112 equivalent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3113
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3114 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3115 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3116 ret = javaMethod ("method1", x, 1.0, "a string")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3117 ret = x.method1 (1.0, "a string")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3118 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3119 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3120
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3121 @code{javaMethod} returns the result of the method invocation.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3122
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3123 @seealso{methods, javaObject}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3124 @end deftypefn */)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3125 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3126 #if defined (HAVE_JAVA)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3127
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3128 if (args.length () < 2)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3129 print_usage ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3130
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3131 std::string methodname = args(0).xstring_value ("javaMethod: METHODNAME must be a string");
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3132
15790 921912c92102 Deprecate java_invoke, replace with javaMethod. Rik <rik@octave.org> parents: 15771 diff changeset	3133 initialize_java ();
921912c92102 Deprecate java_invoke, replace with javaMethod. Rik <rik@octave.org> parents: 15771 diff changeset	3134
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3135 JNIEnv *current_env = thread_jni_env ();
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3136
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3137 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3138
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3139 octave_value_list tmp;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3140 for (int i=2; i<args.length (); i++)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3141 tmp(i-2) = args(i);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3142
23578 7b47b7c2d6c7 maint: Deprecate is_java and replace with isjava. Rik <rik@octave.org> parents: 23577 diff changeset	3143 if (args(1).isjava ())
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3144 {
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3145 octave_java *jobj = TO_JAVA (args(1));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3146 retval = jobj->do_javaMethod (current_env, methodname, tmp);
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3147 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3148 else if (args(1).is_string ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3149 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3150 std::string cls = args(1).string_value ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3151 retval = octave_java::do_javaMethod (current_env, cls, methodname, tmp);
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3152 }
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3153 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3154 error ("javaMethod: OBJ must be a Java object or a string");
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3155
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3156 return retval;
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	3157
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3158 #else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3159
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3160 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3161
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3162 err_disabled_feature ("javaMethod", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3163
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3164 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3165 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3166
15825 9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	3167 /*
23405 32ec90068be5 use %!testif runtime tests to properly skip java tests John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3168 %!testif HAVE_JAVA; usejava ("jvm")
24671 5aa9c885ea18 Rewrite certain Java BIST tests to pass with Java 9 (bug #52627). Rik <rik@octave.org> parents: 24592 diff changeset	3169 %! jver = javaMethod ("getProperty", "java.lang.System", "java.version");
5aa9c885ea18 Rewrite certain Java BIST tests to pass with Java 9 (bug #52627). Rik <rik@octave.org> parents: 24592 diff changeset	3170 %! jver = strsplit (jver, ".");
5aa9c885ea18 Rewrite certain Java BIST tests to pass with Java 9 (bug #52627). Rik <rik@octave.org> parents: 24592 diff changeset	3171 %! if (numel (jver) > 1)
5aa9c885ea18 Rewrite certain Java BIST tests to pass with Java 9 (bug #52627). Rik <rik@octave.org> parents: 24592 diff changeset	3172 %! assert (isfinite (str2double (jver{1})));
5aa9c885ea18 Rewrite certain Java BIST tests to pass with Java 9 (bug #52627). Rik <rik@octave.org> parents: 24592 diff changeset	3173 %! assert (isfinite (str2double (jver{2})));
5aa9c885ea18 Rewrite certain Java BIST tests to pass with Java 9 (bug #52627). Rik <rik@octave.org> parents: 24592 diff changeset	3174 %! else
5aa9c885ea18 Rewrite certain Java BIST tests to pass with Java 9 (bug #52627). Rik <rik@octave.org> parents: 24592 diff changeset	3175 %! assert (isfinite (str2double (jver{1})));
5aa9c885ea18 Rewrite certain Java BIST tests to pass with Java 9 (bug #52627). Rik <rik@octave.org> parents: 24592 diff changeset	3176 %! endif
15825 9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	3177 */
9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	3178
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3179 DEFUN (__java_get__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3180 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3181 @deftypefn {} {@var{val} =} __java_get__ (@var{obj}, @var{name})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3182 Get the value of the field @var{name} of the Java object @var{obj}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3183
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3184 For static fields, @var{obj} can be a string representing the fully
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3185 qualified name of the corresponding class.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3186
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3187 When @var{obj} is a regular Java object, structure-like indexing can be used
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3188 as a shortcut syntax. For instance, the two following statements are
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3189 equivalent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3190
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3191 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3192 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3193 __java_get__ (x, "field1")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3194 x.field1
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3195 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3196 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3197
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3198 @seealso{__java_set__, javaMethod, javaObject}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3199 @end deftypefn */)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3200 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3201 #if defined (HAVE_JAVA)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3202
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3203 if (args.length () != 2)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3204 print_usage ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3205
26365 45d5a4ae636b ov-java.cc: Bugfix use xstring_value for extraction Andreas Weber <octave@josoansi.de> parents: 26149 diff changeset	3206 std::string name = args(1).xstring_value ("__java_get__: NAME must be a string");
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3207
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3208 initialize_java ();
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3209
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3210 JNIEnv *current_env = thread_jni_env ();
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3211
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3212 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3213
23578 7b47b7c2d6c7 maint: Deprecate is_java and replace with isjava. Rik <rik@octave.org> parents: 23577 diff changeset	3214 if (args(0).isjava ())
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3215 {
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3216 octave_java *jobj = TO_JAVA (args(0));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3217 retval = jobj->do_java_get (current_env, name);
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3218 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3219 else if (args(0).is_string ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3220 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3221 std::string cls = args(0).string_value ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3222 retval = octave_java::do_java_get (current_env, cls, name);
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3223 }
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3224 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3225 error ("__java_get__: OBJ must be a Java object or a string");
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3226
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3227 return retval;
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	3228
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3229 #else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3230
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3231 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3232
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3233 err_disabled_feature ("__java_get__", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3234
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3235 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3236 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3237
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3238 DEFUN (__java_set__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3239 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3240 @deftypefn {} {@var{obj} =} __java_set__ (@var{obj}, @var{name}, @var{val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3241 Set the value of the field @var{name} of the Java object @var{obj} to
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3242 @var{val}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3243
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3244 For static fields, @var{obj} can be a string representing the fully
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3245 qualified named of the corresponding Java class.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3246
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3247 When @var{obj} is a regular Java object, structure-like indexing can be
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3248 used as a shortcut syntax. For instance, the two following statements are
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3249 equivalent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3250
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3251 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3252 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3253 __java_set__ (x, "field1", val)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3254 x.field1 = val
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3255 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3256 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3257
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3258 @seealso{__java_get__, javaMethod, javaObject}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3259 @end deftypefn */)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3260 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3261 #if defined (HAVE_JAVA)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3262
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3263 if (args.length () != 3)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3264 print_usage ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3265
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3266 std::string name = args(1).xstring_value ("__java_set__: NAME must be a string");
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3267
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3268 initialize_java ();
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3269
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3270 JNIEnv *current_env = thread_jni_env ();
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3271
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3272 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3273
23578 7b47b7c2d6c7 maint: Deprecate is_java and replace with isjava. Rik <rik@octave.org> parents: 23577 diff changeset	3274 if (args(0).isjava ())
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3275 {
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3276 octave_java *jobj = TO_JAVA (args(0));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3277 retval = jobj->do_java_set (current_env, name, args(2));
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3278 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3279 else if (args(0).is_string ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3280 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3281 std::string cls = args(0).string_value ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3282 retval = octave_java::do_java_set (current_env, cls, name, args(2));
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3283 }
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3284 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3285 error ("__java_set__: OBJ must be a Java object or a string");
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3286
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3287 return retval;
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	3288
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3289 #else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3290
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3291 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3292
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3293 err_disabled_feature ("__java_set__", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3294
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3295 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3296 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3297
25041 d5d61f1b6de0 Deprecate java2mat function. Rik <rik@octave.org> parents: 24853 diff changeset	3298 DEFUN (__java2mat__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3299 doc: /* -- texinfo --
25041 d5d61f1b6de0 Deprecate java2mat function. Rik <rik@octave.org> parents: 24853 diff changeset	3300 @deftypefn {} {} __java2mat__ (@var{javaobj})
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3301 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3302 @end deftypefn */)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3303 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3304 #if defined (HAVE_JAVA)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3305
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3306 if (args.length () != 1)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3307 print_usage ();
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3308
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3309 initialize_java ();
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3310
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3311 JNIEnv *current_env = thread_jni_env ();
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3312
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3313 octave_value_list retval;
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	3314
23578 7b47b7c2d6c7 maint: Deprecate is_java and replace with isjava. Rik <rik@octave.org> parents: 23577 diff changeset	3315 if (args(0).isjava ())
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3316 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	3317 octave_java *jobj = TO_JAVA (args(0));
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23717 diff changeset	3318 retval = ovl (box_more (current_env, jobj->to_java (), nullptr));
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3319 }
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	3320 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3321 retval = ovl (args(0));
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3322
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3323 return retval;
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	3324
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3325 #else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3326
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3327 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3328
25041 d5d61f1b6de0 Deprecate java2mat function. Rik <rik@octave.org> parents: 24853 diff changeset	3329 err_disabled_feature ("__java2mat__", "Java");
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3330
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3331 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3332 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3333
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	3334 DEFUN (java_matrix_autoconversion, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3335 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3336 @deftypefn {} {@var{val} =} java_matrix_autoconversion ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3337 @deftypefnx {} {@var{old_val} =} java_matrix_autoconversion (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3338 @deftypefnx {} {} java_matrix_autoconversion (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3339 Query or set the internal variable that controls whether Java arrays are
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3340 automatically converted to Octave matrices.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3341
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3342 The default value is false.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3343
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3344 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3345 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3346 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3347 @seealso{java_unsigned_autoconversion, debug_java}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3348 @end deftypefn */)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3349 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3350 #if defined (HAVE_JAVA)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3351
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	3352 return SET_INTERNAL_VARIABLE (java_matrix_autoconversion);
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3353
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3354 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3355
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3356 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3357 octave_unused_parameter (nargout);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3358
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3359 err_disabled_feature ("java_matrix_autoconversion", "Java");
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3360
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3361 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3362 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3363
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	3364 DEFUN (java_unsigned_autoconversion, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3365 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3366 @deftypefn {} {@var{val} =} java_unsigned_autoconversion ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3367 @deftypefnx {} {@var{old_val} =} java_unsigned_autoconversion (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3368 @deftypefnx {} {} java_unsigned_autoconversion (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3369 Query or set the internal variable that controls how integer classes are
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3370 converted when @code{java_matrix_autoconversion} is enabled.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3371
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3372 When enabled, Java arrays of class Byte or Integer are converted to matrices
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3373 of class uint8 or uint32 respectively. The default value is true.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3374
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3375 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3376 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3377 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3378 @seealso{java_matrix_autoconversion, debug_java}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3379 @end deftypefn */)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3380 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3381 #if defined (HAVE_JAVA)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3382
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	3383 return SET_INTERNAL_VARIABLE (java_unsigned_autoconversion);
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3384
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3385 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3386
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3387 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3388 octave_unused_parameter (nargout);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3389
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3390 err_disabled_feature ("java_unsigned_autoconversion", "Java");
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3391
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3392 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3393 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3394
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	3395 DEFUN (debug_java, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3396 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3397 @deftypefn {} {@var{val} =} debug_java ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3398 @deftypefnx {} {@var{old_val} =} debug_java (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3399 @deftypefnx {} {} debug_java (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3400 Query or set the internal variable that determines whether extra debugging
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3401 information regarding the initialization of the JVM and any Java exceptions
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3402 is printed.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3403
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3404 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3405 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3406 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3407 @seealso{java_matrix_autoconversion, java_unsigned_autoconversion}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3408 @end deftypefn */)
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3409 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3410 #if defined (HAVE_JAVA)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3411
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	3412 return SET_INTERNAL_VARIABLE (debug_java);
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3413
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3414 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3415
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3416 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3417 octave_unused_parameter (nargout);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3418
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3419 err_disabled_feature ("debug_java", "Java");
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3420
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3421 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3422 }
15736 6faa01ff2967 build: Add --disable-java option to configure (bug #37838). Rik <rik@octave.org> parents: 15625 diff changeset	3423
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3424 // Outside of #if defined (HAVE_JAVA) because it is desirable to be able
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3425 // to test for the presence of a Java object without having Java
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3426 // installed.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3427
15770 e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3428 DEFUN (isjava, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3429 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3430 @deftypefn {} {} isjava (@var{x})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3431 Return true if @var{x} is a Java object.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3432 @seealso{class, typeinfo, isa, javaObject}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3433 @end deftypefn */)
15770 e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3434 {
e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3435 if (args.length () != 1)
e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3436 print_usage ();
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	3437
23578 7b47b7c2d6c7 maint: Deprecate is_java and replace with isjava. Rik <rik@octave.org> parents: 23577 diff changeset	3438 return ovl (args(0).isjava ());
15770 e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3439 }
e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3440
20120 2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	3441 /*
20152 8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3442 ## Check automatic conversion of java primitive arrays into octave types.
23405 32ec90068be5 use %!testif runtime tests to properly skip java tests John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3443 %!testif HAVE_JAVA; usejava ("jvm")
20152 8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3444 %! assert (javaObject ("java.lang.String", "hello").getBytes (),
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3445 %! int8 ([104 101 108 108 111]'));
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3446
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3447 ## Check automatic conversion of octave types into java primitive arrays.
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3448 ## Note that uint8 is casted to int8.
23405 32ec90068be5 use %!testif runtime tests to properly skip java tests John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3449 %!testif HAVE_JAVA; usejava ("jvm")
20152 8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3450 %! assert (javaMethod ("binarySearch", "java.util.Arrays", [90 100 255], 255), 2);
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3451 %! assert (javaMethod ("binarySearch", "java.util.Arrays", uint8 ([90 100 255]), uint8 (255)) < 0);
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3452 %! assert (javaMethod ("binarySearch", "java.util.Arrays", uint8 ([90 100 128]), uint8 (128)) < 0);
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3453 %! assert (javaMethod ("binarySearch", "java.util.Arrays", uint8 ([90 100 127]), uint8 (127)), 2);
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3454 %! assert (javaMethod ("binarySearch", "java.util.Arrays", uint16 ([90 100 128]), uint16 (128)), 2);
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3455
22489 93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22407 diff changeset	3456 ## Check we can create objects that wrap java literals
23573 1b4f4ec53b4a use new script to tag fixed bugs in tests John W. Eaton <jwe@octave.org> parents: 23572 diff changeset	3457 %!testif HAVE_JAVA; usejava ("jvm") <*38821>
21822 e56ba70108d3 Fix typos in Java conversion of 32 and 64 bit integers (bug #48107) Mike Miller <mtmiller@octave.org> parents: 21780 diff changeset	3458 %! assert (class (javaObject ("java.lang.Byte", uint8 (1))), "java.lang.Byte");
e56ba70108d3 Fix typos in Java conversion of 32 and 64 bit integers (bug #48107) Mike Miller <mtmiller@octave.org> parents: 21780 diff changeset	3459 %! assert (class (javaObject ("java.lang.Byte", int8 (1))), "java.lang.Byte");
e56ba70108d3 Fix typos in Java conversion of 32 and 64 bit integers (bug #48107) Mike Miller <mtmiller@octave.org> parents: 21780 diff changeset	3460 %! assert (class (javaObject ("java.lang.Short", uint16 (1))), "java.lang.Short");
e56ba70108d3 Fix typos in Java conversion of 32 and 64 bit integers (bug #48107) Mike Miller <mtmiller@octave.org> parents: 21780 diff changeset	3461 %! assert (class (javaObject ("java.lang.Short", int16 (1))), "java.lang.Short");
e56ba70108d3 Fix typos in Java conversion of 32 and 64 bit integers (bug #48107) Mike Miller <mtmiller@octave.org> parents: 21780 diff changeset	3462 %! assert (class (javaObject ("java.lang.Integer", uint32 (1))), "java.lang.Integer");
e56ba70108d3 Fix typos in Java conversion of 32 and 64 bit integers (bug #48107) Mike Miller <mtmiller@octave.org> parents: 21780 diff changeset	3463 %! assert (class (javaObject ("java.lang.Integer", int32 (1))), "java.lang.Integer");
e56ba70108d3 Fix typos in Java conversion of 32 and 64 bit integers (bug #48107) Mike Miller <mtmiller@octave.org> parents: 21780 diff changeset	3464 %! assert (class (javaObject ("java.lang.Long", uint64 (1))), "java.lang.Long");
e56ba70108d3 Fix typos in Java conversion of 32 and 64 bit integers (bug #48107) Mike Miller <mtmiller@octave.org> parents: 21780 diff changeset	3465 %! assert (class (javaObject ("java.lang.Long", int64 (1))), "java.lang.Long");
20260 137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	3466
23681 8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3467 ## More checks of java numeric and boolean class instances
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3468 %!testif HAVE_JAVA; usejava ("jvm")
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3469 %! n = javaObject ("java.lang.Double", 1.35);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3470 %! assert (n.compareTo (1.0), 1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3471 %! assert (n.compareTo (1.35), 0);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3472 %! assert (n.compareTo (10), -1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3473 %! assert (n.isInfinite (), false);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3474
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3475 %!testif HAVE_JAVA; usejava ("jvm")
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3476 %! n = javaObject ("java.lang.Float", 1.35);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3477 %! assert (n.compareTo (1.0), 1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3478 %! assert (n.compareTo (1.35), 0);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3479 %! assert (n.compareTo (10), -1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3480 %! assert (n.doubleValue (), 1.35, 1e7);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3481
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3482 %!testif HAVE_JAVA; usejava ("jvm")
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3483 %! n = javaObject ("java.lang.Long", (int64 (1)));
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3484 %! assert (n.compareTo (int64 (0)), 1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3485 %! assert (n.compareTo (int64 (1)), 0);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3486 %! assert (n.compareTo (int64 (2)), -1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3487 %! assert (n.toString (), "1");
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3488
24671 5aa9c885ea18 Rewrite certain Java BIST tests to pass with Java 9 (bug #52627). Rik <rik@octave.org> parents: 24592 diff changeset	3489 %!testif HAVE_JAVA; usejava ("jvm") <51804>
23681 8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3490 %! n = javaObject ("java.lang.Integer", 1.35);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3491 %! assert (n.compareTo (0), 1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3492 %! assert (n.compareTo (1), 0);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3493 %! assert (n.compareTo (2), -1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3494
25305 47c803b4b8ae test: tag possible test failure with known bug #51804 Mike Miller <mtmiller@octave.org> parents: 25139 diff changeset	3495 %!testif HAVE_JAVA; usejava ("jvm") <51804>
23681 8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3496 %! n = javaObject ("java.lang.Short", 1.35);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3497 %! assert (n.compareTo (0), 1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3498 %! assert (n.compareTo (1), 0);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3499 %! assert (n.compareTo (2), -1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3500
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3501 %!testif HAVE_JAVA; usejava ("jvm")
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3502 %! n = javaObject ("java.lang.Byte", int8 (17));
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3503 %! assert (n.compareTo (int8 (20)), -3);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3504 %! assert (n.compareTo (int8 (10)), 7);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3505 %! assert (n.compareTo (int8 (17)), 0);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3506
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3507 %!testif HAVE_JAVA; usejava ("jvm")
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3508 %! b = javaObject ("java.lang.Boolean", true);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3509 %! assert (b.compareTo (true), 0);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3510 %! assert (b.compareTo (false), 1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3511 %! b = javaObject ("java.lang.Boolean", false);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3512 %! assert (b.compareTo (true), -1);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3513 %! assert (b.compareTo (false), 0);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3514
22489 93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22407 diff changeset	3515 ## Test for automatic conversion of specific numeric classes
23573 1b4f4ec53b4a use new script to tag fixed bugs in tests John W. Eaton <jwe@octave.org> parents: 23572 diff changeset	3516 %!testif HAVE_JAVA; usejava ("jvm") <*48013>
22203 2f301a30aeed Add tests for Java numeric type conversion (bug #48013) Mike Miller <mtmiller@octave.org> parents: 22202 diff changeset	3517 %! assert (javaMethod ("valueOf", "java.lang.Byte", int8 (1)), 1)
2f301a30aeed Add tests for Java numeric type conversion (bug #48013) Mike Miller <mtmiller@octave.org> parents: 22202 diff changeset	3518 %! assert (javaMethod ("valueOf", "java.lang.Short", int16 (1)), 1)
2f301a30aeed Add tests for Java numeric type conversion (bug #48013) Mike Miller <mtmiller@octave.org> parents: 22202 diff changeset	3519 %! assert (javaMethod ("valueOf", "java.lang.Integer", int32 (1)), 1)
2f301a30aeed Add tests for Java numeric type conversion (bug #48013) Mike Miller <mtmiller@octave.org> parents: 22202 diff changeset	3520 %! assert (javaMethod ("valueOf", "java.lang.Long", int64 (1)), 1)
2f301a30aeed Add tests for Java numeric type conversion (bug #48013) Mike Miller <mtmiller@octave.org> parents: 22202 diff changeset	3521 %! assert (javaMethod ("valueOf", "java.lang.Float", single (1)), 1)
2f301a30aeed Add tests for Java numeric type conversion (bug #48013) Mike Miller <mtmiller@octave.org> parents: 22202 diff changeset	3522 %! assert (javaMethod ("valueOf", "java.lang.Double", double (1)), 1)
2f301a30aeed Add tests for Java numeric type conversion (bug #48013) Mike Miller <mtmiller@octave.org> parents: 22202 diff changeset	3523 %! assert (class (javaMethod ("valueOf", "java.math.BigDecimal", double (1))), "java.math.BigDecimal")
2f301a30aeed Add tests for Java numeric type conversion (bug #48013) Mike Miller <mtmiller@octave.org> parents: 22202 diff changeset	3524 %! assert (class (javaMethod ("valueOf", "java.math.BigInteger", int64 (1))), "java.math.BigInteger")
2f301a30aeed Add tests for Java numeric type conversion (bug #48013) Mike Miller <mtmiller@octave.org> parents: 22202 diff changeset	3525
22489 93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22407 diff changeset	3526 ## Automatic conversion from string cell array into String[]
23573 1b4f4ec53b4a use new script to tag fixed bugs in tests John W. Eaton <jwe@octave.org> parents: 23572 diff changeset	3527 %!testif HAVE_JAVA; usejava ("jvm") <*45290>
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21547 diff changeset	3528 %! assert (javaMethod ("binarySearch", "java.util.Arrays", {"aaa", "bbb", "ccc", "zzz"}, "aaa"), 0);
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21547 diff changeset	3529 %! assert (javaMethod ("binarySearch", "java.util.Arrays", {"aaa", "bbb", "ccc", "zzz"}, "zzz"), 3);
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21547 diff changeset	3530 %! assert (javaMethod ("binarySearch", "java.util.Arrays", {"aaa", "bbb", "ccc", "zzz"}, "hhh") < 0);
23671 d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3531
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3532 ## Test that Octave index syntax allows Java object method calls with args
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3533 %!testif HAVE_JAVA; usejava ("jvm") <*51152>
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3534 %! s = javaObject ("java.lang.String", "Octave");
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3535 %! assert (s.length (), 6)
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3536 %! assert (s.charAt (0), "O")
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3537 %! assert (s.charAt (5), "e")
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3538 %! assert (s.matches ("^Octave$"))
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3539 %! assert (s.startsWith ("Oct"))
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3540 %! ## same tests with Java object as part of another indexing expression
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3541 %! a(1).s = s;
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3542 %! assert (! a(1).s.isEmpty ())
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3543 %! assert (a(1).s.length (), 6)
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3544 %! assert (a(1).s.charAt (0), "O")
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3545 %! assert (a(1).s.charAt (5), "e")
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3546 %! assert (a(1).s.matches ("^Octave$"))
d197f62cde8a restore Java method calls by delegating indexing properly (bug #51152) Mike Miller <mtmiller@octave.org> parents: 23592 diff changeset	3547 %! assert (a(1).s.startsWith ("Oct"))
23681 8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3548
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3549 ## Check for basic usability of the java awt library
24853 1e207bd05b5d avoid AWT test on OS X (bug #53305) John W. Eaton <jwe@octave.org> parents: 24684 diff changeset	3550 ## Skip the test on OS X where we currently have Java 9 and attempting
1e207bd05b5d avoid AWT test on OS X (bug #53305) John W. Eaton <jwe@octave.org> parents: 24684 diff changeset	3551 ## to use awt causes Octave to exit with a message about Java not being
1e207bd05b5d avoid AWT test on OS X (bug #53305) John W. Eaton <jwe@octave.org> parents: 24684 diff changeset	3552 ## installed (it is) instead of returning false.
1e207bd05b5d avoid AWT test on OS X (bug #53305) John W. Eaton <jwe@octave.org> parents: 24684 diff changeset	3553 %!testif HAVE_JAVA; ! ismac () && usejava ("jvm") && usejava ("awt") && have_window_system ()
23681 8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3554 %! frame = javaObject ("java.awt.Frame");
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3555 %! frame.setResizable (true);
8b5bc5e5f74b add unit tests creating and calling methods on some basic Java types Philip Nienhuis <prnienhuis@users.sf.net> parents: 23671 diff changeset	3556 %! assert (frame.isResizable ());
20120 2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	3557 */

Mercurial > octave

annotate libinterp/octave-value/ov-java.cc @ 28527:9e7b2625e574 stable