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

annotate libinterp/octave-value/ov-java.cc @ 22331:b81b08cc4c83

maint: Indent namespaces in more files.

author	John W. Eaton <jwe@octave.org>
date	Wed, 17 Aug 2016 11:43:27 -0400
parents	d0562b3159c7
children	34ce5be04942

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

Mercurial > octave

annotate libinterp/octave-value/ov-java.cc @ 22331:b81b08cc4c83