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

annotate libinterp/octave-value/ov-java.cc @ 22202:f094186125d3

Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) * ov-java.cc (is_auto_convertible_number): New function to test for numeric object type. (box): Use it to determine whether to return object's doubleValue. Add doxygen documentation.

author	Ernst Reissner <rei3ner@arcor.de>
date	Wed, 03 Aug 2016 10:10:59 -0700
parents	ef91e43f162a
children	2f301a30aeed

rev	line source
15746 da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	1 /*
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	2
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17281 diff changeset	3 Copyright (C) 2007, 2013 Michael Goffioul
15746 da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	4
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	5 This file is part of Octave.
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	6
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	7 Octave is free software; you can redistribute it and/or modify it
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	8 under the terms of the GNU General Public License as published by the
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	10 option) any later version.
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	11
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	15 for more details.
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	16
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	17 You should have received a copy of the GNU General Public License
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	18 along with Octave; see the file COPYING. If not, see
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	19 <http://www.gnu.org/licenses/>.
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15745 diff changeset	20
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	21 */
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21211 diff changeset	24 # include "config.h"
15736 6faa01ff2967 build: Add --disable-java option to configure (bug #37838). Rik <rik@octave.org> parents: 15625 diff changeset	25 #endif
6faa01ff2967 build: Add --disable-java option to configure (bug #37838). Rik <rik@octave.org> parents: 15625 diff changeset	26
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	27 #include "defun.h"
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	28 #include "error.h"
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	29 #include "errwarn.h"
22073 d18c63a45070 wrappers for setting long double rounding mode (bug #48319) John W. Eaton <jwe@octave.org> parents: 21979 diff changeset	30 #include "fpucw-wrappers.h"
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	31
15755 3216dafbbd48 ov-java.cc: Correcty typo HAVE_WINDWOS_H to HAVE_WINDOWS_H Rik <rik@octave.org> parents: 15754 diff changeset	32 #if defined (HAVE_WINDOWS_H)
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21042 diff changeset	33 # include <windows.h>
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	34 #endif
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	35
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include <algorithm>
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include <map>
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include <iostream>
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include <fstream>
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	40 #include <string>
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	41
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include <clocale>
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	43
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	44 #include "Cell.h"
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	45 #include "cmd-edit.h"
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	46 #include "defaults.h"
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	47 #include "file-ops.h"
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	48 #include "file-stat.h"
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	49 #include "load-path.h"
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	50 #include "oct-env.h"
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	51 #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	52 #include "ov-java.h"
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	53 #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	54 #include "variables.h"
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	55
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	56 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	57 #include <jni.h>
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	58 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	59
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	60 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	61
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	62 #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	63 #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	64
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	65 #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	66
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	67 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	68 void *args);
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	69
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	70 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	71 jsize *nVMs);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	72
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	73 template <typename T>
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	74 class java_local_ref
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	75 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	76 public:
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	77
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	78 java_local_ref (JNIEnv *_env)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	79 : jobj (0), detached (false), env (_env) { }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	80
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	81 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	82 : jobj (obj), detached (false), env (_env) { }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	83
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	84 ~java_local_ref (void) { release (); }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	85
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	86 T& operator = (T 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 release ();
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	89
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	90 jobj = obj;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	91 detached = false;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	92
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	93 return jobj;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	94 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	95
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	96 operator bool () const { return (jobj != 0); }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	97 operator T () { return jobj; }
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 void detach (void) { detached = true; }
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 private:
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	102
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	103 void release (void)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	104 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	105 if (env && jobj && ! detached)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	106 env->DeleteLocalRef (jobj);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	107
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	108 jobj = 0;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	109 }
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 java_local_ref (void)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	112 : jobj (0), detached (false), env (0)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	113 { }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	114
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	115 protected:
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	116
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	117 T jobj;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	118 bool detached;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	119 JNIEnv *env;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	120 };
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 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	123 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	124 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	125 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	126 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	127 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	128 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	129 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	130
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	131 static std::string
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	132 jstring_to_string (JNIEnv* jni_env, jstring s);
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 static std::string
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	135 jstring_to_string (JNIEnv* jni_env, jobject obj);
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 static octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	138 box (JNIEnv* jni_env, void jobj, void jcls_arg = 0);
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 static octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	141 box_more (JNIEnv* jni_env, void jobj_arg, void jcls_arg = 0);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	142
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	143 static bool
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	144 unbox (JNIEnv* jni_env, const octave_value& val, jobject_ref& jobj,
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	145 jclass_ref& jcls);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	146
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	147 static bool
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	148 unbox (JNIEnv* jni_env, const octave_value_list& args,
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	149 jobjectArray_ref& jobjs, jobjectArray_ref& jclss);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	150
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	151 extern "C"
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	152 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	153 JNIEXPORT jboolean JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	154 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	155 jobjectArray);
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	156
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	157 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	158 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	159
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	160 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	161 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	162
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	163 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	164 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	165
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	166 JNIEXPORT jboolean JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	167 Java_org_octave_Octave_needThreadedInvokation (JNIEnv *, jclass);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	168 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	169
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	170 static JavaVM *jvm = 0;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	171 static bool jvm_attached = false;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	172
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	173 // Need to keep hold of the shared library handle until exit.
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21748 diff changeset	174 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	175
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	176 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	177 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	178 static int octave_java_refcount = 0;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	179 static long octave_thread_ID = -1;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	180
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	181 bool Vjava_matrix_autoconversion = false;
d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	182 bool Vjava_unsigned_autoconversion = true;
d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	183 bool Vdebug_java = false;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	184
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	185 class JVMArgs
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	186 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	187 public:
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	188
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	189 JVMArgs (void)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	190 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	191 vm_args.version = JNI_VERSION_1_2;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	192 vm_args.nOptions = 0;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	193 vm_args.options = 0;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	194 vm_args.ignoreUnrecognized = false;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	195 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	196
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	197 ~JVMArgs (void)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	198 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	199 clean ();
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	200 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	201
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	202 JavaVMInitArgs *to_args ()
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	203 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	204 update ();
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	205 return &vm_args;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	206 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	207
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	208 void add (const std::string& opt)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	209 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	210 java_opts.push_back (opt);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	211 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	212
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	213 void read_java_opts (const std::string& filename)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	214 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	215 std::ifstream js (filename.c_str ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	216
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	217 if (! js.bad () && ! js.fail ())
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	218 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	219 std::string line;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	220
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	221 while (! js.eof () && ! js.fail ())
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	222 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	223 std::getline (js, line);
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	224
21780 3bbc8e89a24c Don't overly restrict options passed to Java jvm (bug #39063). Rik <rik@octave.org> parents: 20260 diff changeset	225 if (line.find ("-") == 0)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	226 java_opts.push_back (line);
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	227 else if (line.length () > 0 && Vdebug_java)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	228 std::cerr << "invalid JVM option, skipping: " << line << std::endl;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	229 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	230 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	231 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	232
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	233 private:
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	234
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	235 void clean (void)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	236 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	237 if (vm_args.options != 0)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	238 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	239 for (int i = 0; i < vm_args.nOptions; i++)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	240 delete [] vm_args.options[i].optionString;
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	241
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	242 delete [] vm_args.options;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	243
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	244 vm_args.options = 0;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	245 vm_args.nOptions = 0;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	246 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	247 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	248
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	249 void update (void)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	250 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	251 clean ();
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	252
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	253 if (java_opts.size () > 0)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	254 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	255 int index = 0;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	256
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	257 vm_args.nOptions = java_opts.size ();
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	258 vm_args.options = new JavaVMOption [vm_args.nOptions];
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	259
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	260 for (std::list<std::string>::const_iterator it = java_opts.begin ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	261 it != java_opts.end (); ++it)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	262 {
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	263 if (Vdebug_java)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	264 std::cout << *it << std::endl;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	265 vm_args.options[index++].optionString = strsave ((*it).c_str ());
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	266 }
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	267
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	268 java_opts.clear ();
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	269 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	270 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	271
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	272 private:
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	273
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	274 JavaVMInitArgs vm_args;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	275
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	276 std::list<std::string> java_opts;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	277 };
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	278
21979 d04da18a407a use OCTAVE_USE_WINDOWS_API more consistently John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	279 #if defined (OCTAVE_USE_WINDOWS_API)
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	280
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	281 static std::string
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	282 read_registry_string (const std::string& key, const std::string& value)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	283 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	284 HKEY hkey;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	285 DWORD len;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	286
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	287 std::string retval;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	288
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	289 if (! RegOpenKeyEx (HKEY_LOCAL_MACHINE, key.c_str (), 0, KEY_READ, &hkey))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	290 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	291 if (! RegQueryValueEx (hkey, value.c_str (), 0, 0, 0, &len))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	292 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	293 retval.resize (len);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	294 if (RegQueryValueEx (hkey, value.c_str (), 0, 0,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	295 (LPBYTE)&retval[0], &len))
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	296 retval = "";
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	297 else if (retval[len-1] == '\0')
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	298 retval.resize (--len);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	299 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	300 RegCloseKey (hkey);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	301 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	302
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	303 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	304 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	305
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	306 static std::string
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	307 get_module_filename (HMODULE hMod)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	308 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	309 int n = 1024;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	310 std::string retval (n, '\0');
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	311 bool found = false;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	312
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	313 while (n < 65536)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	314 {
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	315 int status = GetModuleFileName (hMod, &retval[0], n);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	316
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	317 if (status < n)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	318 {
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	319 retval.resize (n);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	320 found = true;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	321 break;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	322 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	323 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	324 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	325 n *= 2;
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	326 retval.resize (n);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	327 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	328 }
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	329
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	330 return (found ? retval : "");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	331 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	332
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	333 #endif
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	334
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	335 static std::string
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	336 initial_java_dir (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	337 {
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	338 static std::string java_dir;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	339
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	340 if (java_dir.empty ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	341 {
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	342 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	343
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	344 if (java_dir.empty ())
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	345 java_dir = Vfcn_file_dir + 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	346 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 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 return java_dir;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	349 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	350
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	351 // Read the content of a file filename (usually "classpath.txt")
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	352 //
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	353 // Returns a string with all lines concatenated and separated
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	354 // by the path separator character.
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	355 // The return string also starts with a path separator so that
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	356 // it can be appended easily to a base classpath.
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	357 //
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	358 // The file "classpath.txt" must contain single lines, each
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	359 // with a classpath.
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	360 // Comment lines starting with a '#' or a '%' in column 1 are allowed.
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	361
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	362 static std::string
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	363 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	364 {
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	365 std::string classpath;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	366
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	367 std::ifstream fs (filepath.c_str ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	368
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	369 if (! fs.bad () && ! fs.fail ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	370 {
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	371 std::string line;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	372
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	373 while (! fs.eof () && ! fs.fail ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	374 {
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	375 std::getline (fs, line);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	376
15798 ac9e34f83522 Allow one char paths, like '/', in javaclasspath.txt Rik <rik@octave.org> parents: 15797 diff changeset	377 if (line.length () > 0)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	378 {
15798 ac9e34f83522 Allow one char paths, like '/', in javaclasspath.txt Rik <rik@octave.org> parents: 15797 diff changeset	379 if (line[0] == '#' \|\| line[0] == '%')
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	380 ; // skip comments
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	381 else
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	382 {
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	383 // prepend separator character
21745 bf1121302404 use namespace for dir_path class John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	384 classpath.append (octave::directory_path::path_sep_str ());
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	385
15798 ac9e34f83522 Allow one char paths, like '/', in javaclasspath.txt Rik <rik@octave.org> parents: 15797 diff changeset	386 // append content of line without whitespace
ac9e34f83522 Allow one char paths, like '/', in javaclasspath.txt Rik <rik@octave.org> parents: 15797 diff changeset	387 int last = line.find_last_not_of (" \t\f\v\r\n");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	388
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	389 classpath.append (octave::sys::file_ops::tilde_expand (line.substr (0, last+1)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	390 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	391 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	392 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	393 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	394
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	395 return (classpath);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	396 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	397
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	398 static std::string
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	399 initial_class_path (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	400 {
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	401 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	402
f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	403 std::string retval = java_dir;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	404
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	405 // find octave.jar file
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	406 if (! retval.empty ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	407 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	408 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	409
f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	410 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	411
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	412 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	413
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	414 if (jar_exists)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	415 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	416 // initialize static classpath to octave.jar
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	417 retval = jar_file;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	418
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	419 // 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	420 // 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	421 // 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	422 // 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	423 // 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	424
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	425 std::string cwd = octave::sys::env::get_current_directory ();
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	426 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	427
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	428 // The filename is "javaclasspath.txt", but historically
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	429 // has been "classpath.txt" so both are supported.
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	430 std::string cp_list[] = {"javaclasspath.txt", "classpath.txt"};
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	431
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	432 for (int i=0; i<2; i++)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	433 {
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	434 std::string filename = cp_list[i];
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	435 std::string cp_file = filename;
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	436 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	437
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	438 // 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	439
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	440 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	441 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	442 {
492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	443 // 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	444 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	445 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	446 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	447
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	448 // 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	449
20422 4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	450 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	451 {
20422 4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	452 cp_file = "~" + sep + filename;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	453 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	454 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	455 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	456 {
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	457 // 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	458 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	459 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	460 }
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	461 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	462
15797 492893b98eef Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path. Rik <rik@octave.org> parents: 15792 diff changeset	463 // 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	464
20422 4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	465 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	466 {
20422 4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	467 cp_file = java_dir + sep + filename;
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	468 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	469 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	470 {
4262598620ae Don't add duplicates to javaclasspath when run in home directory (bug #45683). Rik <rik@octave.org> parents: 20274 diff changeset	471 // 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	472 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	473 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	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 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	476 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	477 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	478 else
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	479 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	480 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	481 else
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	482 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	483
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	484 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	485 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	486
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	487 static void
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	488 initialize_jvm (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	489 {
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	490 // Most of the time JVM already exists and has been initialized.
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	491 if (jvm)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	492 return;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	493
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	494 JNIEnv *current_env;
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	495 const char *static_locale = setlocale (LC_ALL, 0);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	496 const std::string locale (static_locale);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	497
21979 d04da18a407a use OCTAVE_USE_WINDOWS_API more consistently John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	498 #if defined (OCTAVE_USE_WINDOWS_API)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	499
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	500 HMODULE hMod = GetModuleHandle ("jvm.dll");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	501 std::string jvm_lib_path;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	502
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	503 if (hMod)
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	504 {
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	505 // JVM seems to be already loaded, better to use that DLL instead
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	506 // of looking in the registry, to avoid opening a different JVM.
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	507 jvm_lib_path = get_module_filename (hMod);
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	508
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	509 if (jvm_lib_path.empty ())
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	510 error ("unable to find Java Runtime Environment");
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	511 }
8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	512 else
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	513 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	514 // In windows, find the location of the JRE from the registry
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	515 // and load the symbol from the dll.
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	516 std::string key, value;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	517
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	518 key = "software\\javasoft\\java runtime environment";
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	519
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	520 value = octave::sys::env::getenv ("JAVA_VERSION");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	521 if (value.empty ())
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	522 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	523 value = "Currentversion";
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	524 std::string regval = read_registry_string (key,value);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	525
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	526 if (regval.empty ())
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	527 error ("unable to find Java Runtime Environment: %s::%s",
460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	528 key.c_str (), value.c_str ());
460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	529
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	530 value = regval;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	531 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	532
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	533 key = key + "\\" + value;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	534 value = "RuntimeLib";
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	535 jvm_lib_path = read_registry_string (key, value);
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	536
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	537 if (jvm_lib_path.empty ())
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	538 error ("unable to find Java Runtime Environment: %s::%s",
460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	539 key.c_str (), value.c_str ());
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	540 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	541
20945 9d9270e2f98f eliminate comments after preprocessor conditionals John W. Eaton <jwe@octave.org> parents: 20939 diff changeset	542 #else
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	543
15763 56239ff815a3 build: Overhaul auto-detection of Java when JAVA_HOME is not set. Rik <rik@octave.org> parents: 15755 diff changeset	544 // JAVA_LDPATH determined by configure and set in config.h
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21042 diff changeset	545 # if defined (__APPLE__)
15763 56239ff815a3 build: Overhaul auto-detection of Java when JAVA_HOME is not set. Rik <rik@octave.org> parents: 15755 diff changeset	546 std::string jvm_lib_path = JAVA_LDPATH + std::string ("/libjvm.dylib");
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21042 diff changeset	547 # else
15763 56239ff815a3 build: Overhaul auto-detection of Java when JAVA_HOME is not set. Rik <rik@octave.org> parents: 15755 diff changeset	548 std::string jvm_lib_path = JAVA_LDPATH + std::string ("/libjvm.so");
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21042 diff changeset	549 # endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	550
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	551 #endif
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	552
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	553 jsize nVMs = 0;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	554
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21042 diff changeset	555 #if ! defined (__APPLE__) && ! defined (__MACH__)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	556
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21748 diff changeset	557 octave::dynamic_library lib (jvm_lib_path);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	558
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20946 diff changeset	559 if (! lib)
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	560 error ("unable to load Java Runtime Environment from %s",
460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	561 jvm_lib_path.c_str ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	562
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	563 JNI_CreateJavaVM_t create_vm =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	564 reinterpret_cast<JNI_CreateJavaVM_t> (lib.search ("JNI_CreateJavaVM"));
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	565 JNI_GetCreatedJavaVMs_t get_vm =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	566 reinterpret_cast<JNI_GetCreatedJavaVMs_t> (lib.search ("JNI_GetCreatedJavaVMs"));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	567
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20946 diff changeset	568 if (! create_vm)
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	569 error ("unable to find JNI_CreateJavaVM 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	570
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20946 diff changeset	571 if (! get_vm)
21380 460943554233 * ov-java.cc: Call error instead of throwing std::string objects. John W. Eaton <jwe@octave.org> parents: 21379 diff changeset	572 error ("unable to find JNI_GetCreatedJavaVMs in %s", jvm_lib_path.c_str ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	573
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	574 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	575
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	576 #else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	577
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	578 // FIXME: There exists a problem on the Mac platform that
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21748 diff changeset	579 // octave::dynamic_library lib (jvm_lib_path)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	580 // doesn't work with 'not-bundled' *.oct files.
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	581
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	582 if (JNI_GetCreatedJavaVMs (&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	583
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	584 #endif
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	585
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	586 {
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	587 // At least one JVM exists, try to attach to it
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	588
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	589 switch (jvm->GetEnv (reinterpret_cast<void **> (&current_env),
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	590 JNI_VERSION_1_2))
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	591 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	592 case JNI_EDETACHED:
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	593 // Attach the current thread
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	594 JavaVMAttachArgs vm_args;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	595 vm_args.version = JNI_VERSION_1_2;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	596 vm_args.name = const_cast<char *> ("octave");
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	597 vm_args.group = 0;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	598 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	599 &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	600 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	601 break;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	602
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	603 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	604 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	605 break;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	606
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	607 case JNI_OK:
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	608 // 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	609 break;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	610 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	611
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	612 jvm_attached = true;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	613 //printf ("JVM attached\n");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	614 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	615 else
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	616 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	617 // No JVM exists, create one
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	618
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	619 JVMArgs vm_args;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	620
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	621 vm_args.add ("-Djava.class.path=" + initial_class_path ());
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	622 vm_args.add ("-Xrs");
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	623 vm_args.add ("-Djava.system.class.loader=org.octave.OctClassLoader");
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	624 vm_args.read_java_opts (initial_java_dir () + 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	625 "java.opts");
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	626
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21042 diff changeset	627 #if ! defined (__APPLE__) && ! defined (__MACH__)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	628
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	629 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	630 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	631 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	632
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	633 jvm_lib = lib;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	634
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	635 #else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	636
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	637 if (JNI_CreateJavaVM (&jvm, reinterpret_cast<void **> (&current_env),
15752 f96faf028d90 make java functions part of core octave_value classes John W. Eaton <jwe@octave.org> parents: 15747 diff changeset	638 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	639 error ("unable to start Java VM in %s", jvm_lib_path.c_str ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	640
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	641 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	642
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	643 #endif
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	644
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	645 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	646 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	647
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	648 static void
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	649 terminate_jvm (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	650 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	651 if (jvm)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	652 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	653 if (jvm_attached)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	654 jvm->DetachCurrentThread ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	655 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	656 jvm->DestroyJavaVM ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	657
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	658 jvm = 0;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	659 jvm_attached = false;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	660
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	661 if (jvm_lib)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	662 jvm_lib.close ();
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	663
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	664 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	665 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	666 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	667
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	668 static std::string
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	669 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	670 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	671 std::string retval;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	672
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	673 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	674 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	675 const char *cstr = jni_env->GetStringUTFChars (s, 0);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	676 retval = cstr;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	677 jni_env->ReleaseStringUTFChars (s, cstr);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	678 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	679
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	680 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	681 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	682
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	683 static std::string
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	684 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	685 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	686 std::string retval;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	687
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	688 if (jni_env && obj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	689 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	690 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	691 if (cls)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	692 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	693 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	694 retval = jstring_to_string (jni_env,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	695 reinterpret_cast<jstring> (obj));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	696 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	697 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	698
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	699 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	700 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	701
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	702 static inline JNIEnv *
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	703 thread_jni_env (void)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	704 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	705 JNIEnv *env = 0;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	706
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	707 if (jvm)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	708 jvm->GetEnv (reinterpret_cast<void **> (&env), JNI_VERSION_1_2);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	709
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	710 return env;
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	711 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	712
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	713 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	714
15824 abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	715 bool
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	716 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	717 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	718 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	719
15824 abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	720 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	721
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	722 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	723 {
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	724 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	725 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	726 }
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	727
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	728 return false;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	729
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	730 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	731
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	732 // 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	733 // 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	734
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	735 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	736
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	737 #endif
15824 abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	738 }
abc9e5f3c661 Return correct value for ischar() predicate test on octave_java objects. Rik <rik@octave.org> parents: 15822 diff changeset	739
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	740 bool
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	741 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	742 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	743 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	744
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	745 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	746
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	747 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	748 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	749
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	750 if (current_env && java_object)
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	751 {
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	752 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	753 if (current_env->ExceptionCheck ())
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	754 current_env->ExceptionClear ();
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	755 else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	756 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	757 }
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	758 return false;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	759
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	760 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	761
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	762 octave_unused_parameter (cls_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	763
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	764 // 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	765 // 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	766
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	767 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	768
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	769 #endif
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	770 }
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19861 diff changeset	771
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	772 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	773
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	774 static octave_value
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	775 check_exception (JNIEnv *jni_env)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	776 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	777 octave_value retval;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	778
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	779 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	780
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	781 if (ex)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	782 {
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	783 if (Vdebug_java)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	784 jni_env->ExceptionDescribe ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	785
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	786 jni_env->ExceptionClear ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	787
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	788 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	789 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	790 "()Ljava/lang/String;");
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	791 jstring_ref js (jni_env,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	792 reinterpret_cast<jstring> (jni_env->CallObjectMethod (ex, mID)));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	793 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	794
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	795 error ("[java] %s", msg.c_str ());
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	796 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	797 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	798 retval = Matrix ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	799
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	800 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	801 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	802
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	803 static jclass
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	804 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	805 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	806 static std::string class_loader;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	807 static jclass uiClass = 0;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	808
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	809 jclass jcls = jni_env->FindClass (name);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	810
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	811 if (jcls == 0)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	812 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	813 jni_env->ExceptionClear ();
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 if (! uiClass)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	816 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	817 if (class_loader.empty ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	818 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	819 jclass_ref syscls (jni_env,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	820 jni_env->FindClass ("java/lang/System"));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	821 jmethodID mID = jni_env->GetStaticMethodID (syscls, "getProperty", "(Ljava/lang/String;)Ljava/lang/String;");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	822 jstring_ref js (jni_env, jni_env->NewStringUTF ("octave.class.loader"));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	823 js = reinterpret_cast<jstring> (jni_env->CallStaticObjectMethod (syscls, mID, jstring (js)));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	824 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	825 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	826 '.', '/');
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	827 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	828
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	829 jclass_ref uicls (jni_env, jni_env->FindClass (class_loader.c_str ()));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	830
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	831 if (! uicls)
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 jni_env->ExceptionClear ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	834
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20945 diff changeset	835 // Try the netbeans way
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	836 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	837 '/', '.');
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	838 jclass_ref jcls2 (jni_env, jni_env->FindClass ("org/openide/util/Lookup"));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	839 jmethodID mID = jni_env->GetStaticMethodID (jcls2, "getDefault", "()Lorg/openide/util/Lookup;");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	840 jobject_ref lObj (jni_env, jni_env->CallStaticObjectMethod (jcls2, mID));
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	841 mID = jni_env->GetMethodID (jcls2, "lookup",
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19598 diff changeset	842 "(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	843 jclass_ref cLoaderCls (jni_env, jni_env->FindClass ("java/lang/ClassLoader"));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	844 jobject_ref cLoader (jni_env, jni_env->CallObjectMethod (lObj, mID, jclass (cLoaderCls)));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	845 mID = jni_env->GetMethodID (cLoaderCls, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	846 jstring_ref js (jni_env, jni_env->NewStringUTF (class_loader.c_str ()));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	847 uicls = reinterpret_cast<jclass> (jni_env->CallObjectMethod (cLoader, mID, jstring (js)));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	848 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	849
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	850 if (uicls)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	851 uiClass = reinterpret_cast<jclass> (jni_env->NewGlobalRef (jclass (uicls)));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	852 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	853
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	854 if (uiClass)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	855 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	856 jmethodID mID = jni_env->GetStaticMethodID (uiClass, "findClass", "(Ljava/lang/String;)Ljava/lang/Class;");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	857 jstring_ref js (jni_env, jni_env->NewStringUTF (name));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	858 jcls = reinterpret_cast<jclass> (jni_env->CallStaticObjectMethod (uiClass, mID, jstring (js)));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	859 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	860 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	861
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	862 return jcls;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	863 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	864
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	865 static dim_vector
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	866 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	867 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	868 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	869 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	870 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	871 jmethodID isArray_ID = jni_env->GetMethodID (ccls, "isArray", "()Z");
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	872 jmethodID getComponentType_ID = jni_env->GetMethodID (ccls, "getComponentType", "()Ljava/lang/Class;");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	873
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	874 dim_vector dv (1, 1);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	875 int idx = 0;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	876
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	877 jobj.detach ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	878 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	879 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	880 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	881 if (idx >= dv.ndims ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	882 dv.resize (idx+1);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	883 dv(idx) = len;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	884 jcls = reinterpret_cast<jclass> (jni_env->CallObjectMethod (jcls, getComponentType_ID));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	885 jobj = (len > 0 ? reinterpret_cast<jobjectArray> (jni_env->GetObjectArrayElement (jobj, 0)) : 0);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	886 idx++;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	887 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	888
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	889 octave_set_default_fpucw ();
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	890
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	891 return dv;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	892 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	893
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	894 static jobject
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	895 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	896 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	897 jclass_ref ocls (jni_env, jni_env->FindClass ("[I"));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	898 jobjectArray retval = jni_env->NewObjectArray (idx.length (), ocls, 0);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	899
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	900 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	901 try
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	902 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	903 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	904
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	905 jintArray_ref i_array (jni_env, jni_env->NewIntArray (v.length ()));
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	906 jint *buf = jni_env->GetIntArrayElements (i_array, 0);
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	907
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	908 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	909 buf[k] = v(k);
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	910
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	911 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	912 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	913
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	914 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	915 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	916 catch (index_exception& e)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	917 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	918 // Rethrow to allow more info to be reported later.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	919 e.set_pos_if_unset (idx.length (), i+1);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	920 throw;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20531 diff changeset	921 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	922
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	923 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	924 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	925
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	926 static octave_value
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	927 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	928 const octave_value_list& idx)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	929 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	930 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	931 jobject_ref resObj (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	932 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	933
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	934 jclass_ref helperClass (jni_env, find_octave_class (jni_env, "org/octave/ClassHelper"));
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	935 jmethodID mID = jni_env->GetStaticMethodID (helperClass, "arraySubsref", "(Ljava/lang/Object;[[I)Ljava/lang/Object;");
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	936 resObj = jni_env->CallStaticObjectMethod (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	937
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	938 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	939 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	940 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	941 retval = check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	942
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	943 octave_set_default_fpucw ();
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	944
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	945 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	946 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	947
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	948 static octave_value
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	949 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	950 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	951 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	952 octave_value retval;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	953
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	954 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	955 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	956 jobject_ref rhsObj (jni_env);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	957 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	958
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	959 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	960 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	961 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	962 jmethodID mID = jni_env->GetStaticMethodID (helperClass, "arraySubsasgn",
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	963 "(Ljava/lang/Object;[[ILjava/lang/Object;)Ljava/lang/Object;");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	964 resObj = jni_env->CallStaticObjectMethod (helperClass, mID,
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	965 jobj, jobject (java_idx), jobject (rhsObj));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	966 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	967
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	968 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	969 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	970 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	971 retval = check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	972
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	973 octave_set_default_fpucw ();
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	974
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	975 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	976 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	977
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	978 static string_vector
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	979 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	980 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	981 jobject jobj = TO_JOBJECT (jobj_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	982
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	983 std::list<std::string> name_list;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	984
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	985 if (jni_env)
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	986 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	987 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	988 jclass_ref ccls (jni_env, jni_env->GetObjectClass (cls));
15859 0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	989 jmethodID getMethods_ID = jni_env->GetMethodID (ccls, "getMethods", "()[Ljava/lang/reflect/Method;");
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	990 jmethodID getFields_ID = jni_env->GetMethodID (ccls, "getFields", "()[Ljava/lang/reflect/Field;");
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	991 jobjectArray_ref mList (jni_env, reinterpret_cast<jobjectArray> (jni_env->CallObjectMethod (cls, getMethods_ID)));
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	992 jobjectArray_ref fList (jni_env, reinterpret_cast<jobjectArray> (jni_env->CallObjectMethod (cls, getFields_ID)));
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	993 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	994 int fLen = jni_env->GetArrayLength (fList);
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	995 jclass_ref mCls (jni_env, jni_env->FindClass ("java/lang/reflect/Method"));
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	996 jclass_ref fCls (jni_env, jni_env->FindClass ("java/lang/reflect/Field"));
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	997 jmethodID m_getName_ID = jni_env->GetMethodID (mCls, "getName", "()Ljava/lang/String;");
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	998 jmethodID f_getName_ID = jni_env->GetMethodID (fCls, "getName", "()Ljava/lang/String;");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	999
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1000 for (int i = 0; i < mLen; i++)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1001 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1002 jobject_ref meth (jni_env, jni_env->GetObjectArrayElement (mList, i));
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1003 jstring_ref methName (jni_env, reinterpret_cast<jstring> (jni_env->CallObjectMethod (meth, m_getName_ID)));
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1004 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	1005 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1006
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1007 for (int i = 0; i < fLen; i++)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1008 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1009 jobject_ref field (jni_env, jni_env->GetObjectArrayElement (fList, i));
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1010 jstring_ref fieldName (jni_env, reinterpret_cast<jstring> (jni_env->CallObjectMethod (field, f_getName_ID)));
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1011 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	1012 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1013
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1014 octave_set_default_fpucw ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1015 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1016
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1017 string_vector v (name_list);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1018
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1019 return v.sort (true);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1020 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1021
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1022 static octave_value
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1023 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	1024 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1025 octave_value retval;
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 if (jni_env && java_object)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1028 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1029 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	1030
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1031 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	1032 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	1033 else if (force)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1034 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1035 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	1036
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1037 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	1038 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1039 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	1040 int len = jni_env->GetArrayLength (array);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1041 Cell c (len, 1);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1042
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1043 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	1044 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1045 jstring_ref js (jni_env, reinterpret_cast<jstring> (jni_env->GetObjectArrayElement (array, i)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1046
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1047 if (js)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1048 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	1049 else
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1050 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	1051 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1052
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1053 retval = octave_value (c);
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 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1056 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1057 cls = jni_env->FindClass ("java/lang/Object");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1058 jmethodID mID = jni_env->GetMethodID (cls, "toString", "()Ljava/lang/String;");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1059 jstring_ref js (jni_env, reinterpret_cast<jstring> (jni_env->CallObjectMethod (java_object, mID)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1060
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1061 if (js)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1062 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	1063 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1064 retval = check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1065 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1066 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1067 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1068 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	1069
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1070 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1071 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1072
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1073 return retval;
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 #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	1077
22202 f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1078 //! 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	1079 //! 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	1080 //!
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1081 //! 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	1082 //! @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	1083 //! 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	1084 //!
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1085 //! @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	1086 //! @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	1087 //! 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	1088 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	1089 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	1090 {
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1091 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	1092 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	1093 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	1094 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	1095 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	1096 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	1097 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	1098 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	1099 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	1100 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	1101 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	1102 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	1103 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	1104 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	1105 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	1106 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	1107 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	1108 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	1109 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	1110
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1111 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	1112 }
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1113
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1114 //! 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	1115 //! 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	1116 //!
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1117 //! @param jni_env JNI environment pointer
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1118 //! @param jobj_arg pointer to a Java object
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1119 //! @param jcls_arg optional pointer to the Java class of @c jobj_arg
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1120 //! @return
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1121 //! @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	1122 //! @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	1123 //! @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	1124 //! @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	1125 //! @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	1126 //! 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	1127 //! @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	1128 //! #Vjava_matrix_autoconversion is enabled
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1129 //! @arg Octave object if @c jobj_arg is of type @c org.octave.OctaveReference
f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1130 //! @arg @c octave_java object wrapping the Java object otherwise
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1131 static octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1132 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	1133 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1134 octave_value retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1135
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1136 jobject jobj = TO_JOBJECT (jobj_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1137 jclass jcls = TO_JCLASS (jcls_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1138
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1139 jclass_ref cls (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1140
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1141 if (! jobj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1142 retval = Matrix ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1143
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	1144 while (retval.is_undefined ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1145 {
22202 f094186125d3 Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013) Ernst Reissner <rei3ner@arcor.de> parents: 22146 diff changeset	1146 // 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	1147 // (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	1148 // 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	1149 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	1150 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	1151 && 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	1152 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1153 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	1154 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	1155 break;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1156 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1157
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1158 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	1159 if (jni_env->IsInstanceOf (jobj, cls))
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 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	1162 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	1163 break;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1164 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1165
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1166 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	1167 if (jni_env->IsInstanceOf (jobj, cls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1168 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1169 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	1170 break;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1171 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1172
15815 f28b3dcbaa9a Add autoconversion between java.lang.Character class and Octave string class. Rik <rik@octave.org> parents: 15813 diff changeset	1173 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	1174 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	1175 {
f28b3dcbaa9a Add autoconversion between java.lang.Character class and Octave string class. Rik <rik@octave.org> parents: 15813 diff changeset	1176 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	1177 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	1178 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	1179 break;
15815 f28b3dcbaa9a Add autoconversion between java.lang.Character class and Octave string class. Rik <rik@octave.org> parents: 15813 diff changeset	1180 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1181
20120 2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1182 #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	1183 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	1184 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	1185 { \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1186 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	1187 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	1188 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	1189 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	1190 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	1191 retval = d; \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1192 break; \
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1193 }
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1194
20254 a51fe1b60e3f Put most used conversions first in Java box/unbox routines. Rik <rik@octave.org> parents: 20253 diff changeset	1195 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	1196 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	1197 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	1198 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	1199 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	1200 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	1201 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	1202 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	1203
2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	1204 #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	1205
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	1206 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	1207 {
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1208 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	1209
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	1210 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	1211 {
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	1212 jmethodID mID = jni_env->GetMethodID (cls, "getDims", "()[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	1213 jintArray_ref iv (jni_env, reinterpret_cast<jintArray> (jni_env->CallObjectMethod (jobj, mID)));
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1214 jint *iv_data = jni_env->GetIntArrayElements (jintArray (iv), 0);
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1215 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	1216 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	1217
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21580 diff changeset	1218 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	1219 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	1220
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1221 jni_env->ReleaseIntArrayElements (jintArray (iv), iv_data, 0);
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1222 mID = jni_env->GetMethodID (cls, "getClassName", "()Ljava/lang/String;");
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1223 jstring_ref js (jni_env, reinterpret_cast<jstring> (jni_env->CallObjectMethod (jobj, mID)));
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1224
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1225 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	1226
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1227 if (s == "double")
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1228 {
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	1229 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	1230 mID = jni_env->GetMethodID (cls, "toDouble", "()[D");
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1231 jdoubleArray_ref dv (jni_env, reinterpret_cast<jdoubleArray> (jni_env->CallObjectMethod (jobj, mID)));
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1232 jni_env->GetDoubleArrayRegion (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	1233 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	1234 break;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1235 }
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	1236 else if (s == "byte")
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1237 {
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	1238 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	1239 {
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1240 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	1241 mID = jni_env->GetMethodID (cls, "toByte", "()[B");
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1242 jbyteArray_ref dv (jni_env, reinterpret_cast<jbyteArray> (jni_env->CallObjectMethod (jobj, mID)));
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1243 jni_env->GetByteArrayRegion (dv, 0, m.numel (), reinterpret_cast<jbyte *> (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	1244 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	1245 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	1246 }
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1247 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	1248 {
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1249 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	1250 mID = jni_env->GetMethodID (cls, "toByte", "()[B");
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1251 jbyteArray_ref dv (jni_env, reinterpret_cast<jbyteArray> (jni_env->CallObjectMethod (jobj, mID)));
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1252 jni_env->GetByteArrayRegion (dv, 0, m.numel (), reinterpret_cast<jbyte *> (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	1253 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	1254 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	1255 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1256 }
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	1257 else if (s == "integer")
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1258 {
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	1259 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	1260 {
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1261 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	1262 mID = jni_env->GetMethodID (cls, "toInt", "()[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	1263 jintArray_ref dv (jni_env, reinterpret_cast<jintArray> (jni_env->CallObjectMethod (jobj, mID)));
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1264 jni_env->GetIntArrayRegion (dv, 0, m.numel (), reinterpret_cast<jint *> (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	1265 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	1266 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	1267 }
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1268 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	1269 {
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1270 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	1271 mID = jni_env->GetMethodID (cls, "toInt", "()[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	1272 jintArray_ref dv (jni_env, reinterpret_cast<jintArray> (jni_env->CallObjectMethod (jobj, mID)));
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	1273 jni_env->GetIntArrayRegion (dv, 0, m.numel (), reinterpret_cast<jint *> (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	1274 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	1275 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	1276 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1277 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1278 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1279 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1280
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	1281 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	1282 if (jni_env->IsInstanceOf (jobj, cls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1283 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1284 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	1285 int ID = jni_env->CallIntMethod (jobj, mID);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1286 std::map<int,octave_value>::iterator it = octave_ref_map.find (ID);
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 if (it != octave_ref_map.end ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1289 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	1290
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1291 break;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1292 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1293
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	1294 // No suitable class found. Return a generic octave_java object
72661fe4b9e5 Short-circuit out of Java box code as soon as valid class has been found. Rik <rik@octave.org> parents: 15820 diff changeset	1295 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	1296 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	1297 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1298
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1299 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1300 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1301
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1302 static octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1303 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	1304 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1305 jobject jobj = TO_JOBJECT (jobj_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1306 jclass jcls = TO_JCLASS (jcls_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1307
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1308 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	1309
15813 10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	1310 if (retval.is_java ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1311 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1312 retval = octave_value ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1313
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1314 jclass_ref cls (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1315
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1316 if (retval.is_undefined ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1317 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1318 cls = jni_env->FindClass ("[D");
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1319
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1320 if (jni_env->IsInstanceOf (jobj, cls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1321 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1322 jdoubleArray jarr = reinterpret_cast<jdoubleArray> (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1323 int len = jni_env->GetArrayLength (jarr);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1324
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1325 if (len > 0)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1326 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1327 Matrix m (1, len);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1328 jni_env->GetDoubleArrayRegion (jarr, 0, len, m.fortran_vec ());
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1329 retval = m;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1330 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1331 else
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1332 retval = Matrix ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1333 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1334 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1335
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1336 if (retval.is_undefined ())
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1337 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1338 cls = jni_env->FindClass ("[[D");
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1339
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1340 if (jni_env->IsInstanceOf (jobj, cls))
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1341 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1342 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	1343 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	1344 int cols = 0;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1345
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1346 if (rows > 0)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1347 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1348 Matrix m;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1349
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1350 for (int r = 0; r < rows; r++)
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1351 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1352 jdoubleArray_ref row (jni_env,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1353 reinterpret_cast<jdoubleArray> (jni_env->GetObjectArrayElement (jarr, r)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1354
20974 1edf15793cac maint: Use is_empty rather than "numel () == 0" for clarity. Rik <rik@octave.org> parents: 20957 diff changeset	1355 if (m.is_empty ())
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1356 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1357 cols = jni_env->GetArrayLength (row);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1358 m.resize (cols, rows);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1359 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1360 jni_env->GetDoubleArrayRegion (row, 0, cols, m.fortran_vec () + r * cols);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1361 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1362 retval = m.transpose ();
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1363 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1364 else
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1365 retval = Matrix ();
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1366 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1367 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1368
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1369 if (retval.is_undefined ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1370 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1371 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	1372
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1373 if (jni_env->IsInstanceOf (jobj, cls))
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1374 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1375 jobjectArray jarr = reinterpret_cast<jobjectArray> (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1376 int len = jni_env->GetArrayLength (jarr);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1377 Cell m (len, 1);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1378
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1379 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	1380 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1381 jstring_ref js (jni_env,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1382 reinterpret_cast<jstring> (jni_env->GetObjectArrayElement (jarr, i)));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1383 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	1384 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1385
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1386 retval = m;
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 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1389 }
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 if (retval.is_undefined ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1392 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	1393
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1394 octave_set_default_fpucw ();
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1395
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1396 return retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1397 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1398
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1399 static bool
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1400 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	1401 jclass_ref& jcls)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1402 {
20121 41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	1403 bool found = true;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1404
15813 10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	1405 if (val.is_java ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1406 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1407 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	1408 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	1409 jobj.detach ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1410 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1411 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1412 else if (val.is_string ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1413 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1414 std::string s = val.string_value ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1415
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1416 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	1417 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1418 }
20260 137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1419 else if (val.is_cellstr ())
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1420 {
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1421 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	1422 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	1423
20260 137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1424 jclass_ref scls (jni_env, jni_env->FindClass ("java/lang/String"));
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1425 jobjectArray array = jni_env->NewObjectArray (n, scls, NULL);
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1426
20260 137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1427 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	1428 {
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1429 jstring_ref jstr (jni_env, jni_env->NewStringUTF (str_arr(i).c_str ()));
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1430 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	1431 }
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1432
20260 137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1433 jobj = array;
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	1434 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	1435 }
20122 81fcf4aa9e03 Automatically convert octave vectors into java primitive arrays (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20121 diff changeset	1436 else if (val.numel () > 1 && val.dims ().is_vector ())
81fcf4aa9e03 Automatically convert octave vectors into java primitive arrays (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20121 diff changeset	1437 {
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1438 // 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	1439 // using a macro?
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1440
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1441 #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	1442 do \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1443 { \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1444 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	1445 JAVA_T ## Array jarr = jni_env->New ## JAVA_T_CAP ## Array (v.numel ()); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1446 const JAVA_T jv = reinterpret_cast<const JAVA_T> (v.data ()); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1447 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	1448 jobj = reinterpret_cast<jobject> (jarr); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1449 jcls = jni_env->GetObjectClass (jobj); \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1450 } \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1451 while (0)
20122 81fcf4aa9e03 Automatically convert octave vectors into java primitive arrays (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20121 diff changeset	1452
81fcf4aa9e03 Automatically convert octave vectors into java primitive arrays (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20121 diff changeset	1453 // 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	1454 // 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	1455
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1456 if (val.is_double_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1457 UNBOX_PRIMITIVE_ARRAY ( , , jdouble, Double);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1458 else if (val.is_bool_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1459 UNBOX_PRIMITIVE_ARRAY (bool_, bool, jboolean, Boolean);
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1460 else if (val.is_float_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1461 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	1462 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	1463 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	1464 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	1465 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	1466 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	1467 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	1468 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	1469 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	1470 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	1471 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	1472 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	1473 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	1474 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	1475 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	1476 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	1477 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	1478
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1479 #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	1480 }
20123 8261c4a11250 Convert octave integer scalars into closest java type (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20122 diff changeset	1481 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	1482 {
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1483 // 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	1484 // using a macro?
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1485
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1486 #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	1487 do \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1488 { \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1489 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	1490 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	1491 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	1492 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	1493 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	1494 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	1495 } \
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1496 while (0)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1497
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1498 if (val.is_double_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1499 UNBOX_PRIMITIVE_SCALAR (double, double, "java/lang/Double", "(D)V");
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1500 else if (val.is_bool_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1501 UNBOX_PRIMITIVE_SCALAR (bool, bool, "java/lang/Boolean", "(Z)V");
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1502 else if (val.is_float_type ())
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1503 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	1504 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	1505 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	1506 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	1507 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	1508 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	1509 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	1510 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	1511 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	1512 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	1513 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	1514 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	1515 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	1516 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	1517 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	1518 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	1519 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	1520
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1521 #undef UNBOX_PRIMITIVE_SCALAR
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1522 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1523 else if (val.is_empty ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1524 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1525 jobj = 0;
15822 e7d9db9531d1 Add conversion for Octave integer and single classes to Java int and float classes. Rik <rik@octave.org> parents: 15821 diff changeset	1526 jcls = 0;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1527 //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	1528 }
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20946 diff changeset	1529 else if (! Vjava_matrix_autoconversion
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1530 && ((val.is_real_matrix ()
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1531 && (val.rows () == 1 \|\| val.columns () == 1))
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1532 \|\| val.is_range ()))
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1533 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1534 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	1535 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	1536 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	1537 jobj = dv;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1538 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1539 }
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	1540 else if (Vjava_matrix_autoconversion
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1541 && (val.is_matrix_type () \|\| val.is_range ()) && val.is_real_type ())
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1542 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	1543 jclass_ref mcls (jni_env, find_octave_class (jni_env, "org/octave/Matrix"));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1544 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	1545 jintArray_ref iv (jni_env, jni_env->NewIntArray (dims.ndims ()));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1546 jint *iv_data = jni_env->GetIntArrayElements (jintArray (iv), 0);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1547
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21580 diff changeset	1548 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	1549 iv_data[i] = dims(i);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1550
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1551 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	1552
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1553 if (val.is_double_type ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1554 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1555 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	1556 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	1557 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	1558 m.fortran_vec ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1559 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	1560 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	1561 jintArray (iv));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1562 jcls = jni_env->GetObjectClass (jobj);
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 else if (val.is_int8_type ())
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 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	1567 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	1568 jni_env->SetByteArrayRegion (jbyteArray (bv), 0, m.numel (),
21661 1b9a36a66b01 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21660 diff changeset	1569 reinterpret_cast<jbyte *> (m.fortran_vec ()));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1570 jmethodID mID = jni_env->GetMethodID (mcls, "<init>", "([B[I)V");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1571 jobj = jni_env->NewObject (jclass (mcls), mID, jbyteArray (bv), jintArray (iv));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1572 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1573 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1574 else if (val.is_uint8_type ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1575 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1576 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	1577 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	1578 jni_env->SetByteArrayRegion (jbyteArray (bv), 0, m.numel (),
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1579 reinterpret_cast<jbyte *> (m.fortran_vec ()));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1580 jmethodID mID = jni_env->GetMethodID (mcls, "<init>", "([B[I)V");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1581 jobj = jni_env->NewObject (jclass (mcls), mID, jbyteArray (bv), jintArray (iv));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1582 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1583 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1584 else if (val.is_int32_type ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1585 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1586 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	1587 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	1588 jni_env->SetIntArrayRegion (jintArray (v), 0, m.numel (),
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1589 reinterpret_cast<jint *> (m.fortran_vec ()));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1590 jmethodID mID = jni_env->GetMethodID (mcls, "<init>", "([I[I)V");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1591 jobj = jni_env->NewObject (jclass (mcls), mID, jintArray (v), jintArray (iv));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1592 jcls = jni_env->GetObjectClass (jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1593 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1594 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1595 {
20121 41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	1596 found = false;
16766 7268845c0a1e avoid backquote in error messages, some uses in doc strings John W. Eaton <jwe@octave.org> parents: 16295 diff changeset	1597 error ("cannot convert matrix of type '%s'", val.class_name ().c_str ());
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1598 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1599 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1600 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1601 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	1602 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	1603 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	1604 int ID = octave_java_refcount++;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1605
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1606 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	1607 jcls = rcls;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1608 octave_ref_map[ID] = val;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1609 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1610
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1611 return found;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1612 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1613
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1614 static bool
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	1615 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	1616 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	1617 {
20121 41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	1618 bool found = true;
15745 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 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	1621 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	1622
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1623 if (! jobjs)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1624 jobjs = jni_env->NewObjectArray (args.length (), ocls, 0);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1625
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1626 if (! jclss)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1627 jclss = jni_env->NewObjectArray (args.length (), ccls, 0);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1628
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1629 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	1630 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1631 jobject_ref jobj (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1632 jclass_ref jcls (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1633
20121 41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	1634 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	1635 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	1636 break;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1637
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1638 jni_env->SetObjectArrayElement (jobjs, i, jobj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1639 jni_env->SetObjectArrayElement (jclss, i, jcls);
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 return found;
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
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1645 static long
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1646 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	1647 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1648 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1649 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1650 jclass_ref cls (jni_env, jni_env->FindClass ("java/lang/Thread"));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1651 jmethodID mID = jni_env->GetStaticMethodID (cls, "currentThread", "()Ljava/lang/Thread;");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1652 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	1653
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1654 if (jthread)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1655 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1656 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	1657 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	1658 long result = jni_env->CallLongMethod (jthread, mID);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1659 //printf ("current java thread ID = %ld\n", result);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1660 return result;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1661 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1662 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1663
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1664 return -1;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1665 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1666
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1667 static int
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1668 java_event_hook (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1669 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1670 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	1671
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1672 if (current_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1673 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	1674 jclass_ref cls (current_env, find_octave_class (current_env, "org/octave/Octave"));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1675 jmethodID mID = current_env->GetStaticMethodID (cls, "checkPendingAction", "()V");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1676 current_env->CallStaticVoidMethod (cls, mID);
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1677
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1678 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1679 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1680
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1681 return 0;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1682 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1683
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1684 static void
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1685 initialize_java (void)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1686 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1687 if (! jvm)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1688 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1689 try
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1690 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1691 initialize_jvm ();
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1692
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1693 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	1694
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21745 diff changeset	1695 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	1696
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1697 octave_thread_ID = get_current_thread_ID (current_env);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1698 //printf ("octave thread ID=%ld\n", octave_thread_ID);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1699 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1700 catch (std::string msg)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1701 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1702 error (msg.c_str ());
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1703 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	1704
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	1705 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1706 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1707 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1708
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1709 JNIEXPORT jboolean JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1710 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	1711 jobjectArray argin, jobjectArray argout)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1712 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1713 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	1714
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1715 int nargout = env->GetArrayLength (argout);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1716 int nargin = env->GetArrayLength (argin);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1717
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1718 octave_value_list varargin, varargout;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1719
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1720 for (int i = 0; i < nargin; i++)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1721 varargin(i) = box (env, env->GetObjectArrayElement (argin, i), 0);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1722
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1723 varargout = feval (fname, varargin, nargout);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1724
20121 41064c150724 Return bools instead of ints in oc-java box and unbox internal functions. Carnë Draug <carandraug@octave.org> parents: 20120 diff changeset	1725 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	1726 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	1727 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	1728 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1729
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1730 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1731 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	1732 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1733 octave_ref_map.erase (ID);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1734 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1735
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1736 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1737 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	1738 jobjectArray args)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1739 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1740 std::map<int,octave_value>::iterator it = octave_ref_map.find (ID);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1741
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1742 if (it != octave_ref_map.end ())
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1743 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1744 octave_value val = it->second;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1745 int len = env->GetArrayLength (args);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1746 octave_value_list oct_args;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1747
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1748 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	1749 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1750 jobject_ref jobj (env, env->GetObjectArrayElement (args, i));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1751 oct_args(i) = box (env, jobj, 0);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1752 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1753
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1754 BEGIN_INTERRUPT_WITH_EXCEPTIONS;
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1755
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1756 if (val.is_function_handle ())
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1757 {
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1758 octave_function *fcn = val.function_value ();
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1759 feval (fcn, oct_args);
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1760 }
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1761 else if (val.is_cell () && val.length () > 0
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1762 && (val.rows () == 1 \|\| val.columns () == 1)
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1763 && 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	1764 {
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1765 Cell c = val.cell_value ();
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1766 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	1767
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1768 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	1769 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	1770
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1771 feval (fcn, oct_args);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1772 }
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1773 else
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1774 error ("trying to invoke non-invocable object");
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1775
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1776 END_INTERRUPT_WITH_EXCEPTIONS;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1777 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1778 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1779
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1780 JNIEXPORT void JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1781 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	1782 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1783 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	1784 int pstatus;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1785 eval_string (s, false, pstatus, 0);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1786 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1787
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1788 JNIEXPORT jboolean JNICALL
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1789 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	1790 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1791 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	1792 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1793
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1794 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1795
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1796 // octave_java class definition
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1797
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1798 octave_java::octave_java (void)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1799 : octave_base_value (), java_object (0), java_class (0)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1800 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1801 #if ! defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1802
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1803 err_disabled_feature ("Java Objects", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1804
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1805 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1806 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1807
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1808 octave_java::octave_java (const voidptr& jobj, void *jcls)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1809 : octave_base_value (), java_object (0), java_class (0)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1810 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1811 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1812
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1813 init (jobj, jcls);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1814
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1815 #else
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1816
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	1817 octave_unused_parameter (jobj);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	1818 octave_unused_parameter (jcls);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	1819
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1820 err_disabled_feature ("Java Objects", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1821
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1822 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1823 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1824
15813 10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	1825 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	1826
10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	1827 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	1828
10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	1829 void
10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	1830 octave_java::register_type (void)
10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	1831 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1832 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1833
15813 10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	1834 t_id = octave_value_typeinfo::register_type
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1835 (octave_java::t_name, "<unknown>", octave_value (new octave_java ()));
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1836
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1837 #endif
15813 10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15806 diff changeset	1838 }
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1839
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1840 dim_vector
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1841 octave_java::dims (void) const
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1842 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1843 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1844
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1845 JNIEnv *current_env = thread_jni_env ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1846
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1847 if (current_env && java_object)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1848 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	1849 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1850 return dim_vector (1, 1);
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1851
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1852 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	1853
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1854 // 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	1855 // 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	1856
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1857 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	1858
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1859 #endif
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
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1862 octave_value_list
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1863 octave_java::subsref (const std::string& type,
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1864 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	1865 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1866 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1867
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1868 octave_value_list retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1869 int skip = 1;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1870
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1871 JNIEnv *current_env = thread_jni_env ();
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 switch (type[0])
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1874 {
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1875 case '.':
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1876 if (type.length () > 1 && type[1] == '(')
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1877 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1878 octave_value_list ovl;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1879 count++;
15790 921912c92102 Deprecate java_invoke, replace with javaMethod. Rik <rik@octave.org> parents: 15771 diff changeset	1880 ovl(1) = octave_value (this);
921912c92102 Deprecate java_invoke, replace with javaMethod. Rik <rik@octave.org> parents: 15771 diff changeset	1881 ovl(0) = (idx.front ())(0);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1882 std::list<octave_value_list>::const_iterator it = idx.begin ();
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1883 ovl.append (*++it);
15790 921912c92102 Deprecate java_invoke, replace with javaMethod. Rik <rik@octave.org> parents: 15771 diff changeset	1884 retval = feval (std::string ("javaMethod"), ovl, 1);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1885 skip++;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1886 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1887 else
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1888 {
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1889 octave_value_list ovl;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1890 count++;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1891 ovl(0) = octave_value (this);
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1892 ovl(1) = (idx.front ())(0);
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	1893 retval = feval (std::string ("__java_get__"), ovl, 1);
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1894 }
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1895 break;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1896
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1897 case '(':
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1898 if (current_env)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1899 retval = get_array_elements (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	1900 break;
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1901
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1902 default:
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1903 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	1904 break;
15625 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
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1907 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	1908 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	1909
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1910 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1911
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1912 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	1913
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	1914 octave_unused_parameter (type);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	1915 octave_unused_parameter (idx);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	1916 octave_unused_parameter (nargout);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	1917
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1918 // 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	1919 // 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	1920
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1921 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	1922
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1923 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1924 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1925
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1926 octave_value
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1927 octave_java::subsasgn (const std::string& type,
21661 1b9a36a66b01 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21660 diff changeset	1928 const std::list<octave_value_list>& idx,
1b9a36a66b01 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21660 diff changeset	1929 const octave_value& rhs)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1930 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1931 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1932
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1933 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1934
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1935 JNIEnv *current_env = thread_jni_env ();
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 switch (type[0])
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1938 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1939 case '.':
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1940 if (type.length () == 1)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1941 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1942 // field assignment
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1943 octave_value_list ovl;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1944 count++;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1945 ovl(0) = octave_value (this);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1946 ovl(1) = (idx.front ())(0);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1947 ovl(2) = rhs;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1948 feval ("__java_set__", ovl, 0);
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1949
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1950 count++;
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1951 retval = octave_value (this);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1952 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1953 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	1954 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1955 std::list<octave_value_list> new_idx;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1956 std::list<octave_value_list>::const_iterator it = idx.begin ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1957 new_idx.push_back (*it++);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1958 new_idx.push_back (*it++);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1959 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	1960
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1961 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	1962 next_idx.erase (next_idx.begin ());
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1963 next_idx.erase (next_idx.begin ());
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1964 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	1965
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1966 count++;
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1967 retval = octave_value (this);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1968 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1969 else if (type[1] == '.')
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1970 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1971 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	1972
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1973 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	1974 next_idx.erase (next_idx.begin ());
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1975 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	1976
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1977 count++;
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1978 retval = octave_value (this);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1979 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1980 else
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1981 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	1982 break;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1983
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1984 case '(':
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1985 if (current_env)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1986 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1987 set_array_elements (current_env, TO_JOBJECT (to_java ()), idx.front (), rhs);
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1988
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1989 count++;
0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	1990 retval = octave_value (this);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1991 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1992 break;
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	1993
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1994 default:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1995 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	1996 break;
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1997 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1998
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1999 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2000
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2001 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2002
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2003 octave_unused_parameter (type);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2004 octave_unused_parameter (idx);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2005 octave_unused_parameter (rhs);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2006
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2007 // 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	2008 // 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	2009
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2010 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2011
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2012 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2013 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2014
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2015 string_vector
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2016 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	2017 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2018 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2019
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2020 JNIEnv *current_env = thread_jni_env ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2021
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2022 if (current_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2023 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	2024 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2025 return string_vector ();
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2026
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2027 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2028
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2029 // 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	2030 // 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	2031
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2032 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2033
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2034 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2035 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2036
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2037 octave_value
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2038 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	2039 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2040 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2041
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2042 JNIEnv *current_env = thread_jni_env ();
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2043
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2044 if (current_env)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2045 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	2046 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2047 return octave_value ("");
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2048
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2049 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2050
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2051 octave_unused_parameter (force);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2052 octave_unused_parameter (type);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2053
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2054 // 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	2055 // 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	2056
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2057 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2058
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2059 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2060 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2061
15859 0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2062 void
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18100 diff changeset	2063 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	2064 {
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2065 print_raw (os);
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2066 newline (os);
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2067 }
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2068
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2069 void
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2070 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	2071 {
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2072 os << "<Java object: " << java_classname << ">";
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2073 }
0e393e744e5e ov-java.cc: Replace instances of comma operator for code clarity. Rik <rik@octave.org> parents: 15858 diff changeset	2074
20441 b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2075 // 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	2076 // 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	2077
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2078 bool
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2079 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	2080 {
20531 dcfbf4c1c3c8 eliminate trailing whitespace and tabs from sources John W. Eaton <jwe@octave.org> parents: 20468 diff changeset	2081 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	2082
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2083 return true;
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2084 }
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2085
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2086 bool
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2087 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	2088 {
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2089 // 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	2090 return true;
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2091 }
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2092
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2093 bool
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2094 octave_java::save_binary (std::ostream& /* os /, bool& / save_as_floats */)
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2095 {
20531 dcfbf4c1c3c8 eliminate trailing whitespace and tabs from sources John W. Eaton <jwe@octave.org> parents: 20468 diff changeset	2096 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	2097
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2098 return true;
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2099 }
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2100
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2101 bool
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2102 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	2103 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	2104 {
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2105 // 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	2106 return true;
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2107 }
b22528fd3deb Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694). Rik <rik@octave.org> parents: 20422 diff changeset	2108
20468 2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2109 bool
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2110 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	2111 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	2112 {
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2113 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	2114
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2115 return true;
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2116 }
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2117
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2118 bool
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2119 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	2120 {
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2121 // 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	2122 return true;
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2123 }
2f94652de9ff Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions. Rik <rik@octave.org> parents: 20441 diff changeset	2124
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2125 octave_value
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2126 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	2127 const octave_value_list& args)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2128 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2129 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2130
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2131 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2132
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2133 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	2134
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2135 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2136 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2137 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	2138 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	2139 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	2140 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	2141 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	2142 "(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	2143 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	2144 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	2145 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	2146 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2147 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2148 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2149 retval = check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2150 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2151
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2152 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2153 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2154
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2155 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2156
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2157 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2158
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2159 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	2160 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2161 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2162
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2163 // 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	2164 // 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	2165
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2166 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2167
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2168 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2169 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2170
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2171 octave_value
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2172 octave_java::do_javaMethod (const std::string& name, const octave_value_list& args)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2173 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2174 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2175
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2176 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	2177
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2178 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2179
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2180 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2181 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2182
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2183 // 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	2184 // 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	2185
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2186 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2187
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2188 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2189 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2190
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2191 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2192 octave_java:: do_javaMethod (void *jni_env_arg,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2193 const std::string& class_name,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2194 const std::string& name,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2195 const octave_value_list& args)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2196 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2197 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2198
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2199 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2200
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2201 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	2202
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2203 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2204 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2205 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	2206 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	2207 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	2208 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	2209 jmethodID mID = jni_env->GetStaticMethodID (helperClass, "invokeStaticMethod",
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2210 "(Ljava/lang/String;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	2211 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	2212 jstring_ref clsName (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	2213 jobject_ref resObj (jni_env, jni_env->CallStaticObjectMethod (helperClass, mID,
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2214 jstring (clsName), 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	2215 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2216 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2217 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2218 retval = check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2219 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2220
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2221 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2222 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2223
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2224 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2225
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2226 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2227
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2228 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	2229 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2230 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2231 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2232
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2233 // 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	2234 // 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	2235
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2236 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2237
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2238 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2239 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2240
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2241 octave_value
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2242 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	2243 const std::string& name,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2244 const octave_value_list& args)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2245 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2246 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2247
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2248 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	2249
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2250 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2251
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2252 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2253 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2254 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2255
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2256 // 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	2257 // 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	2258
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2259 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2260
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2261 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2262 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2263
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2264 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2265 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	2266 const octave_value_list& args)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2267 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2268 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2269
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2270 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2271
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2272 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	2273
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2274 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2275 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2276 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	2277
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2278 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	2279 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	2280 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	2281 jmethodID mID = jni_env->GetStaticMethodID (helperClass, "invokeConstructor",
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2282 "(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	2283 jstring_ref clsName (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	2284 jobject_ref resObj (jni_env, jni_env->CallStaticObjectMethod (helperClass, mID,
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2285 jstring (clsName), jobjectArray (arg_objs), jobjectArray (arg_types)));
19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2286
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2287 if (resObj)
15816 59b6c6aee042 Don't box return values from javaObject. Always return a Java object. Rik <rik@octave.org> parents: 15815 diff changeset	2288 retval = octave_value (new octave_java (resObj, 0));
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2289 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2290 check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2291 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2292
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2293 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2294 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2295
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2296 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2297
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2298 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2299
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2300 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	2301 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2302 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2303
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2304 // 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	2305 // 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	2306
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2307 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2308
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2309 #endif
15625 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
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2312 octave_value
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2313 octave_java::do_javaObject (const std::string& name, const octave_value_list& args)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2314 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2315 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2316
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2317 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	2318
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2319 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2320
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2321 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2322 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2323
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2324 // 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	2325 // 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	2326
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2327 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2328
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2329 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2330 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2331
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2332 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2333 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	2334 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2335 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2336
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2337 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2338
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2339 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	2340
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2341 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2342 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	2343 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	2344 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	2345 "(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	2346 jstring_ref fName (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	2347 jobject_ref resObj (jni_env, jni_env->CallStaticObjectMethod (helperClass, mID,
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2348 to_java (), jstring (fName)));
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2349
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2350 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2351 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2352 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2353 retval = check_exception (jni_env);
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2354
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2355 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2356 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2357
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2358 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2359
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2360 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2361
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2362 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	2363 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2364
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2365 // 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	2366 // 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	2367
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2368 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2369
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2370 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2371 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2372
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2373 octave_value
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2374 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	2375 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2376 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2377
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2378 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	2379
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2380 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2381
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2382 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2383
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2384 // 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	2385 // 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	2386
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2387 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2388
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2389 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2390 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2391
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2392 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2393 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	2394 const std::string& name)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2395 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2396 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2397
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2398 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2399
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2400 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	2401
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2402 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2403 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	2404 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	2405 jmethodID mID = jni_env->GetStaticMethodID (helperClass, "getStaticField",
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2406 "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;");
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2407 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	2408 jstring_ref fName (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	2409 jobject_ref resObj (jni_env, jni_env->CallStaticObjectMethod (helperClass, mID,
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2410 jstring (cName), jstring (fName)));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2411 if (resObj)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2412 retval = box (jni_env, resObj);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2413 else
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2414 retval = check_exception (jni_env);
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2415
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2416 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2417 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2418
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2419 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2420
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2421 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2422
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2423 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	2424 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2425 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2426
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2427 // 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	2428 // 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	2429
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2430 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2431
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2432 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2433 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2434
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2435 octave_value
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2436 octave_java::do_java_get (const std::string& class_name, const std::string& name)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2437 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2438 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2439
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2440 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	2441
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2442 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2443
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2444 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2445 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2446
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2447 // 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	2448 // 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	2449
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2450 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2451
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2452 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2453 }
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 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2456 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	2457 const octave_value& val)
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2458 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2459 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2460
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2461 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2462
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2463 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	2464
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2465 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2466 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2467 jobject_ref jobj (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2468 jclass_ref jcls (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2469
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2470 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	2471 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	2472 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	2473 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	2474 "(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	2475 jstring_ref fName (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	2476 jni_env->CallStaticObjectMethod (helperClass, mID, to_java (), jstring (fName), jobject (jobj));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2477 check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2478 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2479
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2480 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2481 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2482
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2483 return retval;
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2484
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2485 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2486
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2487 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	2488 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2489 octave_unused_parameter (val);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2490
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2491 // 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	2492 // 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	2493
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2494 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2495
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2496 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2497 }
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2498
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2499 octave_value
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2500 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	2501 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2502 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2503
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2504 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	2505
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2506 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2507
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2508 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2509 octave_unused_parameter (val);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2510
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2511 // 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	2512 // 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	2513
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2514 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2515
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2516 #endif
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2517 }
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2518
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2519 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2520 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	2521 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	2522 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2523 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2524
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2525 octave_value retval;
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2526
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2527 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	2528
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2529 if (jni_env)
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2530 {
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2531 jobject_ref jobj (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2532 jclass_ref jcls (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2533
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2534 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	2535 {
15744 686580b1a934 eliminate most compilation warnings for __java__.cc John W. Eaton <jwe@octave.org> parents: 15743 diff changeset	2536 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	2537 jmethodID mID = jni_env->GetStaticMethodID (helperClass, "setStaticField",
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2538 "(Ljava/lang/String;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	2539 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	2540 jstring_ref fName (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	2541 jni_env->CallStaticObjectMethod (helperClass, mID, jstring (cName), jstring (fName), jobject (jobj));
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2542 check_exception (jni_env);
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2543 }
16078 9439f3b5c5fa Restore default floating point state after calling Java Mike Miller <mtmiller@ieee.org> parents: 15879 diff changeset	2544
21894 67a5cb9cd941 hide gnulib fpucw header John W. Eaton <jwe@octave.org> parents: 21823 diff changeset	2545 octave_set_default_fpucw ();
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2546 }
15745 19850dfc2f88 * __java__.h, __java__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 15744 diff changeset	2547
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2548 return retval;
21379 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 (jni_env_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2553 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2554 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2555 octave_unused_parameter (val);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2556
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2557 // 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	2558 // 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	2559
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2560 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2561
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2562 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2563 }
15736 6faa01ff2967 build: Add --disable-java option to configure (bug #37838). Rik <rik@octave.org> parents: 15625 diff changeset	2564
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2565 octave_value
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2566 octave_java::do_java_set (const std::string& class_name, const std::string& name,
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2567 const octave_value& val)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2568 {
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2569 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2570
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2571 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	2572
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2573 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2574
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2575 octave_unused_parameter (class_name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2576 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2577 octave_unused_parameter (val);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2578
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2579 // 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	2580 // 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	2581
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2582 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2583
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2584 #endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2585 }
15736 6faa01ff2967 build: Add --disable-java option to configure (bug #37838). Rik <rik@octave.org> parents: 15625 diff changeset	2586
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2587 void
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2588 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	2589 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2590 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2591
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2592 jobject jobj = TO_JOBJECT (jobj_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2593 jclass jcls = TO_JCLASS (jcls_arg);
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2594
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2595 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	2596
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2597 if (current_env)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2598 {
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2599 if (jobj)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2600 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	2601
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2602 if (jcls)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2603 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	2604 else if (java_object)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2605 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2606 jclass_ref ocls (current_env, current_env->GetObjectClass (TO_JOBJECT (java_object)));
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2607 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	2608 }
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2609
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2610 if (java_class)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2611 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2612 jclass_ref clsCls (current_env, current_env->GetObjectClass (TO_JCLASS (java_class)));
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2613 jmethodID mID = current_env->GetMethodID (clsCls, "getCanonicalName", "()Ljava/lang/String;");
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2614 jobject_ref resObj (current_env, 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	2615 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	2616 }
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2617 }
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2618
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2619 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2620
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2621 octave_unused_parameter (jobj_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2622 octave_unused_parameter (jcls_arg);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2623
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2624 // 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	2625 // 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	2626
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2627 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2628
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2629 #endif
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2630 }
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2631
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2632 void
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2633 octave_java::release (void)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2634 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2635 #if defined (HAVE_JAVA)
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2636
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2637 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	2638
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2639 if (current_env)
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2640 {
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2641 if (java_object)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2642 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	2643
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2644 if (java_class)
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2645 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	2646
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2647 java_object = 0;
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2648 java_class = 0;
0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2649 }
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2650
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2651 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2652
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2653 // 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	2654 // 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	2655
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2656 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2657
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2658 #endif
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2659 }
15806 01d4f742d75d doc: Re-organize and improve Java Interface documentation. Rik <rik@octave.org> parents: 15800 diff changeset	2660
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2661 // DEFUN blocks below must be outside of HAVE_JAVA block so that
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2662 // documentation strings are always available, even when functions are not.
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2663
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2664 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	2665 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	2666 @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	2667 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	2668
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2669 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	2670 @end deftypefn */)
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2671 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2672 #if defined (HAVE_JAVA)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2673
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2674 octave_value retval;
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2675
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2676 retval = 0;
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2677
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2678 initialize_java ();
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2679
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2680 retval = 1;
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2681
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2682 return retval;
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2683
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2684 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2685
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2686 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	2687
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2688 #endif
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2689 }
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2690
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2691 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	2692 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	2693 @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	2694 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	2695
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2696 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	2697 instance.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2698 @end deftypefn */)
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2699 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2700 #if defined (HAVE_JAVA)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2701
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2702 terminate_jvm ();
20957 9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20955 diff changeset	2703
9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20955 diff changeset	2704 return ovl ();
9db35d2042be maint: eliminate special cases of statements after error. Rik <rik@octave.org> parents: 20955 diff changeset	2705
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2706 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2707
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2708 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	2709
15879 f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2710 #endif
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2711 }
f69530e3600d make docstrings for __java_init__ and __java_exit__ available unconditionally John W. Eaton <jwe@octave.org> parents: 15859 diff changeset	2712
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2713 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	2714 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	2715 @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	2716 @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	2717 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	2718 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	2719
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2720 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	2721 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	2722
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2723 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2724 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2725 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	2726 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	2727 @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	2728 @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	2729
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2730 @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	2731 @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	2732 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2733 #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	2734
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2735 if (args.length () == 0)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2736 print_usage ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2737
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2738 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	2739
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2740 initialize_java ();
15790 921912c92102 Deprecate java_invoke, replace with javaMethod. Rik <rik@octave.org> parents: 15771 diff changeset	2741
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2742 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	2743
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2744 octave_value_list tmp;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2745 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	2746 tmp(i-1) = args(i);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2747
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2748 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	2749
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2750 #else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2751
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2752 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2753
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2754 err_disabled_feature ("javaObject", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2755
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2756 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2757 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2758
15825 9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	2759 /*
21042 0967e2393386 * ov-java.h, ov-java.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 20974 diff changeset	2760 ## 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	2761 ## 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	2762 ## 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	2763 ## whether it overflows.
15825 9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	2764 %!testif HAVE_JAVA
9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	2765 %! 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	2766 */
9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	2767
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2768 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	2769 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	2770 @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	2771 @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	2772 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	2773 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	2774
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2775 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	2776 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	2777
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2778 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	2779 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	2780 equivalent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2781
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2782 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2783 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2784 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	2785 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	2786 @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	2787 @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	2788
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2789 @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	2790
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2791 @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	2792 @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	2793 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2794 #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	2795
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2796 if (args.length () < 2)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2797 print_usage ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2798
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2799 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	2800
15790 921912c92102 Deprecate java_invoke, replace with javaMethod. Rik <rik@octave.org> parents: 15771 diff changeset	2801 initialize_java ();
921912c92102 Deprecate java_invoke, replace with javaMethod. Rik <rik@octave.org> parents: 15771 diff changeset	2802
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2803 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	2804
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2805 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2806
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2807 octave_value_list tmp;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2808 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	2809 tmp(i-2) = args(i);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2810
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2811 if (args(1).is_java ())
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2812 {
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2813 octave_java *jobj = TO_JAVA (args(1));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2814 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	2815 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2816 else if (args(1).is_string ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2817 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2818 std::string cls = args(1).string_value ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2819 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	2820 }
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2821 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2822 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	2823
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2824 return retval;
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	2825
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2826 #else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2827
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2828 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2829
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2830 err_disabled_feature ("javaMethod", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2831
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2832 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2833 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2834
15825 9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	2835 /*
9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	2836 %!testif HAVE_JAVA
20152 8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	2837 %! ## Check for valid first two Java version numbers
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	2838 %! jver = strsplit (javaMethod ("getProperty", "java.lang.System", "java.version"), ".");
15825 9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	2839 %! assert (isfinite (str2double (jver{1})) && isfinite (str2double (jver{2})));
9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	2840 */
9854666df787 ov-java.cc: tests added for javaObject and javaMethod Philip Nienhuis <prnienhuis@users.sf.net> parents: 15824 diff changeset	2841
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2842 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	2843 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	2844 @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	2845 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	2846
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2847 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	2848 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	2849
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2850 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	2851 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	2852 equivalent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2853
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2854 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2855 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2856 __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	2857 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	2858 @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	2859 @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	2860
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2861 @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	2862 @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	2863 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2864 #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	2865
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2866 if (args.length () != 2)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2867 print_usage ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2868
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2869 std::string name = args(1).string_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	2870
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2871 initialize_java ();
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2872
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2873 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	2874
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2875 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2876
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2877 if (args(0).is_java ())
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2878 {
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2879 octave_java *jobj = TO_JAVA (args(0));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2880 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	2881 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2882 else if (args(0).is_string ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2883 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2884 std::string cls = args(0).string_value ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2885 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	2886 }
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2887 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2888 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	2889
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2890 return retval;
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	2891
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2892 #else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2893
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2894 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2895
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2896 err_disabled_feature ("__java_get__", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2897
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2898 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2899 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2900
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2901 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	2902 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	2903 @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	2904 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	2905 @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	2906
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2907 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	2908 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	2909
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2910 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	2911 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	2912 equivalent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2913
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2914 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2915 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2916 __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	2917 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	2918 @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	2919 @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	2920
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2921 @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	2922 @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	2923 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2924 #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	2925
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2926 if (args.length () != 3)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2927 print_usage ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2928
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2929 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	2930
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2931 initialize_java ();
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2932
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2933 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	2934
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2935 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2936
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2937 if (args(0).is_java ())
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2938 {
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2939 octave_java *jobj = TO_JAVA (args(0));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2940 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	2941 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2942 else if (args(0).is_string ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2943 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2944 std::string cls = args(0).string_value ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2945 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	2946 }
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2947 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2948 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	2949
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2950 return retval;
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	2951
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2952 #else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2953
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2954 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2955
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2956 err_disabled_feature ("__java_set__", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2957
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2958 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2959 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2960
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2961 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	2962 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	2963 @deftypefn {} {} java2mat (@var{javaobj})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	2964 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	2965 @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	2966 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2967 #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	2968
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2969 if (args.length () != 1)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2970 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	2971
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2972 initialize_java ();
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2973
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2974 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	2975
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2976 octave_value_list retval;
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	2977
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	2978 if (args(0).is_java ())
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2979 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	2980 octave_java *jobj = TO_JAVA (args(0));
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2981 retval = ovl (box_more (current_env, jobj->to_java (), 0));
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2982 }
20559 0650b8431037 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	2983 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2984 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	2985
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2986 return retval;
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	2987
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2988 #else
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2989
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	2990 octave_unused_parameter (args);
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 err_disabled_feature ("java2mat", "Java");
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2993
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2994 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2995 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	2996
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	2997 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	2998 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	2999 @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	3000 @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	3001 @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	3002 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	3003 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	3004
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3005 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	3006
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3007 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	3008 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	3009 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	3010 @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	3011 @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	3012 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3013 #if defined (HAVE_JAVA)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3014
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	3015 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	3016
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3017 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3018
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3019 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3020 octave_unused_parameter (nargout);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3021
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3022 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	3023
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3024 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3025 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3026
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	3027 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	3028 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	3029 @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	3030 @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	3031 @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	3032 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	3033 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	3034
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3035 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	3036 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	3037
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3038 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	3039 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	3040 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	3041 @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	3042 @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	3043 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3044 #if defined (HAVE_JAVA)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3045
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	3046 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	3047
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3048 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3049
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3050 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3051 octave_unused_parameter (nargout);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3052
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3053 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	3054
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3055 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3056 }
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3057
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	3058 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	3059 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	3060 @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	3061 @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	3062 @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	3063 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	3064 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	3065 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	3066
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21894 diff changeset	3067 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	3068 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	3069 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	3070 @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	3071 @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	3072 {
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3073 #if defined (HAVE_JAVA)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3074
15800 d9b8333df5e4 Deprecate java_debug, java_convert_matrix, java_unsigned_conversion. Rik <rik@octave.org> parents: 15798 diff changeset	3075 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	3076
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3077 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3078
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3079 octave_unused_parameter (args);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3080 octave_unused_parameter (nargout);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	3081
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3082 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	3083
15771 4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3084 #endif
4698ea77aa75 Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get. Rik <rik@octave.org> parents: 15770 diff changeset	3085 }
15736 6faa01ff2967 build: Add --disable-java option to configure (bug #37838). Rik <rik@octave.org> parents: 15625 diff changeset	3086
21379 93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3087 // 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	3088 // 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	3089 // installed.
93c489ca8a6b elimnate HAVE_JAVA from ov-java.h John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3090
15770 e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3091 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	3092 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	3093 @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	3094 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	3095 @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	3096 @end deftypefn */)
15770 e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3097 {
e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3098 if (args.length () != 1)
e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3099 print_usage ();
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20765 diff changeset	3100
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3101 return ovl (args(0).is_java ());
15770 e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3102 }
e61405133a76 Add new isjava function. Rik <rik@octave.org> parents: 15763 diff changeset	3103
20120 2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	3104 /*
20152 8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3105 ## Check automatic conversion of java primitive arrays into octave types.
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3106 %!testif HAVE_JAVA
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3107 %! 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	3108 %! 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	3109
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3110 ## 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	3111 ## Note that uint8 is casted to int8.
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3112 %!testif HAVE_JAVA
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3113 %! 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	3114 %! 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	3115 %! 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	3116 %! 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	3117 %! 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	3118
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3119 ## Check we can create objects that wrap java literals (bug #38821).
8187a66039e4 Don't run Java BIST tests if HAVA_JAVA is false. Rik <rik@octave.org> parents: 20124 diff changeset	3120 %!testif HAVE_JAVA
21822 e56ba70108d3 Fix typos in Java conversion of 32 and 64 bit integers (bug #48107) Mike Miller <mtmiller@octave.org> parents: 21780 diff changeset	3121 %! 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	3122 %! 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	3123 %! 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	3124 %! 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	3125 %! 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	3126 %! 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	3127 %! 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	3128 %! 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	3129
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	3130 ## Automatic conversion from string cell array into String[] (bug #45290)
137f183b7dee Fix conversion from string cell array into java's String[] (bug #45290) Carnë Draug <carandraug@octave.org> parents: 20250 diff changeset	3131 %!testif HAVE_JAVA
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21547 diff changeset	3132 %! 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	3133 %! 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	3134 %! assert (javaMethod ("binarySearch", "java.util.Arrays", {"aaa", "bbb", "ccc", "zzz"}, "hhh") < 0);
20120 2db2db2df55b Automatically convert arrays of java primitives into Octave types (bug #44882) Carnë Draug <carandraug@octave.org> parents: 20028 diff changeset	3135 */

Mercurial > octave

annotate libinterp/octave-value/ov-java.cc @ 22202:f094186125d3