Mercurial > octave
annotate libinterp/octave-value/ov-java.cc @ 30564:796f54d4ddbf stable
update Octave Project Developers copyright for the new year
In files that have the "Octave Project Developers" copyright notice,
update for 2021.
In all .txi and .texi files except gpl.txi and gpl.texi in the
doc/liboctave and doc/interpreter directories, change the copyright
to "Octave Project Developers", the same as used for other source
files. Update copyright notices for 2022 (not done since 2019). For
gpl.txi and gpl.texi, change the copyright notice to be "Free Software
Foundation, Inc." and leave the date at 2007 only because this file
only contains the text of the GPL, not anything created by the Octave
Project Developers.
Add Paul Thomas to contributors.in.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 28 Dec 2021 18:22:40 -0500 |
parents | c789e728d57a |
children | 83f9f8bda883 |
rev | line source |
---|---|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 //////////////////////////////////////////////////////////////////////// |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 // |
30564
796f54d4ddbf
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
30139
diff
changeset
|
3 // Copyright (C) 2007-2022 The Octave Project Developers |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
4 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 // See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 // distribution or <https://octave.org/copyright/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
7 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
8 // This file is part of Octave. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
9 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
10 // Octave is free software: you can redistribute it and/or modify it |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
11 // under the terms of the GNU General Public License as published by |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
12 // the Free Software Foundation, either version 3 of the License, or |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
13 // (at your option) any later version. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
14 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
15 // Octave is distributed in the hope that it will be useful, but |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
16 // WITHOUT ANY WARRANTY; without even the implied warranty of |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
18 // GNU General Public License for more details. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
19 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
20 // You should have received a copy of the GNU General Public License |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
21 // along with Octave; see the file COPYING. If not, see |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
22 // <https://www.gnu.org/licenses/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 //////////////////////////////////////////////////////////////////////// |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
26 |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
27 //! @file ov-java.cc |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
28 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
29 //! Provides Octave's Java interface. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
30 |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21691
diff
changeset
|
31 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21211
diff
changeset
|
32 # include "config.h" |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15625
diff
changeset
|
33 #endif |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15625
diff
changeset
|
34 |
15755
3216dafbbd48
ov-java.cc: Correcty typo HAVE_WINDWOS_H to HAVE_WINDOWS_H
Rik <rik@octave.org>
parents:
15754
diff
changeset
|
35 #if defined (HAVE_WINDOWS_H) |
21200
fcac5dbbf9ed
maint: Indent #ifdef blocks in libinterp.
Rik <rik@octave.org>
parents:
21042
diff
changeset
|
36 # include <windows.h> |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
37 #endif |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
38 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 #include <algorithm> |
28492
ae4cdbe75992
Use C++11 container for array of strings.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28491
diff
changeset
|
40 #include <array> |
25438
cb1606f78f6b
prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents:
25337
diff
changeset
|
41 #include <fstream> |
cb1606f78f6b
prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents:
25337
diff
changeset
|
42 #include <map> |
20028
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
43 #include <string> |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
44 #include <vector> |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
45 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
46 #include <clocale> |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
47 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
48 #include "Cell.h" |
23129
35e3d199527c
Replace feval calls with direct call to C++ function (bug #50116).
Rik <rik@octave.org>
parents:
23084
diff
changeset
|
49 #include "builtin-defun-decls.h" |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
50 #include "cmd-edit.h" |
25460
627d6bde9b8d
solve installation info initialization problem differently
John W. Eaton <jwe@octave.org>
parents:
25440
diff
changeset
|
51 #include "defaults.h" |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
52 #include "defun.h" |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
53 #include "error.h" |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
54 #include "errwarn.h" |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
55 #include "file-ops.h" |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
56 #include "file-stat.h" |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
57 #include "fpucw-wrappers.h" |
26113
8a15f3bace49
move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents:
26009
diff
changeset
|
58 #include "interpreter.h" |
8a15f3bace49
move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents:
26009
diff
changeset
|
59 #include "interpreter-private.h" |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
60 #include "load-path.h" |
25548
d6050ba12c0c
Call get_ASCII_filename for std::ifstream (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25460
diff
changeset
|
61 #include "lo-sysdep.h" |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
62 #include "oct-env.h" |
27003
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
63 #include "oct-process.h" |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
64 #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
|
65 #include "ov-java.h" |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
66 #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
|
67 #include "variables.h" |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
68 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
69 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
70 #include <jni.h> |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
71 #endif |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
72 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
73 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
74 |
27003
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
75 // FIXME: Should these values be configurable at run time? |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
76 |
25770
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
77 #if defined (OCTAVE_USE_WINDOWS_API) |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
78 # define LIBJVM_FILE_NAME "jvm.dll" |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
79 #elif defined (__APPLE__) |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
80 # define LIBJVM_FILE_NAME "libjvm.dylib" |
27003
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
81 # define JAVA_HOME_CMD "/usr/libexec/java_home" |
25770
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
82 #else |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
83 # define LIBJVM_FILE_NAME "libjvm.so" |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
84 #endif |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
85 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
86 #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
|
87 #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
|
88 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
89 #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
|
90 |
19861
19755f4fc851
maint: Cleanup C++ code to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19598
diff
changeset
|
91 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
|
92 void *args); |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
93 |
19861
19755f4fc851
maint: Cleanup C++ code to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19598
diff
changeset
|
94 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
|
95 jsize *nVMs); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
96 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
97 template <typename T> |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
98 class java_local_ref |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
99 { |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
100 public: |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
101 |
30137
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
102 java_local_ref (JNIEnv *env) |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
103 : m_jobj (nullptr), m_detached (false), m_env (env) { } |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
104 |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
105 java_local_ref (JNIEnv *env, T obj) |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
106 : m_jobj (obj), m_detached (false), m_env (env) { } |
21379
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 ~java_local_ref (void) { release (); } |
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 T& operator = (T obj) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
111 { |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
112 release (); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
113 |
30137
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
114 m_jobj = obj; |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
115 m_detached = false; |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
116 |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
117 return m_jobj; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
118 } |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
119 |
30137
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
120 operator bool () const { return (m_jobj != 0); } |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
121 operator T () { return m_jobj; } |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
122 |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
123 void detach (void) { m_detached = true; } |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
124 |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
125 protected: |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
126 |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
127 T m_jobj; |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
128 bool m_detached; |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
129 JNIEnv *m_env; |
21379
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 private: |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
132 |
30137
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
133 java_local_ref (void) |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
134 : m_jobj (0), m_detached (false), m_env (0) |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
135 { } |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
136 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
137 void release (void) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
138 { |
30137
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
139 if (m_env && m_jobj && ! m_detached) |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
140 m_env->DeleteLocalRef (m_jobj); |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
141 |
14214fbfa258
maint: use "m_" prefix for member variables in class java_local_ref.
Rik <rik@octave.org>
parents:
30133
diff
changeset
|
142 m_jobj = nullptr; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
143 } |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
144 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
145 }; |
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 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
|
148 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
|
149 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
|
150 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
|
151 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
|
152 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
|
153 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
|
154 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
|
155 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
156 static std::string |
23449
c763214a8260
maint: Use convention 'int *x' for naming pointers.
Rik <rik@octave.org>
parents:
23447
diff
changeset
|
157 jstring_to_string (JNIEnv *jni_env, jstring s); |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
158 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
159 static std::string |
23449
c763214a8260
maint: Use convention 'int *x' for naming pointers.
Rik <rik@octave.org>
parents:
23447
diff
changeset
|
160 jstring_to_string (JNIEnv *jni_env, jobject obj); |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
161 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
162 static octave_value |
23457
21baad6b35c4
maint: Use C++11 nullptr rather than 0 or NULL when possible.
Rik <rik@octave.org>
parents:
23449
diff
changeset
|
163 box (JNIEnv *jni_env, void *jobj, void *jcls_arg = nullptr); |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
164 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
165 static octave_value |
23457
21baad6b35c4
maint: Use C++11 nullptr rather than 0 or NULL when possible.
Rik <rik@octave.org>
parents:
23449
diff
changeset
|
166 box_more (JNIEnv *jni_env, void *jobj_arg, void *jcls_arg = nullptr); |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
167 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
168 static bool |
23449
c763214a8260
maint: Use convention 'int *x' for naming pointers.
Rik <rik@octave.org>
parents:
23447
diff
changeset
|
169 unbox (JNIEnv *jni_env, const octave_value& val, jobject_ref& jobj, |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
170 jclass_ref& jcls); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
171 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
172 static bool |
23449
c763214a8260
maint: Use convention 'int *x' for naming pointers.
Rik <rik@octave.org>
parents:
23447
diff
changeset
|
173 unbox (JNIEnv *jni_env, const octave_value_list& args, |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
174 jobjectArray_ref& jobjs, jobjectArray_ref& jclss); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
175 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
176 extern "C" |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
177 { |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
178 JNIEXPORT jboolean JNICALL |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
179 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
|
180 jobjectArray); |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
181 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
182 JNIEXPORT void JNICALL |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
183 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
|
184 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
185 JNIEXPORT void JNICALL |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
186 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
|
187 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
188 JNIEXPORT void JNICALL |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
189 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
|
190 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
191 JNIEXPORT jboolean JNICALL |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
192 Java_org_octave_Octave_needThreadedInvokation (JNIEnv *, jclass); |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
193 } |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
194 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
195 //! The pointer to a java virtual machine either created in the current thread |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
196 //! or attached this thread to it. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
197 |
23457
21baad6b35c4
maint: Use C++11 nullptr rather than 0 or NULL when possible.
Rik <rik@octave.org>
parents:
23449
diff
changeset
|
198 static JavaVM *jvm = nullptr; |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
199 |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
200 //! Whether the current thread is attached to the jvm given by #jvm. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
201 //! This is @c false also if no jvm exists, i.e. if #jvm is @c nullptr. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
202 //! @see #initialize_jvm() |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
203 //! @see #terminate_jvm() |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
204 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
205 static bool jvm_attached = false; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
206 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
207 //! Need to keep hold of the shared library handle until exit. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
208 //! @see #initialize_jvm() |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
209 //! @see #terminate_jvm() |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
210 |
21750
6720e5a220ba
use namespace for octave_shlib class
John W. Eaton <jwe@octave.org>
parents:
21748
diff
changeset
|
211 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
|
212 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
213 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
|
214 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
|
215 static int octave_java_refcount = 0; |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
216 |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
217 //! The thread id of the currently executing thread or @c -1 if this is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
218 //! unknown. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
219 //! @see #initialize_java() |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
220 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
221 static long octave_thread_ID = -1; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
222 |
15800
d9b8333df5e4
Deprecate java_debug, java_convert_matrix, java_unsigned_conversion.
Rik <rik@octave.org>
parents:
15798
diff
changeset
|
223 bool Vjava_matrix_autoconversion = false; |
d9b8333df5e4
Deprecate java_debug, java_convert_matrix, java_unsigned_conversion.
Rik <rik@octave.org>
parents:
15798
diff
changeset
|
224 bool Vjava_unsigned_autoconversion = true; |
d9b8333df5e4
Deprecate java_debug, java_convert_matrix, java_unsigned_conversion.
Rik <rik@octave.org>
parents:
15798
diff
changeset
|
225 bool Vdebug_java = false; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
226 |
29960
939bef0b66e0
merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks
John W. Eaton <jwe@octave.org>
parents:
29958
diff
changeset
|
227 OCTAVE_NAMESPACE_BEGIN |
939bef0b66e0
merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks
John W. Eaton <jwe@octave.org>
parents:
29958
diff
changeset
|
228 |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
229 class JVMArgs |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
230 { |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
231 public: |
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 JVMArgs (void) |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
234 { |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
235 m_vm_args.version = JNI_VERSION_1_6; |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
236 m_vm_args.nOptions = 0; |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
237 m_vm_args.options = nullptr; |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
238 m_vm_args.ignoreUnrecognized = false; |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
239 } |
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 ~JVMArgs (void) |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
242 { |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
243 clean (); |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
244 } |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
245 |
23446
cd4e1ee28716
maint: Use convention 'void * fcn ()' for functions which return pointers.
Rik <rik@octave.org>
parents:
23405
diff
changeset
|
246 JavaVMInitArgs * to_args () |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
247 { |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
248 update (); |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
249 return &m_vm_args; |
22331
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 |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
252 void add (const std::string& opt) |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
253 { |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
254 m_java_opts.push_back (opt); |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
255 } |
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 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
|
258 { |
29006
139df373c107
Use wide character overload to open file streams on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28996
diff
changeset
|
259 std::ifstream js = sys::ifstream (filename.c_str ()); |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
260 |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
261 if (! js.bad () && ! js.fail ()) |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
262 { |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
263 std::string line; |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
264 |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
265 while (! js.eof () && ! js.fail ()) |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
266 { |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
267 std::getline (js, line); |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
268 |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23804
diff
changeset
|
269 if (line.find ('-') == 0) |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
270 m_java_opts.push_back (line); |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
271 else if (line.length () > 0 && Vdebug_java) |
26009
3fc9d7453ba6
where possible, use octave_stdout and avoid including <iostream>
John W. Eaton <jwe@octave.org>
parents:
25770
diff
changeset
|
272 warning ("invalid JVM option, skipping: %s", line.c_str ()); |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
273 } |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
274 } |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
275 } |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
276 |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
277 private: |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
278 |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
279 void clean (void) |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
280 { |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
281 if (m_vm_args.options != nullptr) |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
282 { |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
283 for (int i = 0; i < m_vm_args.nOptions; i++) |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
284 delete [] m_vm_args.options[i].optionString; |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
285 |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
286 delete [] m_vm_args.options; |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
287 |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
288 m_vm_args.options = nullptr; |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
289 m_vm_args.nOptions = 0; |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
290 } |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
291 } |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
292 |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
293 void update (void) |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
294 { |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
295 clean (); |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
296 |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
297 if (m_java_opts.size () > 0) |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
298 { |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
299 int index = 0; |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
300 |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
301 m_vm_args.nOptions = m_java_opts.size (); |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
302 m_vm_args.options = new JavaVMOption [m_vm_args.nOptions]; |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
303 |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
304 for (const auto& opt : m_java_opts) |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
305 { |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
306 if (Vdebug_java) |
26009
3fc9d7453ba6
where possible, use octave_stdout and avoid including <iostream>
John W. Eaton <jwe@octave.org>
parents:
25770
diff
changeset
|
307 octave_stdout << opt << std::endl; |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
308 m_vm_args.options[index++].optionString = strsave (opt.c_str ()); |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
309 } |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
310 |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
311 m_java_opts.clear (); |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
312 } |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
313 } |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
314 |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
315 private: |
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
316 |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
317 JavaVMInitArgs m_vm_args; |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
318 |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
319 std::list<std::string> m_java_opts; |
22331
b81b08cc4c83
maint: Indent namespaces in more files.
John W. Eaton <jwe@octave.org>
parents:
22327
diff
changeset
|
320 }; |
29960
939bef0b66e0
merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks
John W. Eaton <jwe@octave.org>
parents:
29958
diff
changeset
|
321 |
939bef0b66e0
merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks
John W. Eaton <jwe@octave.org>
parents:
29958
diff
changeset
|
322 OCTAVE_NAMESPACE_END |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
323 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
324 //! The java initialization directory is given by the environment variable |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
325 //! @c OCTAVE_JAVA_DIR if defined; otherwise it is the directory of Octave's |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
326 //! m-files defining Java functions. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
327 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
328 //! The Java initialization directory is the directory where resides: |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
329 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
330 //! - @c octave.jar, defining the java classes implementing octave's java |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
331 //! interface, |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
332 //! - @c javaclasspath.txt, defining the installation defined portion of the |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
333 //! (static) classpath, |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
334 //! - @c java.opts, defining the configurable options of the java virtual |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
335 //! machine. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
336 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
337 //! Note that the (static) java classpath of the java virtual machine starts |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
338 //! with @c octave.jar, and that the static java classpath ends with what |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
339 //! is read from @c javaclasspath.txt located in the initial java directory. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
340 //! Moreover, the java virtual machine is created essentially with |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
341 //! the options given by @c java.opts. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
342 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
343 static std::string |
15752
f96faf028d90
make java functions part of core octave_value classes
John W. Eaton <jwe@octave.org>
parents:
15747
diff
changeset
|
344 initial_java_dir (void) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
345 { |
15752
f96faf028d90
make java functions part of core octave_value classes
John W. Eaton <jwe@octave.org>
parents:
15747
diff
changeset
|
346 static std::string java_dir; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
347 |
15752
f96faf028d90
make java functions part of core octave_value classes
John W. Eaton <jwe@octave.org>
parents:
15747
diff
changeset
|
348 if (java_dir.empty ()) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
349 { |
21732
6a1eded90355
use namespace for system env class
John W. Eaton <jwe@octave.org>
parents:
21724
diff
changeset
|
350 java_dir = octave::sys::env::getenv ("OCTAVE_JAVA_DIR"); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
351 |
15752
f96faf028d90
make java functions part of core octave_value classes
John W. Eaton <jwe@octave.org>
parents:
15747
diff
changeset
|
352 if (java_dir.empty ()) |
25460
627d6bde9b8d
solve installation info initialization problem differently
John W. Eaton <jwe@octave.org>
parents:
25440
diff
changeset
|
353 java_dir = (octave::config::fcn_file_dir () |
627d6bde9b8d
solve installation info initialization problem differently
John W. Eaton <jwe@octave.org>
parents:
25440
diff
changeset
|
354 + octave::sys::file_ops::dir_sep_str () + "java"); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
355 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
356 |
15752
f96faf028d90
make java functions part of core octave_value classes
John W. Eaton <jwe@octave.org>
parents:
15747
diff
changeset
|
357 return java_dir; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
358 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
359 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
360 //! Return the classpath in the given file @c filepath as a string. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
361 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
362 //! In the classpath file, each line which is neither empty nor a comment, is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
363 //! interpreted as a segment of a path. Comment lines are those starting with |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
364 //! a @c # or with a @c % in the very first column. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
365 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
366 //! @param filepath The path to the file (usually @c classpath.txt) containing |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
367 //! a portion of the classpath. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
368 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
369 //! @returns A string consisting of the lines of @c filepath which are neither |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
370 //! comments nor empty without trailing whitespace separated by |
27216
823b4bcf79fc
unless necessary for formatting or code, use ' instead of `
John W. Eaton <jwe@octave.org>
parents:
27126
diff
changeset
|
371 //! 'octave::directory_path::path_sep_str()'. The returned string also |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
372 //! starts with that path separator. |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
373 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
374 static std::string |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
375 read_classpath_txt (const std::string& filepath) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
376 { |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
377 std::string classpath; |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
378 |
29006
139df373c107
Use wide character overload to open file streams on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28996
diff
changeset
|
379 std::ifstream fs = octave::sys::ifstream (filepath.c_str ()); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
380 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
381 if (! fs.bad () && ! fs.fail ()) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
382 { |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
383 std::string line; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
384 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
385 while (! fs.eof () && ! fs.fail ()) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
386 { |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
387 std::getline (fs, line); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
388 if (line.length () > 0 && line[0] != '#' && line[0] != '%') |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
389 { |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
390 // prepend separator character |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
391 classpath.append (octave::directory_path::path_sep_str ()); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
392 |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
393 // append content of line without whitespace |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
394 int last = line.find_last_not_of (" \t\f\v\r\n"); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
395 |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
396 classpath.append (octave::sys::file_ops::tilde_expand (line.substr (0, last+1))); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
397 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
398 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
399 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
400 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
401 return (classpath); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
402 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
403 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
404 //! Return the initial classpath. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
405 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
406 //! The initial classpath starts with a pointer to @c octave.jar which is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
407 //! located in the initial java directory given by #java_init_dir(). |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
408 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
409 //! @attention This is nowhere documented and also the script |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
410 //! @c javaclasspath.m drops this. On the other hand, this is vital because |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
411 //! @c octave.jar contains the java core classes of octave's java interface. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
412 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
413 //! The rest of the classpath is read sequentially from files |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
414 //! @c javaclasspath.txt located in either: |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
415 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
416 //! - the current directory, |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
417 //! - the user's home directory, |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
418 //! - the initial java directory returned by #initial_java_dir() |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
419 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
420 //! @returns The initial classpath. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
421 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
422 static std::string |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
423 initial_class_path (void) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
424 { |
15752
f96faf028d90
make java functions part of core octave_value classes
John W. Eaton <jwe@octave.org>
parents:
15747
diff
changeset
|
425 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
|
426 |
f96faf028d90
make java functions part of core octave_value classes
John W. Eaton <jwe@octave.org>
parents:
15747
diff
changeset
|
427 std::string retval = java_dir; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
428 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
429 // Find octave.jar file. |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
430 if (! retval.empty ()) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
431 { |
21733
cb0fdd941d84
use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents:
21732
diff
changeset
|
432 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
|
433 |
f96faf028d90
make java functions part of core octave_value classes
John W. Eaton <jwe@octave.org>
parents:
15747
diff
changeset
|
434 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
|
435 |
21736
0504351a45e6
use namespace for file_stat classes
John W. Eaton <jwe@octave.org>
parents:
21733
diff
changeset
|
436 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
|
437 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
438 if (jar_exists) |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
439 { |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
440 // Initialize static classpath to octave.jar. |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
441 retval = jar_file; |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
442 |
15797
492893b98eef
Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path.
Rik <rik@octave.org>
parents:
15792
diff
changeset
|
443 // 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
|
444 // 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
|
445 // 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
|
446 // 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
|
447 // 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
|
448 |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
449 std::string cwd = octave::sys::env::get_current_directory (); |
21732
6a1eded90355
use namespace for system env class
John W. Eaton <jwe@octave.org>
parents:
21724
diff
changeset
|
450 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
|
451 |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
452 // The filename is "javaclasspath.txt", but historically has been |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
453 // "classpath.txt" so both are supported. |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
454 std::vector<std::string> cp_list = {"javaclasspath.txt", |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
455 "classpath.txt"}; |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
456 |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
457 for (std::string filename : cp_list) |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
458 { |
15797
492893b98eef
Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path.
Rik <rik@octave.org>
parents:
15792
diff
changeset
|
459 std::string cp_file = filename; |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23804
diff
changeset
|
460 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
|
461 |
492893b98eef
Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path.
Rik <rik@octave.org>
parents:
15792
diff
changeset
|
462 // 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
|
463 |
21736
0504351a45e6
use namespace for file_stat classes
John W. Eaton <jwe@octave.org>
parents:
21733
diff
changeset
|
464 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
|
465 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
|
466 { |
492893b98eef
Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path.
Rik <rik@octave.org>
parents:
15792
diff
changeset
|
467 // 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
|
468 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
|
469 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
|
470 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
471 |
15797
492893b98eef
Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path.
Rik <rik@octave.org>
parents:
15792
diff
changeset
|
472 // 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
|
473 |
20422
4262598620ae
Don't add duplicates to javaclasspath when run in home directory (bug #45683).
Rik <rik@octave.org>
parents:
20274
diff
changeset
|
474 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
|
475 { |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23804
diff
changeset
|
476 cp_file = '~' + sep + filename; |
21733
cb0fdd941d84
use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents:
21732
diff
changeset
|
477 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
|
478 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
|
479 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
|
480 { |
4262598620ae
Don't add duplicates to javaclasspath when run in home directory (bug #45683).
Rik <rik@octave.org>
parents:
20274
diff
changeset
|
481 // 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
|
482 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
|
483 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
|
484 } |
15797
492893b98eef
Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path.
Rik <rik@octave.org>
parents:
15792
diff
changeset
|
485 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
486 |
15797
492893b98eef
Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path.
Rik <rik@octave.org>
parents:
15792
diff
changeset
|
487 // 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
|
488 |
20422
4262598620ae
Don't add duplicates to javaclasspath when run in home directory (bug #45683).
Rik <rik@octave.org>
parents:
20274
diff
changeset
|
489 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
|
490 { |
20422
4262598620ae
Don't add duplicates to javaclasspath when run in home directory (bug #45683).
Rik <rik@octave.org>
parents:
20274
diff
changeset
|
491 cp_file = java_dir + sep + filename; |
21736
0504351a45e6
use namespace for file_stat classes
John W. Eaton <jwe@octave.org>
parents:
21733
diff
changeset
|
492 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
|
493 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
|
494 { |
4262598620ae
Don't add duplicates to javaclasspath when run in home directory (bug #45683).
Rik <rik@octave.org>
parents:
20274
diff
changeset
|
495 // 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
|
496 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
|
497 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
|
498 } |
15797
492893b98eef
Search for "javaclasspath.txt" as well as "classpath.txt" to set static class path.
Rik <rik@octave.org>
parents:
15792
diff
changeset
|
499 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
500 } |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
501 } |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
502 else |
21380
460943554233
* ov-java.cc: Call error instead of throwing std::string objects.
John W. Eaton <jwe@octave.org>
parents:
21379
diff
changeset
|
503 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
|
504 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
505 else |
21380
460943554233
* ov-java.cc: Call error instead of throwing std::string objects.
John W. Eaton <jwe@octave.org>
parents:
21379
diff
changeset
|
506 error ("initial java dir is empty"); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
507 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
508 return retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
509 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
510 |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
511 static std::string |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
512 get_jvm_lib_path_in_subdir (std::string java_home_path) |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
513 { |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
514 // This assumes that whatever architectures are installed are appropriate for |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
515 // this machine |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
516 #if defined (OCTAVE_USE_WINDOWS_API) |
28492
ae4cdbe75992
Use C++11 container for array of strings.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28491
diff
changeset
|
517 const std::array<const std::string, 2> subdirs = {"bin/client", "bin/server"}; |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
518 #else |
28492
ae4cdbe75992
Use C++11 container for array of strings.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28491
diff
changeset
|
519 const std::array<const std::string, 8> subdirs = |
ae4cdbe75992
Use C++11 container for array of strings.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28491
diff
changeset
|
520 {"jre/lib/server", "jre/lib", "lib/client", "lib/server", |
ae4cdbe75992
Use C++11 container for array of strings.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28491
diff
changeset
|
521 "jre/lib/amd64/client", "jre/lib/amd64/server", |
ae4cdbe75992
Use C++11 container for array of strings.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28491
diff
changeset
|
522 "jre/lib/i386/client", "jre/lib/i386/server" |
ae4cdbe75992
Use C++11 container for array of strings.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28491
diff
changeset
|
523 }; |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
524 #endif |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
525 |
29572
aef11bb4e6d1
use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
John W. Eaton <jwe@octave.org>
parents:
29569
diff
changeset
|
526 for (std::size_t i = 0; i < subdirs.size (); i++) |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
527 { |
25770
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
528 std::string candidate = java_home_path + "/" + subdirs[i] |
27932
b018f553fd85
maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
529 + "/" LIBJVM_FILE_NAME; |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
530 if (octave::sys::file_stat (candidate)) |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
531 return candidate; |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
532 } |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
533 return ""; |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
534 } |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
535 |
24684
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
536 #if defined (OCTAVE_USE_WINDOWS_API) |
27126
3d9e72cac668
allow Windows build to work again
John W. Eaton <jwe@octave.org>
parents:
27108
diff
changeset
|
537 |
29974
65c609504036
ov-java.cc: Fix extern declaration for function moved to octave namespace.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29960
diff
changeset
|
538 OCTAVE_NAMESPACE_BEGIN |
27126
3d9e72cac668
allow Windows build to work again
John W. Eaton <jwe@octave.org>
parents:
27108
diff
changeset
|
539 // Declare function defined in sysdep.cc |
3d9e72cac668
allow Windows build to work again
John W. Eaton <jwe@octave.org>
parents:
27108
diff
changeset
|
540 extern LONG |
3d9e72cac668
allow Windows build to work again
John W. Eaton <jwe@octave.org>
parents:
27108
diff
changeset
|
541 get_regkey_value (HKEY h_rootkey, const std::string subkey, |
3d9e72cac668
allow Windows build to work again
John W. Eaton <jwe@octave.org>
parents:
27108
diff
changeset
|
542 const std::string name, octave_value& value); |
29974
65c609504036
ov-java.cc: Fix extern declaration for function moved to octave namespace.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29960
diff
changeset
|
543 OCTAVE_NAMESPACE_END |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
544 |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
545 static std::string |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
546 get_jvm_lib_path_from_registry () |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
547 { |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
548 // In Windows, find the location of the JRE from the registry |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
549 std::string key, jversion, value; |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
550 |
28996
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
551 // First search for JRE >= 15 |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
552 key = R"(software\javasoft\jdk)"; |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
553 |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
554 jversion = octave::sys::env::getenv ("JAVA_VERSION"); |
28996
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
555 bool maybe_version_15_or_newer = true; |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
556 octave_value regval; |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
557 LONG retval; |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
558 if (jversion.empty ()) |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
559 { |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
560 value = "CurrentVersion"; |
28996
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
561 retval = octave::get_regkey_value (HKEY_LOCAL_MACHINE, key, value, |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
562 regval); |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
563 |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
564 if (retval != ERROR_SUCCESS) |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
565 { |
28996
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
566 // Search for JRE < 15 |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
567 maybe_version_15_or_newer = false; |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
568 key = R"(software\javasoft\jre)"; |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
569 retval = octave::get_regkey_value (HKEY_LOCAL_MACHINE, key, value, |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
570 regval); |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
571 |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
572 if (retval != ERROR_SUCCESS) |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
573 { |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
574 // Search for JRE < 9 |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
575 key = R"(software\javasoft\java runtime environment)"; |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
576 retval = octave::get_regkey_value (HKEY_LOCAL_MACHINE, key, |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
577 value, regval); |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
578 } |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
579 } |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
580 |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
581 if (retval != ERROR_SUCCESS) |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
582 error ("unable to find Java Runtime Environment: %s::%s", |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
583 key.c_str (), value.c_str ()); |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
584 |
28996
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
585 jversion = regval.xstring_value ("initialize_jvm: registry value " |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
586 R"("%s" at "%s" must be a string)", |
27276
7455523fdf01
style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents:
27216
diff
changeset
|
587 value.c_str (), key.c_str ()); |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
588 } |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
589 |
28996
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
590 std::string jvm_lib_path; |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
591 if (maybe_version_15_or_newer) |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
592 { |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
593 // Look for value used by JRE >= 15 |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
594 key = key + '\\' + jversion; |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
595 value = "JavaHome"; |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
596 retval = octave::get_regkey_value (HKEY_LOCAL_MACHINE, key, value, |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
597 regval); |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
598 |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
599 if (retval != ERROR_SUCCESS) |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
600 error ("unable to find Java Runtime Environment: %s::%s", |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
601 key.c_str (), value.c_str ()); |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
602 |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
603 jvm_lib_path |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
604 = regval.xstring_value (R"(initialize_jvm: registry value "%s" at )" |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
605 R"("%s" must be a string)", |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
606 value.c_str (), key.c_str ()) |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
607 + R"(\bin\server\jvm.dll)"; |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
608 |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
609 if (! jvm_lib_path.empty ()) |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
610 return jvm_lib_path; |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
611 |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
612 } |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
613 |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
614 // Search for JRE < 15 |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
615 key = R"(software\javasoft\jre\)" + jversion; |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
616 value = "RuntimeLib"; |
28996
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
617 retval = octave::get_regkey_value (HKEY_LOCAL_MACHINE, key, value, |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
618 regval); |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
619 |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
620 if (retval != ERROR_SUCCESS) |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
621 { |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
622 // Search for JRE < 9 |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
623 key = R"(software\javasoft\java runtime environment\)" + jversion; |
28996
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
624 retval = octave::get_regkey_value (HKEY_LOCAL_MACHINE, key, value, |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
625 regval); |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
626 } |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
627 |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
628 if (retval != ERROR_SUCCESS) |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
629 error ("unable to find Java Runtime Environment: %s::%s", |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
630 key.c_str (), value.c_str ()); |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
631 |
28996
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
632 jvm_lib_path |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
633 = regval.xstring_value (R"(initialize_jvm: registry value "%s" at )" |
55bdcab3d85b
Detect Java versions >= 15 on Windows (bug #59215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28889
diff
changeset
|
634 R"("%s" must be a string)", |
27276
7455523fdf01
style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents:
27216
diff
changeset
|
635 value.c_str (), key.c_str ()); |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
636 |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
637 if (jvm_lib_path.empty ()) |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
638 error ("unable to find Java Runtime Environment: %s::%s", |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
639 key.c_str (), value.c_str ()); |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
640 |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
641 return jvm_lib_path; |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
642 } |
24684
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
643 #endif |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
644 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
645 //! Initialize the java virtual machine (jvm) and field #jvm if necessary. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
646 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
647 //! If the jvm exists and is initialized, #jvm points to it, i.e. is not 0 |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
648 //! and there is nothing to do. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
649 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
650 //! If #jvm is 0 and if at least one jvm exists, attach the current thread to |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
651 //! it by setting #jvm_attached. Otherwise, create a #jvm with some hard- |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
652 //! coded options: |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
653 //! |
27216
823b4bcf79fc
unless necessary for formatting or code, use ' instead of `
John W. Eaton <jwe@octave.org>
parents:
27126
diff
changeset
|
654 //! - '-Djava.class.path=classpath', where @c classpath is given by |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
655 //! #initial_class_path(). |
27216
823b4bcf79fc
unless necessary for formatting or code, use ' instead of `
John W. Eaton <jwe@octave.org>
parents:
27126
diff
changeset
|
656 //! - '-Xrs' |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
657 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
658 //! Further options are read from the file @c java.opts in the directory given |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
659 //! by #java_init_dir(). |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
660 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
661 //! Note that #initial_class_path() determines the initial classpath. This |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
662 //! is the static classpath which cannot be changed. Elements of the dynamic |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
663 //! classpath can be added and removed using the m-file scripts |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
664 //! @c javaaddpath.m and @c javarmpath.m. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
665 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
666 //! @see #terminate_jvm() |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
667 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
668 static void |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
669 initialize_jvm (void) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
670 { |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
671 // Most of the time JVM already exists and has been initialized. |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
672 // Also it seems, as if jvm is set, the jvm is already attached. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
673 // This does not fit terminate_jvm. |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
674 if (jvm) |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
675 return; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
676 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
677 JNIEnv *current_env; |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
678 const char *static_locale = setlocale (LC_ALL, nullptr); |
26532
4dae224112a1
ov-java.cc: Fix static analyzer detected issue (bug #55464).
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
679 std::string locale; |
4dae224112a1
ov-java.cc: Fix static analyzer detected issue (bug #55464).
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
680 if (static_locale) |
4dae224112a1
ov-java.cc: Fix static analyzer detected issue (bug #55464).
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
681 locale = std::string (static_locale); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
682 |
24684
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
683 octave::dynamic_library lib (""); |
27003
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
684 std::string jvm_lib_path; |
24684
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
685 |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
686 // Check whether the Java VM library is already loaded or linked in. |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
687 JNI_CreateJavaVM_t create_vm = reinterpret_cast<JNI_CreateJavaVM_t> |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
688 (lib.search ("JNI_CreateJavaVM")); |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
689 JNI_GetCreatedJavaVMs_t get_vm = reinterpret_cast<JNI_GetCreatedJavaVMs_t> |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
690 (lib.search ("JNI_GetCreatedJavaVMs")); |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
691 |
27003
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
692 if (create_vm && get_vm) |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
693 jvm_lib_path = "linked in or loaded libraries"; |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
694 else |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
695 { |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
696 // JAVA_HOME environment variable takes precedence |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
697 std::string java_home_env = octave::sys::env::getenv ("JAVA_HOME"); |
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
698 if (! java_home_env.empty ()) |
25770
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
699 { |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
700 jvm_lib_path = get_jvm_lib_path_in_subdir (java_home_env); |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
701 |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
702 // If JAVA_HOME does not look like a Java directory, use it anyway |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
703 // to fail with a useful error message indicating the directory |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
704 if (jvm_lib_path.empty ()) |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
705 jvm_lib_path = java_home_env + "/" LIBJVM_FILE_NAME; |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
706 } |
27003
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
707 |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
708 # if defined (__APPLE__) |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
709 // Use standard /usr/libexec/java_home if available. |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
710 if (jvm_lib_path.empty ()) |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
711 { |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
712 octave::sys::file_stat libexec_java_home_exists (JAVA_HOME_CMD); |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
713 if (libexec_java_home_exists) |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
714 { |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
715 // FIXME: Should this command be fully configurable at run |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
716 // time? Or is it OK for the options to be fixed here? |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
717 |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
718 std::string java_home_cmd = std::string (JAVA_HOME_CMD) |
27932
b018f553fd85
maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
719 + " --failfast --version 1.6+ 2>/dev/null"; |
27003
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
720 |
27006
cdc67ea473d1
Fix build failure on macOS due to missing namespace qualification.
Andrew Janke <andrew@apjanke.net>
parents:
27003
diff
changeset
|
721 octave::process_execution_result rslt |
27003
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
722 = octave::run_command_and_return_output (java_home_cmd); |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
723 |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
724 if (rslt.exit_status () == 0) |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
725 { |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
726 std::string output = rslt.stdout_output (); |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
727 std::string found_path = output.substr (0, output.length() - 1); |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
728 std::string jvm_lib_found = get_jvm_lib_path_in_subdir (found_path); |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
729 if (!jvm_lib_found.empty ()) |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
730 jvm_lib_path = jvm_lib_found; |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
731 } |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
732 } |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
733 } |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
734 # endif |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
735 |
2a57165f892c
detect JVM at run time on macOS (bug #54219)
Andrew Janke <andrew@apjanke.net>
parents:
26568
diff
changeset
|
736 if (jvm_lib_path.empty ()) |
25770
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
737 { |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
738 #if defined (OCTAVE_USE_WINDOWS_API) |
25770
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
739 jvm_lib_path = get_jvm_lib_path_from_registry (); |
20945
9d9270e2f98f
eliminate comments after preprocessor conditionals
John W. Eaton <jwe@octave.org>
parents:
20939
diff
changeset
|
740 #else |
25770
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
741 // Fall back to JAVA_LDPATH, determined by the build system |
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
742 jvm_lib_path = std::string (JAVA_LDPATH) + "/" LIBJVM_FILE_NAME; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
743 #endif |
25770
374edade7b1b
fix use of JAVA_HOME to fail if not found and fall back correctly (bug #40111)
Mike Miller <mtmiller@octave.org>
parents:
25744
diff
changeset
|
744 } |
25744
3ddd74bd7b11
Use JAVA_HOME for JVM detection at run-time (bug #40111).
Andrew Janke <andrew@apjanke.net>
parents:
25604
diff
changeset
|
745 |
24684
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
746 lib = octave::dynamic_library (jvm_lib_path); |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
747 |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
748 if (! lib) |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
749 error ("unable to load Java Runtime Environment from %s", |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
750 jvm_lib_path.c_str ()); |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
751 |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
752 create_vm = reinterpret_cast<JNI_CreateJavaVM_t> |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
753 (lib.search ("JNI_CreateJavaVM")); |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
754 get_vm = reinterpret_cast<JNI_GetCreatedJavaVMs_t> |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
755 (lib.search ("JNI_GetCreatedJavaVMs")); |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
756 |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
757 if (! create_vm) |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
758 error ("unable to find JNI_CreateJavaVM in %s", jvm_lib_path.c_str ()); |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
759 |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
760 if (! get_vm) |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
761 error ("unable to find JNI_GetCreatedJavaVMs in %s", |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
762 jvm_lib_path.c_str ()); |
037ace76257d
ov-java.cc: Use new functions in initialization of JVM.
Markus Mützel <markus.muetzel@gmx.de>
parents:
24671
diff
changeset
|
763 } |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
764 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
765 //! The number of created jvm's. |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
766 jsize nVMs = 0; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
767 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
768 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
|
769 { |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
770 // At least one JVM exists, try to attach the current thread to it. |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
771 |
19861
19755f4fc851
maint: Cleanup C++ code to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19598
diff
changeset
|
772 switch (jvm->GetEnv (reinterpret_cast<void **> (¤t_env), |
23929
20c83f619102
bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803)
Mike Miller <mtmiller@octave.org>
parents:
23807
diff
changeset
|
773 JNI_VERSION_1_6)) |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
774 { |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
775 case JNI_EDETACHED: |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
776 // Attach the current thread |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
777 JavaVMAttachArgs m_vm_args; |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
778 m_vm_args.version = JNI_VERSION_1_6; |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
779 m_vm_args.name = const_cast<char *> ("octave"); |
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
780 m_vm_args.group = nullptr; |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
781 if (jvm->AttachCurrentThread (reinterpret_cast<void **> (¤t_env), |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
782 &m_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
|
783 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
|
784 break; |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
785 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
786 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
|
787 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
|
788 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
789 case JNI_OK: |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
790 // 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
|
791 break; |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
792 } |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
793 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
794 jvm_attached = true; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
795 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
796 else |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
797 { |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
798 // No JVM exists, create one |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
799 |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
800 octave::JVMArgs m_vm_args; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
801 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
802 // Hard-coded options for the jvm. |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
803 m_vm_args.add ("-Djava.class.path=" + initial_class_path ()); |
28527
9e7b2625e574
ov-java.cc: Set reaper thread to use default stack size (bug #58641).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28490
diff
changeset
|
804 #if defined (HAVE_BROKEN_PTHREAD_STACKSIZE) |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
805 m_vm_args.add ("-Djdk.lang.processReaperUseDefaultStackSize=true"); |
28527
9e7b2625e574
ov-java.cc: Set reaper thread to use default stack size (bug #58641).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28490
diff
changeset
|
806 #endif |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
807 m_vm_args.add ("-Xrs"); |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
808 |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
809 // Additional options given by file java.opts. |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
810 m_vm_args.read_java_opts (initial_java_dir () + |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22331
diff
changeset
|
811 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
|
812 "java.opts"); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
813 |
30064
0d32dcc699cd
maint: use "m_" prefix for member variables in class JVMArgs.
Rik <rik@octave.org>
parents:
30045
diff
changeset
|
814 if (create_vm (&jvm, ¤t_env, m_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
|
815 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
|
816 } |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
817 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
818 jvm_lib = lib; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
819 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
820 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
|
821 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
822 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
823 //! Terminate the current jvm, if there is any. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
824 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
825 //! Otherwise, detach the jvm if this thread is attached to it and unload it |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
826 //! if this thread created it itself. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
827 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
828 //! @see #initialize_jvm() |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
829 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
830 static void |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
831 terminate_jvm (void) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
832 { |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
833 // There is nothing to do if jvm is not set (= nullptr). |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
834 if (jvm) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
835 { |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
836 // FIXME: Seems that if jvm_attached is always true if jvm is not null. |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
837 if (jvm_attached) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
838 jvm->DetachCurrentThread (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
839 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
840 jvm->DestroyJavaVM (); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
841 |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
842 jvm = nullptr; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
843 jvm_attached = false; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
844 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
845 if (jvm_lib) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
846 jvm_lib.close (); |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
847 |
21894 | 848 octave_set_default_fpucw (); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
849 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
850 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
851 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
852 //! Converts a Java string object to std::string. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
853 //!{ |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
854 static std::string |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
855 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
|
856 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
857 std::string retval; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
858 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
859 if (jni_env) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
860 { |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
861 const char *cstr = jni_env->GetStringUTFChars (s, nullptr); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
862 retval = cstr; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
863 jni_env->ReleaseStringUTFChars (s, cstr); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
864 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
865 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
866 return retval; |
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 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
869 static std::string |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
870 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
|
871 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
872 std::string retval; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
873 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
874 if (jni_env && obj) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
875 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
876 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
|
877 if (cls) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
878 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
879 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
|
880 retval = jstring_to_string (jni_env, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
881 reinterpret_cast<jstring> (obj)); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
882 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
883 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
884 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
885 return retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
886 } |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
887 //!} |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
888 |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
889 //! Returns a reference to the jni (java native interface) environment of the |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
890 //! Java virtual machine #jvm. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
891 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
892 //! @returns A reference to jni, if #jvm is present, otherwise @c nullptr. |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
893 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
894 static inline JNIEnv * |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
895 thread_jni_env (void) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
896 { |
23457
21baad6b35c4
maint: Use C++11 nullptr rather than 0 or NULL when possible.
Rik <rik@octave.org>
parents:
23449
diff
changeset
|
897 JNIEnv *env = nullptr; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
898 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
899 if (jvm) |
23929
20c83f619102
bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803)
Mike Miller <mtmiller@octave.org>
parents:
23807
diff
changeset
|
900 jvm->GetEnv (reinterpret_cast<void **> (&env), JNI_VERSION_1_6); |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
901 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
902 return env; |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
903 } |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
904 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
905 #endif |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
906 |
15824
abc9e5f3c661
Return correct value for ischar() predicate test on octave_java objects.
Rik <rik@octave.org>
parents:
15822
diff
changeset
|
907 bool |
abc9e5f3c661
Return correct value for ischar() predicate test on octave_java objects.
Rik <rik@octave.org>
parents:
15822
diff
changeset
|
908 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
|
909 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
910 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
911 |
15824
abc9e5f3c661
Return correct value for ischar() predicate test on octave_java objects.
Rik <rik@octave.org>
parents:
15822
diff
changeset
|
912 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
|
913 |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
914 if (current_env && m_java_object) |
15824
abc9e5f3c661
Return correct value for ischar() predicate test on octave_java objects.
Rik <rik@octave.org>
parents:
15822
diff
changeset
|
915 { |
abc9e5f3c661
Return correct value for ischar() predicate test on octave_java objects.
Rik <rik@octave.org>
parents:
15822
diff
changeset
|
916 jclass_ref cls (current_env, current_env->FindClass ("java/lang/String")); |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
917 return current_env->IsInstanceOf (TO_JOBJECT (m_java_object), cls); |
15824
abc9e5f3c661
Return correct value for ischar() predicate test on octave_java objects.
Rik <rik@octave.org>
parents:
15822
diff
changeset
|
918 } |
abc9e5f3c661
Return correct value for ischar() predicate test on octave_java objects.
Rik <rik@octave.org>
parents:
15822
diff
changeset
|
919 |
abc9e5f3c661
Return correct value for ischar() predicate test on octave_java objects.
Rik <rik@octave.org>
parents:
15822
diff
changeset
|
920 return false; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
921 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
922 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
923 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
924 // This shouldn't happen because construction of octave_java objects is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
925 // supposed to be impossible if Java is not available. |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
926 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
927 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
928 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
929 #endif |
15824
abc9e5f3c661
Return correct value for ischar() predicate test on octave_java objects.
Rik <rik@octave.org>
parents:
15822
diff
changeset
|
930 } |
abc9e5f3c661
Return correct value for ischar() predicate test on octave_java objects.
Rik <rik@octave.org>
parents:
15822
diff
changeset
|
931 |
20028
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
932 bool |
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
933 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
|
934 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
935 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
936 |
20028
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
937 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
|
938 |
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
939 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
|
940 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
|
941 |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
942 if (current_env && m_java_object) |
20028
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
943 { |
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
944 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
|
945 if (current_env->ExceptionCheck ()) |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
946 current_env->ExceptionClear (); |
20028
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
947 else |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
948 return current_env->IsInstanceOf (TO_JOBJECT (m_java_object), cls); |
20028
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
949 } |
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
950 return false; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
951 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
952 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
953 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
954 octave_unused_parameter (cls_name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
955 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
956 // This shouldn't happen because construction of octave_java objects is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
957 // supposed to be impossible if Java is not available. |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
958 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
959 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
960 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
961 #endif |
20028
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
962 } |
107130a0490c
isa: check parent class of java objects (bug #42702)
Carnë Draug <carandraug@octave.org>
parents:
19861
diff
changeset
|
963 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
964 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
965 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
966 static octave_value |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
967 check_exception (JNIEnv *jni_env) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
968 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
969 octave_value retval; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
970 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
971 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
|
972 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
973 if (ex) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
974 { |
15800
d9b8333df5e4
Deprecate java_debug, java_convert_matrix, java_unsigned_conversion.
Rik <rik@octave.org>
parents:
15798
diff
changeset
|
975 if (Vdebug_java) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
976 jni_env->ExceptionDescribe (); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
977 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
978 jni_env->ExceptionClear (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
979 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
980 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
|
981 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
|
982 "()Ljava/lang/String;"); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
983 jstring_ref js (jni_env, |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
984 reinterpret_cast<jstring> (jni_env->CallObjectMethod (ex, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
985 mID))); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
986 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
|
987 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
988 error ("[java] %s", msg.c_str ()); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
989 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
990 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
991 retval = Matrix (); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
992 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
993 return retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
994 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
995 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
996 static jclass |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
997 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
|
998 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
999 static std::string class_loader; |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
1000 static jclass uiClass = nullptr; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1001 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1002 jclass jcls = jni_env->FindClass (name); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1003 |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
1004 if (jcls == nullptr) |
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 jni_env->ExceptionClear (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1007 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1008 if (! uiClass) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1009 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1010 if (class_loader.empty ()) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1011 { |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1012 jclass_ref syscls (jni_env, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1013 jni_env->FindClass ("java/lang/System")); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1014 jmethodID mID = jni_env->GetStaticMethodID |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1015 (syscls, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1016 "getProperty", |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1017 "(Ljava/lang/String;)Ljava/lang/String;"); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1018 jstring_ref js (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1019 jni_env->NewStringUTF ("octave.class.loader")); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1020 js = reinterpret_cast<jstring> (jni_env->CallStaticObjectMethod |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1021 (syscls, mID, jstring (js))); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1022 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
|
1023 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
|
1024 '.', '/'); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1025 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1026 |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1027 jclass_ref uicls (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1028 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
|
1029 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1030 if (! uicls) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1031 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1032 jni_env->ExceptionClear (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1033 |
20946 | 1034 // Try the netbeans way |
19861
19755f4fc851
maint: Cleanup C++ code to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19598
diff
changeset
|
1035 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
|
1036 '/', '.'); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1037 jclass_ref jcls2 (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1038 jni_env->FindClass ("org/openide/util/Lookup")); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1039 jmethodID mID = jni_env->GetStaticMethodID |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1040 (jcls2, "getDefault", "()Lorg/openide/util/Lookup;"); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1041 jobject_ref lObj (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1042 jni_env->CallStaticObjectMethod (jcls2, mID)); |
19861
19755f4fc851
maint: Cleanup C++ code to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19598
diff
changeset
|
1043 mID = jni_env->GetMethodID (jcls2, "lookup", |
19755f4fc851
maint: Cleanup C++ code to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19598
diff
changeset
|
1044 "(Ljava/lang/Class;)Ljava/lang/Object;"); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1045 jclass_ref cLoaderCls (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1046 jni_env->FindClass ("java/lang/ClassLoader")); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1047 jobject_ref cLoader (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1048 jni_env->CallObjectMethod |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1049 (lObj, mID, jclass (cLoaderCls))); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1050 mID = jni_env->GetMethodID (cLoaderCls, "loadClass", |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1051 "(Ljava/lang/String;)Ljava/lang/Class;"); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1052 jstring_ref js (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1053 jni_env->NewStringUTF (class_loader.c_str ())); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1054 uicls = reinterpret_cast<jclass> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1055 (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
|
1056 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1057 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1058 if (uicls) |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1059 uiClass = reinterpret_cast<jclass> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1060 (jni_env->NewGlobalRef (jclass (uicls))); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1061 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1062 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1063 if (uiClass) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1064 { |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1065 jmethodID mID = jni_env->GetStaticMethodID |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1066 (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
|
1067 jstring_ref js (jni_env, jni_env->NewStringUTF (name)); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1068 jcls = reinterpret_cast<jclass> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1069 (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
|
1070 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1071 } |
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 jcls; |
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 dim_vector |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1077 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
|
1078 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1079 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
|
1080 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
|
1081 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
|
1082 jmethodID isArray_ID = jni_env->GetMethodID (ccls, "isArray", "()Z"); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1083 jmethodID getComponentType_ID = jni_env->GetMethodID (ccls, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1084 "getComponentType", |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1085 "()Ljava/lang/Class;"); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1086 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1087 dim_vector dv (1, 1); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1088 int idx = 0; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1089 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1090 jobj.detach (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1091 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
|
1092 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1093 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
|
1094 if (idx >= dv.ndims ()) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1095 dv.resize (idx+1); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1096 dv(idx) = len; |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1097 jcls = reinterpret_cast<jclass> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1098 (jni_env->CallObjectMethod (jcls, getComponentType_ID)); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1099 jobj = len > 0 |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1100 ? reinterpret_cast<jobjectArray> (jni_env->GetObjectArrayElement (jobj, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1101 0)) |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
1102 : nullptr; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1103 idx++; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1104 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1105 |
21894 | 1106 octave_set_default_fpucw (); |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
1107 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1108 return dv; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1109 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1110 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1111 static jobject |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1112 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
|
1113 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1114 jclass_ref ocls (jni_env, jni_env->FindClass ("[I")); |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
1115 jobjectArray retval = jni_env->NewObjectArray (idx.length (), ocls, nullptr); |
27932
b018f553fd85
maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
1116 // Here retval has the same length as idx |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1117 |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1118 // 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
|
1119 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
|
1120 try |
dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
20531
diff
changeset
|
1121 { |
29569
29a1f8fd8ee6
move idx_vector classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1122 octave::idx_vector v = idx(i).index_vector (); |
20542
dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
20531
diff
changeset
|
1123 |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
1124 jintArray_ref i_array (jni_env, jni_env->NewIntArray (v.length ())); |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
1125 jint *buf = jni_env->GetIntArrayElements (i_array, nullptr); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1126 // Here, buf points to the beginning of i_array |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1127 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1128 // Copy v to buf. |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
1129 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
|
1130 buf[k] = v(k); |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
1131 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1132 // Set retval[i] = i_array |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
1133 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
|
1134 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
|
1135 |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
1136 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
|
1137 } |
29163
8f67ad8b3103
maint: Updating naming conventions for exceptions and use const where possible.
Rik <rik@octave.org>
parents:
29007
diff
changeset
|
1138 catch (octave::index_exception& ie) |
20542
dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
20531
diff
changeset
|
1139 { |
dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
20531
diff
changeset
|
1140 // Rethrow to allow more info to be reported later. |
29163
8f67ad8b3103
maint: Updating naming conventions for exceptions and use const where possible.
Rik <rik@octave.org>
parents:
29007
diff
changeset
|
1141 ie.set_pos_if_unset (idx.length (), i + 1); |
20542
dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
20531
diff
changeset
|
1142 throw; |
dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
20531
diff
changeset
|
1143 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1144 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1145 return retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1146 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1147 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1148 static octave_value |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1149 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
|
1150 const octave_value_list& idx) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1151 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1152 octave_value retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1153 jobject_ref resObj (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1154 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
|
1155 |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1156 jclass_ref helperClass (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1157 find_octave_class (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1158 "org/octave/ClassHelper")); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1159 jmethodID mID = jni_env |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1160 ->GetStaticMethodID (helperClass, "arraySubsref", |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1161 "(Ljava/lang/Object;[[I)Ljava/lang/Object;"); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1162 resObj = jni_env->CallStaticObjectMethod |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1163 (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
|
1164 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1165 if (resObj) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1166 retval = box (jni_env, resObj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1167 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1168 retval = check_exception (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1169 |
21894 | 1170 octave_set_default_fpucw (); |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
1171 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1172 return retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1173 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1174 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1175 static octave_value |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1176 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
|
1177 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
|
1178 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1179 octave_value retval; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1180 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1181 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
|
1182 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
|
1183 jobject_ref rhsObj (jni_env); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1184 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
|
1185 |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
1186 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
|
1187 { |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1188 jclass_ref helperClass (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1189 find_octave_class (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1190 "org/octave/ClassHelper")); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1191 jmethodID mID = jni_env->GetStaticMethodID (helperClass, "arraySubsasgn", |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1192 "(Ljava/lang/Object;[[ILjava/lang/Object;)" "Ljava/lang/Object;"); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1193 resObj = jni_env->CallStaticObjectMethod |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1194 (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
|
1195 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1196 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1197 if (resObj) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1198 retval = box (jni_env, resObj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1199 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1200 retval = check_exception (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1201 |
21894 | 1202 octave_set_default_fpucw (); |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
1203 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1204 return retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1205 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1206 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1207 static string_vector |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1208 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
|
1209 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1210 jobject jobj = TO_JOBJECT (jobj_arg); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1211 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1212 std::list<std::string> name_list; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1213 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1214 if (jni_env) |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1215 { |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1216 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
|
1217 jclass_ref ccls (jni_env, jni_env->GetObjectClass (cls)); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1218 jmethodID getMethods_ID = jni_env->GetMethodID |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1219 (ccls, "getMethods", "()[Ljava/lang/reflect/Method;"); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1220 jmethodID getFields_ID = jni_env->GetMethodID |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1221 (ccls, "getFields", "()[Ljava/lang/reflect/Field;"); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1222 jobjectArray_ref mList (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1223 reinterpret_cast<jobjectArray> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1224 (jni_env->CallObjectMethod (cls, getMethods_ID))); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1225 jobjectArray_ref fList (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1226 reinterpret_cast<jobjectArray> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1227 (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
|
1228 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
|
1229 int fLen = jni_env->GetArrayLength (fList); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1230 jclass_ref mCls (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1231 jni_env->FindClass ("java/lang/reflect/Method")); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1232 jclass_ref fCls (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1233 jni_env->FindClass ("java/lang/reflect/Field")); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1234 jmethodID m_getName_ID = jni_env->GetMethodID (mCls, "getName", |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1235 "()Ljava/lang/String;"); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1236 jmethodID f_getName_ID = jni_env->GetMethodID (fCls, "getName", |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1237 "()Ljava/lang/String;"); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1238 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1239 for (int i = 0; i < mLen; i++) |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1240 { |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1241 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
|
1242 jstring_ref methName (jni_env, reinterpret_cast<jstring> |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1243 (jni_env->CallObjectMethod (meth, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1244 m_getName_ID))); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1245 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
|
1246 } |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1247 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1248 for (int i = 0; i < fLen; i++) |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1249 { |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1250 jobject_ref field (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1251 jni_env->GetObjectArrayElement (fList, i)); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1252 jstring_ref fieldName (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1253 reinterpret_cast<jstring> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1254 (jni_env->CallObjectMethod |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1255 (field, f_getName_ID))); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1256 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
|
1257 } |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
1258 |
21894 | 1259 octave_set_default_fpucw (); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1260 } |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1261 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1262 string_vector v (name_list); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1263 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1264 return v.sort (true); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1265 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1266 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1267 static octave_value |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
1268 convert_to_string (JNIEnv *jni_env, jobject m_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
|
1269 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1270 octave_value retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1271 |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
1272 if (jni_env && m_java_object) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1273 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1274 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
|
1275 |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
1276 if (jni_env->IsInstanceOf (m_java_object, cls)) |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
1277 retval = octave_value (jstring_to_string (jni_env, m_java_object), type); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1278 else if (force) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1279 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1280 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
|
1281 |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
1282 if (jni_env->IsInstanceOf (m_java_object, cls)) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1283 { |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
1284 jobjectArray array = reinterpret_cast<jobjectArray> (m_java_object); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1285 int len = jni_env->GetArrayLength (array); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1286 Cell c (len, 1); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1287 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1288 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
|
1289 { |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1290 jstring_ref js (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1291 reinterpret_cast<jstring> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1292 (jni_env->GetObjectArrayElement (array, i))); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1293 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1294 if (js) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1295 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
|
1296 else |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
1297 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
|
1298 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1299 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1300 retval = octave_value (c); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1301 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1302 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1303 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1304 cls = jni_env->FindClass ("java/lang/Object"); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1305 jmethodID mID = jni_env->GetMethodID (cls, "toString", |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1306 "()Ljava/lang/String;"); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1307 jstring_ref js (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1308 reinterpret_cast<jstring> |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
1309 (jni_env->CallObjectMethod (m_java_object, |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1310 mID))); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1311 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1312 if (js) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1313 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
|
1314 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1315 retval = check_exception (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1316 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1317 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1318 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1319 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
|
1320 |
21894 | 1321 octave_set_default_fpucw (); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1322 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1323 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1324 return retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1325 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1326 |
23447
db1fdf4384dd
maint: Use convention "static_cast<void *>" for casting of pointers.
Rik <rik@octave.org>
parents:
23446
diff
changeset
|
1327 #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
|
1328 |
22202
f094186125d3
Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013)
Ernst Reissner <rei3ner@arcor.de>
parents:
22146
diff
changeset
|
1329 //! 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
|
1330 //! 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
|
1331 //! |
f094186125d3
Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013)
Ernst Reissner <rei3ner@arcor.de>
parents:
22146
diff
changeset
|
1332 //! 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
|
1333 //! @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
|
1334 //! 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
|
1335 //! |
f094186125d3
Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013)
Ernst Reissner <rei3ner@arcor.de>
parents:
22146
diff
changeset
|
1336 //! @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
|
1337 //! @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
|
1338 //! 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
|
1339 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
|
1340 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
|
1341 { |
f094186125d3
Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013)
Ernst Reissner <rei3ner@arcor.de>
parents:
22146
diff
changeset
|
1342 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
|
1343 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
|
1344 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
|
1345 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
|
1346 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
|
1347 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
|
1348 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
|
1349 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
|
1350 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
|
1351 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
|
1352 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
|
1353 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
|
1354 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
|
1355 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
|
1356 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
|
1357 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
|
1358 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
|
1359 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
|
1360 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
|
1361 |
f094186125d3
Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013)
Ernst Reissner <rei3ner@arcor.de>
parents:
22146
diff
changeset
|
1362 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
|
1363 } |
f094186125d3
Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013)
Ernst Reissner <rei3ner@arcor.de>
parents:
22146
diff
changeset
|
1364 |
f094186125d3
Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013)
Ernst Reissner <rei3ner@arcor.de>
parents:
22146
diff
changeset
|
1365 //! Convert 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
|
1366 //! 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
|
1367 //! |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1368 //! @param jni_env JNI environment pointer. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1369 //! @param jobj_arg Pointer to a Java object. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1370 //! @param jcls_arg Optional pointer to the Java class of @c jobj_arg. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1371 //! |
22202
f094186125d3
Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013)
Ernst Reissner <rei3ner@arcor.de>
parents:
22146
diff
changeset
|
1372 //! @return |
f094186125d3
Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013)
Ernst Reissner <rei3ner@arcor.de>
parents:
22146
diff
changeset
|
1373 //! @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
|
1374 //! @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
|
1375 //! @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
|
1376 //! @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
|
1377 //! @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
|
1378 //! 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
|
1379 //! @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
|
1380 //! #Vjava_matrix_autoconversion is enabled |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1381 //! @arg Octave object if @c jobj_arg is of type |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1382 //! @c org.octave.OctaveReference |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1383 //! @arg @c octave_java object wrapping the Java object otherwise. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1384 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1385 static octave_value |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1386 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
|
1387 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1388 octave_value retval; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1389 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1390 jobject jobj = TO_JOBJECT (jobj_arg); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1391 jclass jcls = TO_JCLASS (jcls_arg); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1392 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1393 jclass_ref cls (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1394 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1395 if (! jobj) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1396 retval = Matrix (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1397 |
15821
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1398 while (retval.is_undefined ()) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1399 { |
22202
f094186125d3
Only convert specific Java numeric objects to double for Matlab compatibility (bug #48013)
Ernst Reissner <rei3ner@arcor.de>
parents:
22146
diff
changeset
|
1400 // 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
|
1401 // (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
|
1402 // 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
|
1403 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
|
1404 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
|
1405 && 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
|
1406 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1407 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
|
1408 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
|
1409 break; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1410 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1411 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1412 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
|
1413 if (jni_env->IsInstanceOf (jobj, cls)) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1414 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1415 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
|
1416 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
|
1417 break; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1418 } |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1419 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1420 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
|
1421 if (jni_env->IsInstanceOf (jobj, cls)) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1422 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1423 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
|
1424 break; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1425 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1426 |
15815
f28b3dcbaa9a
Add autoconversion between java.lang.Character class and Octave string class.
Rik <rik@octave.org>
parents:
15813
diff
changeset
|
1427 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
|
1428 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
|
1429 { |
f28b3dcbaa9a
Add autoconversion between java.lang.Character class and Octave string class.
Rik <rik@octave.org>
parents:
15813
diff
changeset
|
1430 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
|
1431 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
|
1432 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
|
1433 break; |
15815
f28b3dcbaa9a
Add autoconversion between java.lang.Character class and Octave string class.
Rik <rik@octave.org>
parents:
15813
diff
changeset
|
1434 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1435 |
20120
2db2db2df55b
Automatically convert arrays of java primitives into Octave types (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20028
diff
changeset
|
1436 #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
|
1437 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
|
1438 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
|
1439 { \ |
2db2db2df55b
Automatically convert arrays of java primitives into Octave types (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20028
diff
changeset
|
1440 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
|
1441 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
|
1442 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
|
1443 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
|
1444 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
|
1445 retval = d; \ |
2db2db2df55b
Automatically convert arrays of java primitives into Octave types (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20028
diff
changeset
|
1446 break; \ |
2db2db2df55b
Automatically convert arrays of java primitives into Octave types (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20028
diff
changeset
|
1447 } |
2db2db2df55b
Automatically convert arrays of java primitives into Octave types (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20028
diff
changeset
|
1448 |
20254
a51fe1b60e3f
Put most used conversions first in Java box/unbox routines.
Rik <rik@octave.org>
parents:
20253
diff
changeset
|
1449 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
|
1450 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
|
1451 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
|
1452 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
|
1453 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
|
1454 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
|
1455 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
|
1456 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
|
1457 |
2db2db2df55b
Automatically convert arrays of java primitives into Octave types (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20028
diff
changeset
|
1458 #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
|
1459 |
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
|
1460 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
|
1461 { |
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1462 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
|
1463 |
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
|
1464 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
|
1465 { |
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
|
1466 jmethodID mID = jni_env->GetMethodID (cls, "getDims", "()[I"); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1467 jintArray_ref iv (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1468 reinterpret_cast<jintArray> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1469 (jni_env->CallObjectMethod (jobj, mID))); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1470 jint *iv_data = jni_env->GetIntArrayElements (jintArray (iv), |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1471 nullptr); |
15821
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1472 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
|
1473 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
|
1474 |
21660
53728df3e4c9
maint: for clarity, call ndims() rather than length() on dimension vectors.
Rik <rik@octave.org>
parents:
21580
diff
changeset
|
1475 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
|
1476 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
|
1477 |
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1478 jni_env->ReleaseIntArrayElements (jintArray (iv), iv_data, 0); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1479 mID = jni_env->GetMethodID (cls, "getClassName", |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1480 "()Ljava/lang/String;"); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1481 jstring_ref js (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1482 reinterpret_cast<jstring> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1483 (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
|
1484 |
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1485 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
|
1486 |
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1487 if (s == "double") |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1488 { |
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
|
1489 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
|
1490 mID = jni_env->GetMethodID (cls, "toDouble", "()[D"); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1491 jdoubleArray_ref dv (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1492 reinterpret_cast<jdoubleArray> |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1493 (jni_env->CallObjectMethod (jobj, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1494 mID))); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1495 jni_env->GetDoubleArrayRegion (dv, 0, m.numel (), |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1496 m.fortran_vec ()); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1497 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
|
1498 break; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1499 } |
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
|
1500 else if (s == "byte") |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1501 { |
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
|
1502 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
|
1503 { |
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1504 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
|
1505 mID = jni_env->GetMethodID (cls, "toByte", "()[B"); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1506 jbyteArray_ref dv (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1507 reinterpret_cast<jbyteArray> |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1508 (jni_env->CallObjectMethod (jobj, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1509 mID))); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1510 jni_env->GetByteArrayRegion (dv, 0, m.numel (), |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1511 reinterpret_cast<jbyte *> |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1512 (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
|
1513 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
|
1514 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
|
1515 } |
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1516 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
|
1517 { |
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1518 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
|
1519 mID = jni_env->GetMethodID (cls, "toByte", "()[B"); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1520 jbyteArray_ref dv (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1521 reinterpret_cast<jbyteArray> |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1522 (jni_env->CallObjectMethod (jobj, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1523 mID))); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1524 jni_env->GetByteArrayRegion (dv, 0, m.numel (), |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1525 reinterpret_cast<jbyte *> |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1526 (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
|
1527 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
|
1528 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
|
1529 } |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1530 } |
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
|
1531 else if (s == "integer") |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1532 { |
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
|
1533 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
|
1534 { |
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1535 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
|
1536 mID = jni_env->GetMethodID (cls, "toInt", "()[I"); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1537 jintArray_ref dv (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1538 reinterpret_cast<jintArray> |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1539 (jni_env->CallObjectMethod (jobj, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1540 mID))); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1541 jni_env->GetIntArrayRegion (dv, 0, m.numel (), |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1542 reinterpret_cast<jint *> |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1543 (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
|
1544 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
|
1545 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
|
1546 } |
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1547 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
|
1548 { |
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1549 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
|
1550 mID = jni_env->GetMethodID (cls, "toInt", "()[I"); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1551 jintArray_ref dv (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1552 reinterpret_cast<jintArray> |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1553 (jni_env->CallObjectMethod (jobj, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1554 mID))); |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1555 jni_env->GetIntArrayRegion (dv, 0, m.numel (), |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1556 reinterpret_cast<jint *> |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1557 (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
|
1558 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
|
1559 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
|
1560 } |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1561 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1562 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1563 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1564 |
15744
686580b1a934
eliminate most compilation warnings for __java__.cc
John W. Eaton <jwe@octave.org>
parents:
15743
diff
changeset
|
1565 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
|
1566 if (jni_env->IsInstanceOf (jobj, cls)) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1567 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1568 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
|
1569 int ID = jni_env->CallIntMethod (jobj, mID); |
25337
3ff9192b676e
use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents:
25305
diff
changeset
|
1570 auto it = octave_ref_map.find (ID); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1571 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1572 if (it != octave_ref_map.end ()) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1573 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
|
1574 break; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1575 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1576 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1577 // No suitable class found. Return a generic octave_java object. |
15821
72661fe4b9e5
Short-circuit out of Java box code as soon as valid class has been found.
Rik <rik@octave.org>
parents:
15820
diff
changeset
|
1578 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
|
1579 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
|
1580 } |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1581 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1582 return retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1583 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1584 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1585 static octave_value |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1586 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
|
1587 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1588 jobject jobj = TO_JOBJECT (jobj_arg); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1589 jclass jcls = TO_JCLASS (jcls_arg); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1590 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1591 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
|
1592 |
23578
7b47b7c2d6c7
maint: Deprecate is_java and replace with isjava.
Rik <rik@octave.org>
parents:
23577
diff
changeset
|
1593 if (retval.isjava ()) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1594 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1595 retval = octave_value (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1596 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1597 jclass_ref cls (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1598 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1599 if (retval.is_undefined ()) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1600 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1601 cls = jni_env->FindClass ("[D"); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1602 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1603 if (jni_env->IsInstanceOf (jobj, cls)) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1604 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1605 jdoubleArray jarr = reinterpret_cast<jdoubleArray> (jobj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1606 int len = jni_env->GetArrayLength (jarr); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1607 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1608 if (len > 0) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1609 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1610 Matrix m (1, len); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1611 jni_env->GetDoubleArrayRegion (jarr, 0, len, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1612 m.fortran_vec ()); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1613 retval = m; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1614 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1615 else |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1616 retval = Matrix (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1617 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1618 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1619 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1620 if (retval.is_undefined ()) |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1621 { |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1622 cls = jni_env->FindClass ("[[D"); |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1623 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1624 if (jni_env->IsInstanceOf (jobj, cls)) |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1625 { |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1626 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
|
1627 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
|
1628 int cols = 0; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1629 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1630 if (rows > 0) |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1631 { |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1632 Matrix m; |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1633 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1634 for (int r = 0; r < rows; r++) |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1635 { |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1636 jdoubleArray_ref row (jni_env, |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1637 reinterpret_cast<jdoubleArray> |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1638 (jni_env->GetObjectArrayElement |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
1639 (jarr, r))); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1640 |
23577
80c42f4cca13
maint: Deprecate is_empty and replace with isempty.
Rik <rik@octave.org>
parents:
23576
diff
changeset
|
1641 if (m.isempty ()) |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1642 { |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1643 cols = jni_env->GetArrayLength (row); |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1644 m.resize (cols, rows); |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1645 } |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1646 jni_env->GetDoubleArrayRegion |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1647 (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
|
1648 } |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1649 retval = m.transpose (); |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1650 } |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1651 else |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1652 retval = Matrix (); |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1653 } |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1654 } |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1655 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1656 if (retval.is_undefined ()) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1657 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1658 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
|
1659 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1660 if (jni_env->IsInstanceOf (jobj, cls)) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1661 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1662 jobjectArray jarr = reinterpret_cast<jobjectArray> (jobj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1663 int len = jni_env->GetArrayLength (jarr); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1664 Cell m (len, 1); |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1665 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1666 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
|
1667 { |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1668 jstring_ref js (jni_env, |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1669 reinterpret_cast<jstring> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1670 (jni_env->GetObjectArrayElement (jarr, i))); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1671 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
|
1672 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1673 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1674 retval = m; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1675 } |
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 } |
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 if (retval.is_undefined ()) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1680 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
|
1681 |
21894 | 1682 octave_set_default_fpucw (); |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
1683 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1684 return retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1685 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1686 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1687 static bool |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1688 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
|
1689 jclass_ref& jcls) |
15625
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 bool found = true; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1692 |
23578
7b47b7c2d6c7
maint: Deprecate is_java and replace with isjava.
Rik <rik@octave.org>
parents:
23577
diff
changeset
|
1693 if (val.isjava ()) |
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 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
|
1696 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
|
1697 jobj.detach (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1698 jcls = jni_env->GetObjectClass (jobj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1699 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1700 else if (val.is_string ()) |
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 std::string s = val.string_value (); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1703 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1704 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
|
1705 jcls = jni_env->GetObjectClass (jobj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1706 } |
23575
e95738a119da
maint: Deprecate is_cellstr and replace with iscellstr.
Rik <rik@octave.org>
parents:
23573
diff
changeset
|
1707 else if (val.iscellstr ()) |
20260
137f183b7dee
Fix conversion from string cell array into java's String[] (bug #45290)
Carnë Draug <carandraug@octave.org>
parents:
20250
diff
changeset
|
1708 { |
137f183b7dee
Fix conversion from string cell array into java's String[] (bug #45290)
Carnë Draug <carandraug@octave.org>
parents:
20250
diff
changeset
|
1709 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
|
1710 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
|
1711 |
20260
137f183b7dee
Fix conversion from string cell array into java's String[] (bug #45290)
Carnë Draug <carandraug@octave.org>
parents:
20250
diff
changeset
|
1712 jclass_ref scls (jni_env, jni_env->FindClass ("java/lang/String")); |
23459
ddcbf10c8c39
maint: Use C++11 nullptr rather than 0 or NULL for remaining instances in code.
Rik <rik@octave.org>
parents:
23457
diff
changeset
|
1713 jobjectArray array = jni_env->NewObjectArray (n, scls, nullptr); |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1714 |
20260
137f183b7dee
Fix conversion from string cell array into java's String[] (bug #45290)
Carnë Draug <carandraug@octave.org>
parents:
20250
diff
changeset
|
1715 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
|
1716 { |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1717 jstring_ref jstr (jni_env, jni_env->NewStringUTF |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1718 (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
|
1719 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
|
1720 } |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1721 |
20260
137f183b7dee
Fix conversion from string cell array into java's String[] (bug #45290)
Carnë Draug <carandraug@octave.org>
parents:
20250
diff
changeset
|
1722 jobj = array; |
137f183b7dee
Fix conversion from string cell array into java's String[] (bug #45290)
Carnë Draug <carandraug@octave.org>
parents:
20250
diff
changeset
|
1723 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
|
1724 } |
23592
80e3bfb7bd5a
maint: Deprecate is_vector and replace with isvector.
Rik <rik@octave.org>
parents:
23585
diff
changeset
|
1725 else if (val.numel () > 1 && val.dims ().isvector ()) |
20122
81fcf4aa9e03
Automatically convert octave vectors into java primitive arrays (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20121
diff
changeset
|
1726 { |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1727 // 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
|
1728 // using a macro? |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1729 |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1730 #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
|
1731 do \ |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1732 { \ |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1733 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
|
1734 JAVA_T ## Array jarr = jni_env->New ## JAVA_T_CAP ## Array (v.numel ()); \ |
23447
db1fdf4384dd
maint: Use convention "static_cast<void *>" for casting of pointers.
Rik <rik@octave.org>
parents:
23446
diff
changeset
|
1735 const JAVA_T *jv = reinterpret_cast<const JAVA_T *> (v.data ()); \ |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1736 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
|
1737 jobj = reinterpret_cast<jobject> (jarr); \ |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1738 jcls = jni_env->GetObjectClass (jobj); \ |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1739 } \ |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1740 while (0) |
20122
81fcf4aa9e03
Automatically convert octave vectors into java primitive arrays (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20121
diff
changeset
|
1741 |
81fcf4aa9e03
Automatically convert octave vectors into java primitive arrays (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20121
diff
changeset
|
1742 // 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
|
1743 // 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
|
1744 |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1745 if (val.is_double_type ()) |
27932
b018f553fd85
maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
1746 UNBOX_PRIMITIVE_ARRAY ( , , jdouble, Double); |
23579
c20a0fa91c0c
maint: Deprecate is_bool_type and replace with islogical.
Rik <rik@octave.org>
parents:
23578
diff
changeset
|
1747 else if (val.islogical ()) |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1748 UNBOX_PRIMITIVE_ARRAY (bool_, bool, jboolean, Boolean); |
23585
570170b6eb09
maint: Deprecate is_float_type and replace with isfloat.
Rik <rik@octave.org>
parents:
23582
diff
changeset
|
1749 else if (val.isfloat ()) |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1750 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
|
1751 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
|
1752 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
|
1753 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
|
1754 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
|
1755 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
|
1756 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
|
1757 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
|
1758 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
|
1759 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
|
1760 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
|
1761 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
|
1762 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
|
1763 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
|
1764 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
|
1765 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
|
1766 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
|
1767 |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1768 #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
|
1769 } |
20123
8261c4a11250
Convert octave integer scalars into closest java type (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20122
diff
changeset
|
1770 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
|
1771 { |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1772 // 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
|
1773 // using a macro? |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1774 |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1775 #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
|
1776 do \ |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1777 { \ |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1778 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
|
1779 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
|
1780 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
|
1781 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
|
1782 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
|
1783 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
|
1784 } \ |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1785 while (0) |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1786 |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1787 if (val.is_double_type ()) |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1788 UNBOX_PRIMITIVE_SCALAR (double, double, "java/lang/Double", "(D)V"); |
23579
c20a0fa91c0c
maint: Deprecate is_bool_type and replace with islogical.
Rik <rik@octave.org>
parents:
23578
diff
changeset
|
1789 else if (val.islogical ()) |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1790 UNBOX_PRIMITIVE_SCALAR (bool, bool, "java/lang/Boolean", "(Z)V"); |
23585
570170b6eb09
maint: Deprecate is_float_type and replace with isfloat.
Rik <rik@octave.org>
parents:
23582
diff
changeset
|
1791 else if (val.isfloat ()) |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1792 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
|
1793 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
|
1794 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
|
1795 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
|
1796 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
|
1797 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
|
1798 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
|
1799 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
|
1800 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
|
1801 else if (val.is_int32_type ()) |
21823
49d999dc443f
maint: Periodic merge of stable to default.
Mike Miller <mtmiller@octave.org>
diff
changeset
|
1802 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
|
1803 else if (val.is_uint32_type ()) |
21823
49d999dc443f
maint: Periodic merge of stable to default.
Mike Miller <mtmiller@octave.org>
diff
changeset
|
1804 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
|
1805 else if (val.is_int64_type ()) |
21823
49d999dc443f
maint: Periodic merge of stable to default.
Mike Miller <mtmiller@octave.org>
diff
changeset
|
1806 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
|
1807 else if (val.is_uint64_type ()) |
21823
49d999dc443f
maint: Periodic merge of stable to default.
Mike Miller <mtmiller@octave.org>
diff
changeset
|
1808 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
|
1809 |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1810 #undef UNBOX_PRIMITIVE_SCALAR |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22331
diff
changeset
|
1811 } |
23577
80c42f4cca13
maint: Deprecate is_empty and replace with isempty.
Rik <rik@octave.org>
parents:
23576
diff
changeset
|
1812 else if (val.isempty ()) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1813 { |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
1814 jobj = nullptr; |
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
1815 jcls = nullptr; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1816 //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
|
1817 } |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20946
diff
changeset
|
1818 else if (! Vjava_matrix_autoconversion |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1819 && ((val.is_real_matrix () |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1820 && (val.rows () == 1 || val.columns () == 1)) |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1821 || val.is_range ())) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1822 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1823 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
|
1824 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
|
1825 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
|
1826 jobj = dv; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1827 jcls = jni_env->GetObjectClass (jobj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1828 } |
15800
d9b8333df5e4
Deprecate java_debug, java_convert_matrix, java_unsigned_conversion.
Rik <rik@octave.org>
parents:
15798
diff
changeset
|
1829 else if (Vjava_matrix_autoconversion |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1830 && (val.is_matrix_type () || val.is_range ()) |
23582
0cc2011d800e
maint: Deprecate is_real_type and replace with isreal.
Rik <rik@octave.org>
parents:
23579
diff
changeset
|
1831 && val.isreal ()) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1832 { |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1833 jclass_ref mcls (jni_env, find_octave_class (jni_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1834 "org/octave/Matrix")); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1835 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
|
1836 jintArray_ref iv (jni_env, jni_env->NewIntArray (dims.ndims ())); |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
1837 jint *iv_data = jni_env->GetIntArrayElements (jintArray (iv), nullptr); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1838 |
21660
53728df3e4c9
maint: for clarity, call ndims() rather than length() on dimension vectors.
Rik <rik@octave.org>
parents:
21580
diff
changeset
|
1839 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
|
1840 iv_data[i] = dims(i); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1841 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1842 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
|
1843 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1844 if (val.is_double_type ()) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1845 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1846 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
|
1847 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
|
1848 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
|
1849 m.fortran_vec ()); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1850 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
|
1851 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
|
1852 jintArray (iv)); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1853 jcls = jni_env->GetObjectClass (jobj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1854 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1855 else if (val.is_int8_type ()) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1856 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1857 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
|
1858 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
|
1859 jni_env->SetByteArrayRegion (jbyteArray (bv), 0, m.numel (), |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1860 reinterpret_cast<jbyte *> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1861 (m.fortran_vec ())); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1862 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
|
1863 jobj = jni_env->NewObject |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1864 (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
|
1865 jcls = jni_env->GetObjectClass (jobj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1866 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1867 else if (val.is_uint8_type ()) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1868 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1869 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
|
1870 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
|
1871 jni_env->SetByteArrayRegion (jbyteArray (bv), 0, m.numel (), |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1872 reinterpret_cast<jbyte *> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1873 (m.fortran_vec ())); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1874 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
|
1875 jobj = jni_env->NewObject |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1876 (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
|
1877 jcls = jni_env->GetObjectClass (jobj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1878 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1879 else if (val.is_int32_type ()) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1880 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1881 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
|
1882 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
|
1883 jni_env->SetIntArrayRegion (jintArray (v), 0, m.numel (), |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1884 reinterpret_cast<jint *> |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1885 (m.fortran_vec ())); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1886 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
|
1887 jobj = jni_env->NewObject |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1888 (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
|
1889 jcls = jni_env->GetObjectClass (jobj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1890 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1891 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1892 { |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1893 error ("cannot convert matrix of type '%s'", |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1894 val.class_name ().c_str ()); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1895 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1896 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1897 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1898 { |
15744
686580b1a934
eliminate most compilation warnings for __java__.cc
John W. Eaton <jwe@octave.org>
parents:
15743
diff
changeset
|
1899 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
|
1900 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
|
1901 int ID = octave_java_refcount++; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1902 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1903 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
|
1904 jcls = rcls; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1905 octave_ref_map[ID] = val; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1906 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1907 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1908 return found; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1909 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1910 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1911 static bool |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
1912 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
|
1913 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
|
1914 { |
20121
41064c150724
Return bools instead of ints in oc-java box and unbox internal functions.
Carnë Draug <carandraug@octave.org>
parents:
20120
diff
changeset
|
1915 bool found = true; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1916 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1917 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
|
1918 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
|
1919 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1920 if (! jobjs) |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
1921 jobjs = jni_env->NewObjectArray (args.length (), ocls, nullptr); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1922 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1923 if (! jclss) |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
1924 jclss = jni_env->NewObjectArray (args.length (), ccls, nullptr); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1925 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1926 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
|
1927 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1928 jobject_ref jobj (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1929 jclass_ref jcls (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1930 |
20121
41064c150724
Return bools instead of ints in oc-java box and unbox internal functions.
Carnë Draug <carandraug@octave.org>
parents:
20120
diff
changeset
|
1931 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
|
1932 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
|
1933 break; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1934 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1935 jni_env->SetObjectArrayElement (jobjs, i, jobj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1936 jni_env->SetObjectArrayElement (jclss, i, jcls); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1937 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1938 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1939 return found; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1940 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1941 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1942 //! Returns the id of the current thread. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1943 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1944 //! @param jni_env The current environment or @c nullptr. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1945 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1946 //! @returns The id of the current thread or -1 otherwise. The latter happens |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1947 //! if @c jni_env is @c nullptr, for example. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1948 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1949 static long |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1950 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
|
1951 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1952 if (jni_env) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1953 { |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1954 // Call Java method static Thread java.lang.Thread.currentThread(). |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1955 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
|
1956 jmethodID mID = jni_env->GetStaticMethodID (cls, "currentThread", |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1957 "()Ljava/lang/Thread;"); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1958 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
|
1959 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1960 if (jthread) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1961 { |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1962 // Call Java method long java.lang.Thread.getId(). |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1963 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
|
1964 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
|
1965 long result = jni_env->CallLongMethod (jthread, mID); |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1966 return result; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1967 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1968 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1969 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1970 return -1; |
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 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1973 //! Run the java method @c org.octave.Octave.checkPendingAction(). |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1974 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1975 //! @returns 0 in any case for good reason. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1976 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1977 static int |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1978 java_event_hook (void) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1979 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
1980 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
|
1981 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1982 if (current_env) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1983 { |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1984 // Invoke static void org.octave.Octave.checkPendingAction(). |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1985 jclass_ref cls (current_env, find_octave_class (current_env, |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1986 "org/octave/Octave")); |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1987 jmethodID mID = current_env->GetStaticMethodID |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
1988 (cls, "checkPendingAction", "()V"); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1989 current_env->CallStaticVoidMethod (cls, mID); |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
1990 |
21894 | 1991 octave_set_default_fpucw (); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1992 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
1993 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1994 return 0; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1995 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1996 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1997 //! Initialize java including the virtual machine (jvm) if necessary. |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1998 //! |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
1999 //! Initializes the fields #jvm, #jvm_attached, #jvm_lib, and |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2000 //! #octave_thread_ID. To ensure that java is initialized, this method is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2001 //! used as part of octave functions @c javaObject, @c javaMethod, |
25041 | 2002 //! @c __java_get__, @c __java_set__, and @c __java2mat__. |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2003 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2004 static void |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2005 initialize_java (void) |
15625
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 (! jvm) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2008 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2009 try |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2010 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2011 initialize_jvm (); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2012 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2013 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
|
2014 |
21748
176536b15d68
use namespace for command_editor and command_history classes
John W. Eaton <jwe@octave.org>
parents:
21745
diff
changeset
|
2015 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
|
2016 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2017 octave_thread_ID = get_current_thread_ID (current_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2018 } |
29163
8f67ad8b3103
maint: Updating naming conventions for exceptions and use const where possible.
Rik <rik@octave.org>
parents:
29007
diff
changeset
|
2019 catch (const std::string msg) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2020 { |
26149
242aa7b2c783
Silence unnecessary warnings about security-format (bug #55046).
Rik <rik@octave.org>
parents:
26113
diff
changeset
|
2021 error ("%s", msg.c_str ()); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2022 } |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
2023 |
21894 | 2024 octave_set_default_fpucw (); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2025 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2026 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2027 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2028 JNIEXPORT jboolean JNICALL |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2029 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
|
2030 jobjectArray argin, jobjectArray argout) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2031 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2032 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
|
2033 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2034 int nargout = env->GetArrayLength (argout); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2035 int nargin = env->GetArrayLength (argin); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2036 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2037 octave_value_list varargin, varargout; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2038 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2039 for (int i = 0; i < nargin; i++) |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
2040 varargin(i) = box (env, env->GetObjectArrayElement (argin, i), nullptr); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2041 |
23075
4e3d47dc7e25
move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22871
diff
changeset
|
2042 varargout = octave::feval (fname, varargin, nargout); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2043 |
20121
41064c150724
Return bools instead of ints in oc-java box and unbox internal functions.
Carnë Draug <carandraug@octave.org>
parents:
20120
diff
changeset
|
2044 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
|
2045 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
|
2046 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
|
2047 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2048 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2049 JNIEXPORT void JNICALL |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2050 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
|
2051 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2052 octave_ref_map.erase (ID); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2053 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2054 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2055 JNIEXPORT void JNICALL |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2056 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
|
2057 jobjectArray args) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2058 { |
25337
3ff9192b676e
use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents:
25305
diff
changeset
|
2059 auto it = octave_ref_map.find (ID); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2060 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2061 if (it != octave_ref_map.end ()) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2062 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2063 octave_value val = it->second; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2064 int len = env->GetArrayLength (args); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2065 octave_value_list oct_args; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2066 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2067 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
|
2068 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2069 jobject_ref jobj (env, env->GetObjectArrayElement (args, i)); |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
2070 oct_args(i) = box (env, jobj, nullptr); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2071 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2072 |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2073 if (val.is_function_handle ()) |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2074 { |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2075 octave_function *fcn = val.function_value (); |
23075
4e3d47dc7e25
move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22871
diff
changeset
|
2076 octave::feval (fcn, oct_args); |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2077 } |
23576
00e518162fda
maint: Deprecate is_cell and replace with iscell.
Rik <rik@octave.org>
parents:
23575
diff
changeset
|
2078 else if (val.iscell () && val.length () > 0 |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2079 && (val.rows () == 1 || val.columns () == 1) |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2080 && 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
|
2081 { |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2082 Cell c = val.cell_value (); |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2083 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
|
2084 |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2085 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
|
2086 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
|
2087 |
23075
4e3d47dc7e25
move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22871
diff
changeset
|
2088 octave::feval (fcn, oct_args); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2089 } |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2090 else |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2091 error ("trying to invoke non-invocable object"); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2092 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2093 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2094 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2095 JNIEXPORT void JNICALL |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2096 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
|
2097 { |
26113
8a15f3bace49
move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents:
26009
diff
changeset
|
2098 octave::interpreter& interp |
8a15f3bace49
move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents:
26009
diff
changeset
|
2099 = octave::__get_interpreter__ ("Java_org_octave_Octave_doEvalString"); |
8a15f3bace49
move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents:
26009
diff
changeset
|
2100 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2101 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
|
2102 int pstatus; |
26113
8a15f3bace49
move eval_string inside interpreter/evaluator class
John W. Eaton <jwe@octave.org>
parents:
26009
diff
changeset
|
2103 interp.eval_string (s, false, pstatus, 0); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2104 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2105 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2106 JNIEXPORT jboolean JNICALL |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2107 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
|
2108 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2109 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
|
2110 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2111 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2112 #endif |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2113 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2114 //! Ctor. |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2115 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2116 octave_java::octave_java (void) |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2117 : octave_base_value (), m_java_object (nullptr), m_java_class (nullptr) |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2118 { |
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 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2121 err_disabled_feature ("Java Objects", "Java"); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2122 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2123 #endif |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2124 } |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2125 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2126 octave_java::octave_java (const voidptr& jobj, void *jcls) |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2127 : octave_base_value (), m_java_object (nullptr), m_java_class (nullptr) |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2128 { |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2129 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2130 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2131 init (jobj, jcls); |
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 #else |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2134 |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2135 octave_unused_parameter (jobj); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2136 octave_unused_parameter (jcls); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2137 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2138 err_disabled_feature ("Java Objects", "Java"); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2139 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2140 #endif |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2141 } |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2142 |
15813
10d6ab9b1b4f
Implement octave_value function class_name() for class "octave_java"
Rik <rik@octave.org>
parents:
15806
diff
changeset
|
2143 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
|
2144 |
10d6ab9b1b4f
Implement octave_value function class_name() for class "octave_java"
Rik <rik@octave.org>
parents:
15806
diff
changeset
|
2145 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
|
2146 |
10d6ab9b1b4f
Implement octave_value function class_name() for class "octave_java"
Rik <rik@octave.org>
parents:
15806
diff
changeset
|
2147 void |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
2148 octave_java::register_type (octave::type_info& ti) |
15813
10d6ab9b1b4f
Implement octave_value function class_name() for class "octave_java"
Rik <rik@octave.org>
parents:
15806
diff
changeset
|
2149 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2150 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2151 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
2152 t_id = ti.register_type (octave_java::t_name, "<unknown>", |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
2153 octave_value (new octave_java ())); |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2154 |
24571
7b6a5336ddb3
* ov-java.cc (octave_java::register_type): Eliminate unused variable warning.
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
2155 #else |
7b6a5336ddb3
* ov-java.cc (octave_java::register_type): Eliminate unused variable warning.
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
2156 |
7b6a5336ddb3
* ov-java.cc (octave_java::register_type): Eliminate unused variable warning.
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
2157 octave_unused_parameter (ti); |
7b6a5336ddb3
* ov-java.cc (octave_java::register_type): Eliminate unused variable warning.
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
2158 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2159 #endif |
15813
10d6ab9b1b4f
Implement octave_value function class_name() for class "octave_java"
Rik <rik@octave.org>
parents:
15806
diff
changeset
|
2160 } |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2161 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2162 dim_vector |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2163 octave_java::dims (void) const |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2164 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2165 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2166 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2167 JNIEnv *current_env = thread_jni_env (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2168 |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2169 if (current_env && m_java_object) |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2170 return compute_array_dimensions (current_env, TO_JOBJECT (m_java_object)); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2171 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2172 return dim_vector (1, 1); |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2173 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2174 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2175 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2176 // This shouldn't happen because construction of octave_java objects is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2177 // supposed to be impossible if Java is not available. |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2178 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2179 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2180 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2181 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2182 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2183 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2184 octave_value_list |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2185 octave_java::subsref (const std::string& type, |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2186 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
|
2187 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2188 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2189 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2190 octave_value_list retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2191 int skip = 1; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2192 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2193 JNIEnv *current_env = thread_jni_env (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2194 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2195 switch (type[0]) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2196 { |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2197 case '.': |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2198 if (type.length () > 1 && type[1] == '(') |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2199 { |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2200 octave_value_list ovl; |
30139
c789e728d57a
Backed out changeset 938794bc82b7
John W. Eaton <jwe@octave.org>
parents:
30137
diff
changeset
|
2201 count++; |
15790
921912c92102
Deprecate java_invoke, replace with javaMethod.
Rik <rik@octave.org>
parents:
15771
diff
changeset
|
2202 ovl(1) = octave_value (this); |
921912c92102
Deprecate java_invoke, replace with javaMethod.
Rik <rik@octave.org>
parents:
15771
diff
changeset
|
2203 ovl(0) = (idx.front ())(0); |
25337
3ff9192b676e
use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents:
25305
diff
changeset
|
2204 auto it = idx.begin (); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2205 ovl.append (*++it); |
29958
32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29655
diff
changeset
|
2206 retval = octave::FjavaMethod (ovl, 1); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2207 skip++; |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2208 } |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2209 else |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2210 { |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2211 octave_value_list ovl; |
30139
c789e728d57a
Backed out changeset 938794bc82b7
John W. Eaton <jwe@octave.org>
parents:
30137
diff
changeset
|
2212 count++; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2213 ovl(0) = octave_value (this); |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2214 ovl(1) = (idx.front ())(0); |
29958
32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29655
diff
changeset
|
2215 retval = octave::F__java_get__ (ovl, 1); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2216 } |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2217 break; |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2218 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2219 case '(': |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2220 if (current_env) |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
2221 retval = get_array_elements |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
2222 (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
|
2223 break; |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2224 |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2225 default: |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2226 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
|
2227 break; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2228 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2229 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2230 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
|
2231 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
|
2232 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2233 return retval; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2234 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2235 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2236 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2237 octave_unused_parameter (type); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2238 octave_unused_parameter (idx); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2239 octave_unused_parameter (nargout); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2240 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2241 // This shouldn't happen because construction of octave_java objects is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2242 // supposed to be impossible if Java is not available. |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2243 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2244 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2245 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2246 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2247 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2248 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2249 octave_value |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2250 octave_java::subsasgn (const std::string& type, |
21661
1b9a36a66b01
maint: Octave coding convention cleanups.
Rik <rik@octave.org>
parents:
21660
diff
changeset
|
2251 const std::list<octave_value_list>& idx, |
1b9a36a66b01
maint: Octave coding convention cleanups.
Rik <rik@octave.org>
parents:
21660
diff
changeset
|
2252 const octave_value& rhs) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2253 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2254 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2255 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2256 octave_value retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2257 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2258 JNIEnv *current_env = thread_jni_env (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2259 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2260 switch (type[0]) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2261 { |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2262 case '.': |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2263 if (type.length () == 1) |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2264 { |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2265 // field assignment |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2266 octave_value_list ovl; |
30139
c789e728d57a
Backed out changeset 938794bc82b7
John W. Eaton <jwe@octave.org>
parents:
30137
diff
changeset
|
2267 count++; |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2268 ovl(0) = octave_value (this); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2269 ovl(1) = (idx.front ())(0); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2270 ovl(2) = rhs; |
29958
32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29655
diff
changeset
|
2271 octave::F__java_set__ (ovl); |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2272 |
30139
c789e728d57a
Backed out changeset 938794bc82b7
John W. Eaton <jwe@octave.org>
parents:
30137
diff
changeset
|
2273 count++; |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2274 retval = octave_value (this); |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2275 } |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2276 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
|
2277 { |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2278 std::list<octave_value_list> new_idx; |
25337
3ff9192b676e
use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents:
25305
diff
changeset
|
2279 auto it = idx.begin (); |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2280 new_idx.push_back (*it++); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2281 new_idx.push_back (*it++); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2282 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
|
2283 |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2284 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
|
2285 next_idx.erase (next_idx.begin ()); |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2286 next_idx.erase (next_idx.begin ()); |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2287 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
|
2288 |
30139
c789e728d57a
Backed out changeset 938794bc82b7
John W. Eaton <jwe@octave.org>
parents:
30137
diff
changeset
|
2289 count++; |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2290 retval = octave_value (this); |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2291 } |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2292 else if (type[1] == '.') |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2293 { |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2294 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
|
2295 |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2296 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
|
2297 next_idx.erase (next_idx.begin ()); |
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2298 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
|
2299 |
30139
c789e728d57a
Backed out changeset 938794bc82b7
John W. Eaton <jwe@octave.org>
parents:
30137
diff
changeset
|
2300 count++; |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2301 retval = octave_value (this); |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2302 } |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2303 else |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2304 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
|
2305 break; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2306 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2307 case '(': |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2308 if (current_env) |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2309 { |
22303
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
2310 set_array_elements (current_env, TO_JOBJECT (to_java ()), |
0448bf26fe98
style fixes (patch #9059)
Ernst Reissner <rei3ner@arcor.de>
parents:
22203
diff
changeset
|
2311 idx.front (), rhs); |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2312 |
30139
c789e728d57a
Backed out changeset 938794bc82b7
John W. Eaton <jwe@octave.org>
parents:
30137
diff
changeset
|
2313 count++; |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
2314 retval = octave_value (this); |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2315 } |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2316 break; |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2317 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2318 default: |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2319 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
|
2320 break; |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2321 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2322 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2323 return retval; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2324 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2325 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2326 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2327 octave_unused_parameter (type); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2328 octave_unused_parameter (idx); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2329 octave_unused_parameter (rhs); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2330 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2331 // This shouldn't happen because construction of octave_java objects is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2332 // supposed to be impossible if Java is not available. |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2333 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2334 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2335 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2336 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2337 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2338 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2339 string_vector |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2340 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
|
2341 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2342 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2343 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2344 JNIEnv *current_env = thread_jni_env (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2345 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2346 if (current_env) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2347 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
|
2348 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2349 return string_vector (); |
21379
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 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2353 // This shouldn't happen because construction of octave_java objects is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2354 // supposed to be impossible if Java is not available. |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2355 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2356 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2357 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2358 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2359 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2360 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2361 octave_value |
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2362 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
|
2363 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2364 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2365 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2366 JNIEnv *current_env = thread_jni_env (); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2367 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2368 if (current_env) |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2369 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
|
2370 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2371 return octave_value (""); |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2372 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2373 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2374 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2375 octave_unused_parameter (force); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2376 octave_unused_parameter (type); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2377 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2378 // This shouldn't happen because construction of octave_java objects is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2379 // supposed to be impossible if Java is not available. |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2380 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2381 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2382 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2383 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2384 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2385 |
15859
0e393e744e5e
ov-java.cc: Replace instances of comma operator for code clarity.
Rik <rik@octave.org>
parents:
15858
diff
changeset
|
2386 void |
18416
bcd71a2531d3
Support disp/display overloading in classdef
Michael Goffioul <michael.goffioul@gmail.com>
parents:
18100
diff
changeset
|
2387 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
|
2388 { |
0e393e744e5e
ov-java.cc: Replace instances of comma operator for code clarity.
Rik <rik@octave.org>
parents:
15858
diff
changeset
|
2389 print_raw (os); |
0e393e744e5e
ov-java.cc: Replace instances of comma operator for code clarity.
Rik <rik@octave.org>
parents:
15858
diff
changeset
|
2390 newline (os); |
0e393e744e5e
ov-java.cc: Replace instances of comma operator for code clarity.
Rik <rik@octave.org>
parents:
15858
diff
changeset
|
2391 } |
0e393e744e5e
ov-java.cc: Replace instances of comma operator for code clarity.
Rik <rik@octave.org>
parents:
15858
diff
changeset
|
2392 |
0e393e744e5e
ov-java.cc: Replace instances of comma operator for code clarity.
Rik <rik@octave.org>
parents:
15858
diff
changeset
|
2393 void |
0e393e744e5e
ov-java.cc: Replace instances of comma operator for code clarity.
Rik <rik@octave.org>
parents:
15858
diff
changeset
|
2394 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
|
2395 { |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2396 os << "<Java object: " << m_java_classname << '>'; |
15859
0e393e744e5e
ov-java.cc: Replace instances of comma operator for code clarity.
Rik <rik@octave.org>
parents:
15858
diff
changeset
|
2397 } |
0e393e744e5e
ov-java.cc: Replace instances of comma operator for code clarity.
Rik <rik@octave.org>
parents:
15858
diff
changeset
|
2398 |
20441
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2399 // 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
|
2400 // 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
|
2401 |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2402 bool |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2403 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
|
2404 { |
20531
dcfbf4c1c3c8
eliminate trailing whitespace and tabs from sources
John W. Eaton <jwe@octave.org>
parents:
20468
diff
changeset
|
2405 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
|
2406 |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2407 return true; |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2408 } |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2409 |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2410 bool |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2411 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
|
2412 { |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2413 // 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
|
2414 return true; |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2415 } |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2416 |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2417 bool |
26399
586413770c7f
pass save_as_floats by value in octave_value save_binary functions
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
2418 octave_java::save_binary (std::ostream& /* os */, bool /* save_as_floats */) |
20441
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2419 { |
20531
dcfbf4c1c3c8
eliminate trailing whitespace and tabs from sources
John W. Eaton <jwe@octave.org>
parents:
20468
diff
changeset
|
2420 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
|
2421 |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2422 return true; |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2423 } |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2424 |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2425 bool |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2426 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
|
2427 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
|
2428 { |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2429 // 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
|
2430 return true; |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2431 } |
b22528fd3deb
Add placeholder functions for save_ascii, save_binary for octave_java (bug #45694).
Rik <rik@octave.org>
parents:
20422
diff
changeset
|
2432 |
20468
2f94652de9ff
Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions.
Rik <rik@octave.org>
parents:
20441
diff
changeset
|
2433 bool |
2f94652de9ff
Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions.
Rik <rik@octave.org>
parents:
20441
diff
changeset
|
2434 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
|
2435 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
|
2436 { |
2f94652de9ff
Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions.
Rik <rik@octave.org>
parents:
20441
diff
changeset
|
2437 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
|
2438 |
2f94652de9ff
Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions.
Rik <rik@octave.org>
parents:
20441
diff
changeset
|
2439 return true; |
2f94652de9ff
Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions.
Rik <rik@octave.org>
parents:
20441
diff
changeset
|
2440 } |
2f94652de9ff
Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions.
Rik <rik@octave.org>
parents:
20441
diff
changeset
|
2441 |
2f94652de9ff
Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions.
Rik <rik@octave.org>
parents:
20441
diff
changeset
|
2442 bool |
2f94652de9ff
Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions.
Rik <rik@octave.org>
parents:
20441
diff
changeset
|
2443 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
|
2444 { |
2f94652de9ff
Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions.
Rik <rik@octave.org>
parents:
20441
diff
changeset
|
2445 // 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
|
2446 return true; |
2f94652de9ff
Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions.
Rik <rik@octave.org>
parents:
20441
diff
changeset
|
2447 } |
2f94652de9ff
Add placeholder functions for save_hdf5, load_hdf5 for octave_java functions.
Rik <rik@octave.org>
parents:
20441
diff
changeset
|
2448 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2449 octave_value |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2450 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
|
2451 const octave_value_list& args) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2452 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2453 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2454 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2455 octave_value retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2456 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2457 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
|
2458 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2459 if (jni_env) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2460 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2461 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
|
2462 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
|
2463 { |
15744
686580b1a934
eliminate most compilation warnings for __java__.cc
John W. Eaton <jwe@octave.org>
parents:
15743
diff
changeset
|
2464 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
|
2465 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
|
2466 "(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
|
2467 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
|
2468 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
|
2469 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
|
2470 if (resObj) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2471 retval = box (jni_env, resObj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2472 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2473 retval = check_exception (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2474 } |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
2475 |
21894 | 2476 octave_set_default_fpucw (); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2477 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2478 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2479 return retval; |
21379
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 (jni_env_arg); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2484 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2485 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2486 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2487 // This shouldn't happen because construction of octave_java objects is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
2488 // supposed to be impossible if Java is not available. |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2489 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2490 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2491 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2492 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2493 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2494 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2495 octave_value |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22331
diff
changeset
|
2496 octave_java::do_javaMethod (const std::string& name, |
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22331
diff
changeset
|
2497 const octave_value_list& args) |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2498 { |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2499 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2500 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2501 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
|
2502 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2503 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2504 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2505 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2506 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2507 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2508 // 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
|
2509 // 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
|
2510 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2511 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2512 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2513 #endif |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2514 } |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2515 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2516 octave_value |
24199
2ac103974d00
Remove extra space between scope operator '::' and function.
Rik <rik@octave.org>
parents:
24141
diff
changeset
|
2517 octave_java::do_javaMethod (void *jni_env_arg, |
2ac103974d00
Remove extra space between scope operator '::' and function.
Rik <rik@octave.org>
parents:
24141
diff
changeset
|
2518 const std::string& class_name, |
2ac103974d00
Remove extra space between scope operator '::' and function.
Rik <rik@octave.org>
parents:
24141
diff
changeset
|
2519 const std::string& name, |
2ac103974d00
Remove extra space between scope operator '::' and function.
Rik <rik@octave.org>
parents:
24141
diff
changeset
|
2520 const octave_value_list& args) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2521 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2522 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2523 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2524 octave_value retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2525 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2526 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
|
2527 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2528 if (jni_env) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2529 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2530 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
|
2531 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
|
2532 { |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2533 jclass_ref helperClass (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2534 find_octave_class (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2535 "org/octave/ClassHelper")); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2536 jmethodID mID = jni_env->GetStaticMethodID (helperClass, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2537 "invokeStaticMethod", |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2538 "(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Class;)Ljava/lang/Object;"); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2539 jstring_ref methName (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2540 jni_env->NewStringUTF (name.c_str ())); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2541 jstring_ref clsName (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2542 jni_env->NewStringUTF (class_name.c_str ())); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2543 jobject_ref resObj (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2544 jni_env->CallStaticObjectMethod (helperClass, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2545 mID, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2546 jstring (clsName), |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2547 jstring (methName), |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2548 jobjectArray (arg_objs), |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2549 jobjectArray (arg_types))); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2550 if (resObj) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2551 retval = box (jni_env, resObj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2552 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2553 retval = check_exception (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2554 } |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
2555 |
21894 | 2556 octave_set_default_fpucw (); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2557 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2558 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2559 return retval; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2560 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2561 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2562 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2563 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
|
2564 octave_unused_parameter (class_name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2565 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2566 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2567 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2568 // 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
|
2569 // 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
|
2570 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2571 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2572 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2573 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2574 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2575 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2576 octave_value |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2577 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
|
2578 const std::string& name, |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2579 const octave_value_list& args) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2580 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2581 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2582 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2583 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
|
2584 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2585 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2586 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2587 octave_unused_parameter (class_name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2588 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2589 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2590 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2591 // 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
|
2592 // 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
|
2593 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2594 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2595 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2596 #endif |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2597 } |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2598 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2599 octave_value |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2600 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
|
2601 const octave_value_list& args) |
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 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2605 octave_value retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2606 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2607 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
|
2608 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2609 if (jni_env) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2610 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2611 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
|
2612 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2613 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
|
2614 { |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2615 jclass_ref helperClass (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2616 find_octave_class (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2617 "org/octave/ClassHelper")); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2618 jmethodID mID = jni_env->GetStaticMethodID (helperClass, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2619 "invokeConstructor", |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2620 "(Ljava/lang/String;[Ljava/lang/Object;[Ljava/lang/Class;)Ljava/lang/Object;"); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2621 jstring_ref clsName (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2622 jni_env->NewStringUTF (name.c_str ())); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2623 jobject_ref resObj (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2624 jni_env->CallStaticObjectMethod (helperClass, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2625 mID, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2626 jstring (clsName), |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2627 jobjectArray (arg_objs), |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2628 jobjectArray (arg_types))); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2629 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2630 if (resObj) |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
2631 retval = octave_value (new octave_java (resObj, nullptr)); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2632 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2633 check_exception (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2634 } |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
2635 |
21894 | 2636 octave_set_default_fpucw (); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2637 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2638 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2639 return retval; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2640 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2641 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2642 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2643 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
|
2644 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2645 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2646 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2647 // 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
|
2648 // 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
|
2649 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2650 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2651 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2652 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2653 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2654 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2655 octave_value |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22331
diff
changeset
|
2656 octave_java::do_javaObject (const std::string& name, |
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22331
diff
changeset
|
2657 const octave_value_list& args) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2658 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2659 #if defined (HAVE_JAVA) |
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 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
|
2662 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2663 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2664 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2665 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2666 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2667 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2668 // 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
|
2669 // 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
|
2670 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2671 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2672 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2673 #endif |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2674 } |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2675 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2676 octave_value |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2677 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
|
2678 { |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2679 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2680 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2681 octave_value retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2682 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2683 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
|
2684 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2685 if (jni_env) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2686 { |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2687 jclass_ref helperClass (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2688 find_octave_class (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2689 "org/octave/ClassHelper")); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2690 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
|
2691 "(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
|
2692 jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ())); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2693 jobject_ref resObj (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2694 jni_env->CallStaticObjectMethod (helperClass, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2695 mID, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2696 to_java (), |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2697 jstring (fName))); |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2698 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2699 if (resObj) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2700 retval = box (jni_env, resObj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2701 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2702 retval = check_exception (jni_env); |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
2703 |
21894 | 2704 octave_set_default_fpucw (); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2705 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2706 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2707 return retval; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2708 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2709 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2710 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2711 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
|
2712 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2713 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2714 // 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
|
2715 // 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
|
2716 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2717 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2718 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2719 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2720 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2721 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2722 octave_value |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2723 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
|
2724 { |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2725 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2726 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2727 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
|
2728 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2729 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2730 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2731 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2732 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2733 // 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
|
2734 // 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
|
2735 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2736 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2737 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2738 #endif |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2739 } |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2740 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2741 octave_value |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2742 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
|
2743 const std::string& name) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2744 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2745 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2746 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2747 octave_value retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2748 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2749 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
|
2750 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2751 if (jni_env) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2752 { |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2753 jclass_ref helperClass (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2754 find_octave_class (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2755 "org/octave/ClassHelper")); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2756 jmethodID mID = jni_env->GetStaticMethodID (helperClass, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2757 "getStaticField", |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2758 "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;"); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2759 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
|
2760 jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ())); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2761 jobject_ref resObj (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2762 jni_env->CallStaticObjectMethod (helperClass, mID, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2763 jstring (cName), |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2764 jstring (fName))); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2765 if (resObj) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2766 retval = box (jni_env, resObj); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2767 else |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2768 retval = check_exception (jni_env); |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
2769 |
21894 | 2770 octave_set_default_fpucw (); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2771 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2772 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2773 return retval; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2774 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2775 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2776 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2777 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
|
2778 octave_unused_parameter (class_name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2779 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2780 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2781 // 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
|
2782 // 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
|
2783 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2784 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2785 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2786 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2787 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2788 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2789 octave_value |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22331
diff
changeset
|
2790 octave_java::do_java_get (const std::string& class_name, |
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22331
diff
changeset
|
2791 const std::string& name) |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2792 { |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2793 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2794 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2795 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
|
2796 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2797 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2798 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2799 octave_unused_parameter (class_name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2800 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2801 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2802 // 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
|
2803 // 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
|
2804 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2805 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2806 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2807 #endif |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2808 } |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2809 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2810 octave_value |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2811 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
|
2812 const octave_value& val) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2813 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2814 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2815 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2816 octave_value retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2817 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2818 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
|
2819 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2820 if (jni_env) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2821 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2822 jobject_ref jobj (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2823 jclass_ref jcls (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2824 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2825 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
|
2826 { |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2827 jclass_ref helperClass (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2828 find_octave_class (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2829 "org/octave/ClassHelper")); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2830 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
|
2831 "(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
|
2832 jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ())); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2833 jni_env->CallStaticObjectMethod (helperClass, mID, to_java (), |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2834 jstring (fName), jobject (jobj)); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2835 check_exception (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2836 } |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
2837 |
21894 | 2838 octave_set_default_fpucw (); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2839 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2840 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2841 return retval; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2842 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2843 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2844 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2845 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
|
2846 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2847 octave_unused_parameter (val); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2848 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2849 // 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
|
2850 // 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
|
2851 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2852 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2853 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2854 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2855 } |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2856 |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2857 octave_value |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2858 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
|
2859 { |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2860 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2861 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2862 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
|
2863 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2864 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2865 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2866 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2867 octave_unused_parameter (val); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2868 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2869 // 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
|
2870 // 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
|
2871 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2872 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2873 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2874 #endif |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2875 } |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2876 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2877 octave_value |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2878 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
|
2879 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
|
2880 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2881 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2882 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2883 octave_value retval; |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2884 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2885 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
|
2886 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2887 if (jni_env) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2888 { |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2889 jobject_ref jobj (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2890 jclass_ref jcls (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2891 |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2892 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
|
2893 { |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2894 jclass_ref helperClass (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2895 find_octave_class (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2896 "org/octave/ClassHelper")); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2897 jmethodID mID = jni_env->GetStaticMethodID (helperClass, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2898 "setStaticField", |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2899 "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V"); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2900 jstring_ref cName (jni_env, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2901 jni_env->NewStringUTF (class_name.c_str ())); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2902 jstring_ref fName (jni_env, jni_env->NewStringUTF (name.c_str ())); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2903 jni_env->CallStaticObjectMethod (helperClass, mID, jstring (cName), |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2904 jstring (fName), jobject (jobj)); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2905 check_exception (jni_env); |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2906 } |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
15879
diff
changeset
|
2907 |
21894 | 2908 octave_set_default_fpucw (); |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2909 } |
15745
19850dfc2f88
* __java__.h, __java__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15744
diff
changeset
|
2910 |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2911 return retval; |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2912 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2913 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2914 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2915 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
|
2916 octave_unused_parameter (class_name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2917 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2918 octave_unused_parameter (val); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2919 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2920 // 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
|
2921 // 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
|
2922 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2923 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2924 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2925 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2926 } |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15625
diff
changeset
|
2927 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2928 octave_value |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22331
diff
changeset
|
2929 octave_java::do_java_set (const std::string& class_name, |
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22331
diff
changeset
|
2930 const std::string& name, |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2931 const octave_value& val) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2932 { |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2933 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2934 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2935 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
|
2936 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2937 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2938 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2939 octave_unused_parameter (class_name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2940 octave_unused_parameter (name); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2941 octave_unused_parameter (val); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2942 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2943 // 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
|
2944 // 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
|
2945 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2946 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2947 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2948 #endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2949 } |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15625
diff
changeset
|
2950 |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2951 void |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2952 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
|
2953 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2954 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2955 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2956 jobject jobj = TO_JOBJECT (jobj_arg); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2957 jclass jcls = TO_JCLASS (jcls_arg); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2958 |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2959 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
|
2960 |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2961 if (current_env) |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2962 { |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2963 if (jobj) |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2964 m_java_object = current_env->NewGlobalRef (jobj); |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2965 |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2966 if (jcls) |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2967 m_java_class = current_env->NewGlobalRef (jcls); |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2968 else if (m_java_object) |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2969 { |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2970 jclass_ref ocls (current_env, |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2971 current_env->GetObjectClass(TO_JOBJECT (m_java_object))); |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2972 m_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
|
2973 } |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2974 |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2975 if (m_java_class) |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2976 { |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2977 jclass_ref clsCls (current_env, |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2978 current_env->GetObjectClass (TO_JCLASS (m_java_class))); |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2979 jmethodID mID = current_env->GetMethodID (clsCls, |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2980 "getCanonicalName", |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2981 "()Ljava/lang/String;"); |
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
2982 jobject_ref resObj (current_env, |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2983 current_env->CallObjectMethod (TO_JCLASS (m_java_class), mID)); |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
2984 m_java_classname = jstring_to_string (current_env, resObj); |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2985 } |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2986 } |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2987 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2988 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2989 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2990 octave_unused_parameter (jobj_arg); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2991 octave_unused_parameter (jcls_arg); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2992 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2993 // 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
|
2994 // 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
|
2995 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2996 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
2997 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
2998 #endif |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
2999 } |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
3000 |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
3001 void |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
3002 octave_java::release (void) |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
3003 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3004 #if defined (HAVE_JAVA) |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3005 |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
3006 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
|
3007 |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
3008 if (current_env) |
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
3009 { |
30045
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
3010 if (m_java_object) |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
3011 current_env->DeleteGlobalRef (TO_JOBJECT (m_java_object)); |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
3012 |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
3013 if (m_java_class) |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
3014 current_env->DeleteGlobalRef (TO_JCLASS (m_java_class)); |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
3015 |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
3016 m_java_object = nullptr; |
849bd0f1129c
maint: use "m_" prefix for member variables of octave_value classes for Java.
Rik <rik@octave.org>
parents:
30001
diff
changeset
|
3017 m_java_class = nullptr; |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
3018 } |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3019 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3020 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3021 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
3022 // This shouldn't happen because construction of octave_java objects is |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
3023 // supposed to be impossible if Java is not available. |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3024 |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3025 panic_impossible (); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3026 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3027 #endif |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
3028 } |
15806
01d4f742d75d
doc: Re-organize and improve Java Interface documentation.
Rik <rik@octave.org>
parents:
15800
diff
changeset
|
3029 |
29958
32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29655
diff
changeset
|
3030 OCTAVE_NAMESPACE_BEGIN |
32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29655
diff
changeset
|
3031 |
24140
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
3032 // DEFUN blocks below must be outside of HAVE_JAVA block so that documentation |
0b7662d8bd02
doc: libinterp/octave-value/ov-java.cc: Improve (Doxygen) comments.
Ernst Reissner <rei3ner@arcor.de>
parents:
23929
diff
changeset
|
3033 // strings are always available, even when functions are not. |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3034 |
15879
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3035 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
|
3036 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
|
3037 @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
|
3038 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
|
3039 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3040 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
|
3041 @end deftypefn */) |
15879
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3042 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3043 #if defined (HAVE_JAVA) |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3044 |
24141
af577de75e68
maint: libinterp/octave-value/ov-java.cc: Clean up code. No function changes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
24140
diff
changeset
|
3045 octave_value retval = 0; |
15879
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3046 |
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3047 initialize_java (); |
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3048 |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
3049 retval = 1; |
15879
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3050 |
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3051 return retval; |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3052 |
15879
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3053 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3054 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3055 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
|
3056 |
15879
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3057 #endif |
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3058 } |
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3059 |
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3060 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
|
3061 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
|
3062 @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
|
3063 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
|
3064 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3065 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
|
3066 instance. |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3067 @end deftypefn */) |
15879
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3068 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3069 #if defined (HAVE_JAVA) |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3070 |
15879
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3071 terminate_jvm (); |
20957
9db35d2042be
maint: eliminate special cases of statements after error.
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
3072 |
9db35d2042be
maint: eliminate special cases of statements after error.
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
3073 return ovl (); |
9db35d2042be
maint: eliminate special cases of statements after error.
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
3074 |
15879
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3075 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3076 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3077 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
|
3078 |
15879
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3079 #endif |
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3080 } |
f69530e3600d
make docstrings for __java_init__ and __java_exit__ available unconditionally
John W. Eaton <jwe@octave.org>
parents:
15859
diff
changeset
|
3081 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3082 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
|
3083 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
|
3084 @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
|
3085 @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
|
3086 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
|
3087 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
|
3088 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3089 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
|
3090 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
|
3091 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3092 @example |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3093 @group |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3094 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
|
3095 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
|
3096 @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
|
3097 @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
|
3098 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3099 @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
|
3100 @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
|
3101 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3102 #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
|
3103 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3104 if (args.length () == 0) |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3105 print_usage (); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3106 |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3107 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
|
3108 |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3109 initialize_java (); |
15790
921912c92102
Deprecate java_invoke, replace with javaMethod.
Rik <rik@octave.org>
parents:
15771
diff
changeset
|
3110 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3111 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
|
3112 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3113 octave_value_list tmp; |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3114 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
|
3115 tmp(i-1) = args(i); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3116 |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3117 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
|
3118 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3119 #else |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3120 |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3121 octave_unused_parameter (args); |
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 ("javaObject", "Java"); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
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 |
15825
9854666df787
ov-java.cc: tests added for javaObject and javaMethod
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
15824
diff
changeset
|
3128 /* |
21042
0967e2393386
* ov-java.h, ov-java.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
20974
diff
changeset
|
3129 ## 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
|
3130 ## 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
|
3131 ## 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
|
3132 ## whether it overflows. |
23405
32ec90068be5
use %!testif runtime tests to properly skip java tests
John W. Eaton <jwe@octave.org>
parents:
23220
diff
changeset
|
3133 %!testif HAVE_JAVA; usejava ("jvm") |
15825
9854666df787
ov-java.cc: tests added for javaObject and javaMethod
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
15824
diff
changeset
|
3134 %! 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
|
3135 */ |
9854666df787
ov-java.cc: tests added for javaObject and javaMethod
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
15824
diff
changeset
|
3136 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3137 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
|
3138 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
|
3139 @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
|
3140 @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
|
3141 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
|
3142 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
|
3143 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3144 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
|
3145 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
|
3146 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3147 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
|
3148 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
|
3149 equivalent |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3150 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3151 @example |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3152 @group |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3153 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
|
3154 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
|
3155 @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
|
3156 @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
|
3157 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3158 @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
|
3159 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3160 @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
|
3161 @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
|
3162 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3163 #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
|
3164 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3165 if (args.length () < 2) |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3166 print_usage (); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3167 |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3168 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
|
3169 |
15790
921912c92102
Deprecate java_invoke, replace with javaMethod.
Rik <rik@octave.org>
parents:
15771
diff
changeset
|
3170 initialize_java (); |
921912c92102
Deprecate java_invoke, replace with javaMethod.
Rik <rik@octave.org>
parents:
15771
diff
changeset
|
3171 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3172 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
|
3173 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3174 octave_value retval; |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3175 |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3176 octave_value_list tmp; |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3177 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
|
3178 tmp(i-2) = args(i); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3179 |
23578
7b47b7c2d6c7
maint: Deprecate is_java and replace with isjava.
Rik <rik@octave.org>
parents:
23577
diff
changeset
|
3180 if (args(1).isjava ()) |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3181 { |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3182 octave_java *jobj = TO_JAVA (args(1)); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3183 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
|
3184 } |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3185 else if (args(1).is_string ()) |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3186 { |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3187 std::string cls = args(1).string_value (); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3188 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
|
3189 } |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
3190 else |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3191 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
|
3192 |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3193 return retval; |
20797
492738d32c60
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20765
diff
changeset
|
3194 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3195 #else |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3196 |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3197 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3198 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3199 err_disabled_feature ("javaMethod", "Java"); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3200 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3201 #endif |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3202 } |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3203 |
15825
9854666df787
ov-java.cc: tests added for javaObject and javaMethod
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
15824
diff
changeset
|
3204 /* |
23405
32ec90068be5
use %!testif runtime tests to properly skip java tests
John W. Eaton <jwe@octave.org>
parents:
23220
diff
changeset
|
3205 %!testif HAVE_JAVA; usejava ("jvm") |
24671
5aa9c885ea18
Rewrite certain Java BIST tests to pass with Java 9 (bug #52627).
Rik <rik@octave.org>
parents:
24592
diff
changeset
|
3206 %! jver = javaMethod ("getProperty", "java.lang.System", "java.version"); |
5aa9c885ea18
Rewrite certain Java BIST tests to pass with Java 9 (bug #52627).
Rik <rik@octave.org>
parents:
24592
diff
changeset
|
3207 %! jver = strsplit (jver, "."); |
5aa9c885ea18
Rewrite certain Java BIST tests to pass with Java 9 (bug #52627).
Rik <rik@octave.org>
parents:
24592
diff
changeset
|
3208 %! if (numel (jver) > 1) |
5aa9c885ea18
Rewrite certain Java BIST tests to pass with Java 9 (bug #52627).
Rik <rik@octave.org>
parents:
24592
diff
changeset
|
3209 %! assert (isfinite (str2double (jver{1}))); |
5aa9c885ea18
Rewrite certain Java BIST tests to pass with Java 9 (bug #52627).
Rik <rik@octave.org>
parents:
24592
diff
changeset
|
3210 %! assert (isfinite (str2double (jver{2}))); |
5aa9c885ea18
Rewrite certain Java BIST tests to pass with Java 9 (bug #52627).
Rik <rik@octave.org>
parents:
24592
diff
changeset
|
3211 %! else |
5aa9c885ea18
Rewrite certain Java BIST tests to pass with Java 9 (bug #52627).
Rik <rik@octave.org>
parents:
24592
diff
changeset
|
3212 %! assert (isfinite (str2double (jver{1}))); |
5aa9c885ea18
Rewrite certain Java BIST tests to pass with Java 9 (bug #52627).
Rik <rik@octave.org>
parents:
24592
diff
changeset
|
3213 %! endif |
15825
9854666df787
ov-java.cc: tests added for javaObject and javaMethod
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
15824
diff
changeset
|
3214 */ |
9854666df787
ov-java.cc: tests added for javaObject and javaMethod
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
15824
diff
changeset
|
3215 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3216 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
|
3217 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
|
3218 @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
|
3219 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
|
3220 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3221 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
|
3222 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
|
3223 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3224 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
|
3225 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
|
3226 equivalent |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3227 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3228 @example |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3229 @group |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3230 __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
|
3231 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
|
3232 @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
|
3233 @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
|
3234 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3235 @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
|
3236 @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
|
3237 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3238 #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
|
3239 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3240 if (args.length () != 2) |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3241 print_usage (); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3242 |
26365
45d5a4ae636b
ov-java.cc: Bugfix use xstring_value for extraction
Andreas Weber <octave@josoansi.de>
parents:
26149
diff
changeset
|
3243 std::string name = args(1).xstring_value ("__java_get__: NAME must be a string"); |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3244 |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3245 initialize_java (); |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3246 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3247 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
|
3248 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3249 octave_value retval; |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3250 |
23578
7b47b7c2d6c7
maint: Deprecate is_java and replace with isjava.
Rik <rik@octave.org>
parents:
23577
diff
changeset
|
3251 if (args(0).isjava ()) |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3252 { |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3253 octave_java *jobj = TO_JAVA (args(0)); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3254 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
|
3255 } |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3256 else if (args(0).is_string ()) |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3257 { |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3258 std::string cls = args(0).string_value (); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3259 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
|
3260 } |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
3261 else |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3262 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
|
3263 |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3264 return retval; |
20797
492738d32c60
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20765
diff
changeset
|
3265 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3266 #else |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3267 |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3268 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3269 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3270 err_disabled_feature ("__java_get__", "Java"); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3271 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3272 #endif |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3273 } |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3274 |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3275 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
|
3276 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
|
3277 @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
|
3278 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
|
3279 @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
|
3280 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3281 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
|
3282 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
|
3283 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3284 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
|
3285 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
|
3286 equivalent |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3287 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3288 @example |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3289 @group |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3290 __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
|
3291 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
|
3292 @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
|
3293 @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
|
3294 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3295 @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
|
3296 @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
|
3297 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3298 #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
|
3299 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3300 if (args.length () != 3) |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3301 print_usage (); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3302 |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3303 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
|
3304 |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3305 initialize_java (); |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3306 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3307 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
|
3308 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3309 octave_value retval; |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3310 |
23578
7b47b7c2d6c7
maint: Deprecate is_java and replace with isjava.
Rik <rik@octave.org>
parents:
23577
diff
changeset
|
3311 if (args(0).isjava ()) |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3312 { |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3313 octave_java *jobj = TO_JAVA (args(0)); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3314 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
|
3315 } |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3316 else if (args(0).is_string ()) |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3317 { |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3318 std::string cls = args(0).string_value (); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3319 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
|
3320 } |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
3321 else |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3322 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
|
3323 |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3324 return retval; |
20797
492738d32c60
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20765
diff
changeset
|
3325 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3326 #else |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3327 |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3328 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3329 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3330 err_disabled_feature ("__java_set__", "Java"); |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3331 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3332 #endif |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3333 } |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3334 |
25041 | 3335 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
|
3336 doc: /* -*- texinfo -*- |
25041 | 3337 @deftypefn {} {} __java2mat__ (@var{javaobj}) |
21966
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3338 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
|
3339 @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
|
3340 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3341 #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
|
3342 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3343 if (args.length () != 1) |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3344 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
|
3345 |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3346 initialize_java (); |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3347 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3348 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
|
3349 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3350 octave_value_list retval; |
20797
492738d32c60
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20765
diff
changeset
|
3351 |
23578
7b47b7c2d6c7
maint: Deprecate is_java and replace with isjava.
Rik <rik@octave.org>
parents:
23577
diff
changeset
|
3352 if (args(0).isjava ()) |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3353 { |
20797
492738d32c60
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20765
diff
changeset
|
3354 octave_java *jobj = TO_JAVA (args(0)); |
23795
980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents:
23717
diff
changeset
|
3355 retval = ovl (box_more (current_env, jobj->to_java (), nullptr)); |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3356 } |
20559
0650b8431037
eliminate more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20542
diff
changeset
|
3357 else |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
3358 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
|
3359 |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3360 return retval; |
20797
492738d32c60
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20765
diff
changeset
|
3361 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3362 #else |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3363 |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3364 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3365 |
25041 | 3366 err_disabled_feature ("__java2mat__", "Java"); |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3367 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3368 #endif |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3369 } |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3370 |
15800
d9b8333df5e4
Deprecate java_debug, java_convert_matrix, java_unsigned_conversion.
Rik <rik@octave.org>
parents:
15798
diff
changeset
|
3371 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
|
3372 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
|
3373 @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
|
3374 @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
|
3375 @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
|
3376 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
|
3377 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
|
3378 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3379 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
|
3380 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3381 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
|
3382 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
|
3383 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
|
3384 @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
|
3385 @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
|
3386 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3387 #if defined (HAVE_JAVA) |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3388 |
30001
428cccc75cc9
move most functions in variables.cc to octave namespace
John W. Eaton <jwe@octave.org>
parents:
29974
diff
changeset
|
3389 return set_internal_variable (Vjava_matrix_autoconversion, args, nargout, |
428cccc75cc9
move most functions in variables.cc to octave namespace
John W. Eaton <jwe@octave.org>
parents:
29974
diff
changeset
|
3390 "java_matrix_autoconversion"); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3391 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3392 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3393 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3394 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3395 octave_unused_parameter (nargout); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3396 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3397 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
|
3398 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3399 #endif |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3400 } |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3401 |
15800
d9b8333df5e4
Deprecate java_debug, java_convert_matrix, java_unsigned_conversion.
Rik <rik@octave.org>
parents:
15798
diff
changeset
|
3402 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
|
3403 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
|
3404 @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
|
3405 @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
|
3406 @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
|
3407 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
|
3408 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
|
3409 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3410 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
|
3411 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
|
3412 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3413 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
|
3414 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
|
3415 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
|
3416 @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
|
3417 @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
|
3418 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3419 #if defined (HAVE_JAVA) |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3420 |
30001
428cccc75cc9
move most functions in variables.cc to octave namespace
John W. Eaton <jwe@octave.org>
parents:
29974
diff
changeset
|
3421 return set_internal_variable (Vjava_unsigned_autoconversion, args, nargout, |
428cccc75cc9
move most functions in variables.cc to octave namespace
John W. Eaton <jwe@octave.org>
parents:
29974
diff
changeset
|
3422 "java_unsigned_autoconversion"); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3423 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3424 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3425 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3426 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3427 octave_unused_parameter (nargout); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3428 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3429 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
|
3430 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3431 #endif |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3432 } |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3433 |
15800
d9b8333df5e4
Deprecate java_debug, java_convert_matrix, java_unsigned_conversion.
Rik <rik@octave.org>
parents:
15798
diff
changeset
|
3434 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
|
3435 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
|
3436 @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
|
3437 @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
|
3438 @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
|
3439 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
|
3440 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
|
3441 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
|
3442 |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21894
diff
changeset
|
3443 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
|
3444 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
|
3445 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
|
3446 @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
|
3447 @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
|
3448 { |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3449 #if defined (HAVE_JAVA) |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3450 |
30001
428cccc75cc9
move most functions in variables.cc to octave namespace
John W. Eaton <jwe@octave.org>
parents:
29974
diff
changeset
|
3451 return set_internal_variable (Vdebug_java, args, nargout, "debug_java"); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3452 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3453 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3454 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3455 octave_unused_parameter (args); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3456 octave_unused_parameter (nargout); |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21661
diff
changeset
|
3457 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3458 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
|
3459 |
15771
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3460 #endif |
4698ea77aa75
Hide java_init, java_exit functions. Deprecate java_new, java_set, java_get.
Rik <rik@octave.org>
parents:
15770
diff
changeset
|
3461 } |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15625
diff
changeset
|
3462 |
21379
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3463 // 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
|
3464 // 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
|
3465 // installed. |
93c489ca8a6b
elimnate HAVE_JAVA from ov-java.h
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
3466 |
15770 | 3467 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
|
3468 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
|
3469 @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
|
3470 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
|
3471 @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
|
3472 @end deftypefn */) |
15770 | 3473 { |
3474 if (args.length () != 1) | |
3475 print_usage (); | |
20797
492738d32c60
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20765
diff
changeset
|
3476 |
23578
7b47b7c2d6c7
maint: Deprecate is_java and replace with isjava.
Rik <rik@octave.org>
parents:
23577
diff
changeset
|
3477 return ovl (args(0).isjava ()); |
15770 | 3478 } |
3479 | |
20120
2db2db2df55b
Automatically convert arrays of java primitives into Octave types (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20028
diff
changeset
|
3480 /* |
20152
8187a66039e4
Don't run Java BIST tests if HAVA_JAVA is false.
Rik <rik@octave.org>
parents:
20124
diff
changeset
|
3481 ## Check automatic conversion of java primitive arrays into octave types. |
23405
32ec90068be5
use %!testif runtime tests to properly skip java tests
John W. Eaton <jwe@octave.org>
parents:
23220
diff
changeset
|
3482 %!testif HAVE_JAVA; usejava ("jvm") |
20152
8187a66039e4
Don't run Java BIST tests if HAVA_JAVA is false.
Rik <rik@octave.org>
parents:
20124
diff
changeset
|
3483 %! 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
|
3484 %! 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
|
3485 |
8187a66039e4
Don't run Java BIST tests if HAVA_JAVA is false.
Rik <rik@octave.org>
parents:
20124
diff
changeset
|
3486 ## 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
|
3487 ## Note that uint8 is casted to int8. |
23405
32ec90068be5
use %!testif runtime tests to properly skip java tests
John W. Eaton <jwe@octave.org>
parents:
23220
diff
changeset
|
3488 %!testif HAVE_JAVA; usejava ("jvm") |
20152
8187a66039e4
Don't run Java BIST tests if HAVA_JAVA is false.
Rik <rik@octave.org>
parents:
20124
diff
changeset
|
3489 %! 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
|
3490 %! 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
|
3491 %! 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
|
3492 %! 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
|
3493 %! 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
|
3494 |
22489
93ea313301f9
test: Add bug ids (<#####>) to BIST tests.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
3495 ## Check we can create objects that wrap java literals |
23573
1b4f4ec53b4a
use new script to tag fixed bugs in tests
John W. Eaton <jwe@octave.org>
parents:
23572
diff
changeset
|
3496 %!testif HAVE_JAVA; usejava ("jvm") <*38821> |
21822
e56ba70108d3
Fix typos in Java conversion of 32 and 64 bit integers (bug #48107)
Mike Miller <mtmiller@octave.org>
parents:
21780
diff
changeset
|
3497 %! 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
|
3498 %! 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
|
3499 %! 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
|
3500 %! 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
|
3501 %! 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
|
3502 %! 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
|
3503 %! 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
|
3504 %! 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
|
3505 |
23681
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3506 ## More checks of java numeric and boolean class instances |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3507 %!testif HAVE_JAVA; usejava ("jvm") |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3508 %! n = javaObject ("java.lang.Double", 1.35); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3509 %! assert (n.compareTo (1.0), 1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3510 %! assert (n.compareTo (1.35), 0); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3511 %! assert (n.compareTo (10), -1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3512 %! assert (n.isInfinite (), false); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3513 |
28889
a2fbb2074436
ov-java.cc: Add bug number to BIST (bug #51804).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28527
diff
changeset
|
3514 %!testif HAVE_JAVA; usejava ("jvm") <51804> |
23681
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3515 %! n = javaObject ("java.lang.Float", 1.35); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3516 %! assert (n.compareTo (1.0), 1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3517 %! assert (n.compareTo (1.35), 0); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3518 %! assert (n.compareTo (10), -1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3519 %! assert (n.doubleValue (), 1.35, 1e7); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3520 |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3521 %!testif HAVE_JAVA; usejava ("jvm") |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3522 %! n = javaObject ("java.lang.Long", (int64 (1))); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3523 %! assert (n.compareTo (int64 (0)), 1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3524 %! assert (n.compareTo (int64 (1)), 0); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3525 %! assert (n.compareTo (int64 (2)), -1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3526 %! assert (n.toString (), "1"); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3527 |
24671
5aa9c885ea18
Rewrite certain Java BIST tests to pass with Java 9 (bug #52627).
Rik <rik@octave.org>
parents:
24592
diff
changeset
|
3528 %!testif HAVE_JAVA; usejava ("jvm") <51804> |
23681
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3529 %! n = javaObject ("java.lang.Integer", 1.35); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3530 %! assert (n.compareTo (0), 1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3531 %! assert (n.compareTo (1), 0); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3532 %! assert (n.compareTo (2), -1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3533 |
25305
47c803b4b8ae
test: tag possible test failure with known bug #51804
Mike Miller <mtmiller@octave.org>
parents:
25139
diff
changeset
|
3534 %!testif HAVE_JAVA; usejava ("jvm") <51804> |
23681
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3535 %! n = javaObject ("java.lang.Short", 1.35); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3536 %! assert (n.compareTo (0), 1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3537 %! assert (n.compareTo (1), 0); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3538 %! assert (n.compareTo (2), -1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3539 |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3540 %!testif HAVE_JAVA; usejava ("jvm") |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3541 %! n = javaObject ("java.lang.Byte", int8 (17)); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3542 %! assert (n.compareTo (int8 (20)), -3); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3543 %! assert (n.compareTo (int8 (10)), 7); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3544 %! assert (n.compareTo (int8 (17)), 0); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3545 |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3546 %!testif HAVE_JAVA; usejava ("jvm") |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3547 %! b = javaObject ("java.lang.Boolean", true); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3548 %! assert (b.compareTo (true), 0); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3549 %! assert (b.compareTo (false), 1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3550 %! b = javaObject ("java.lang.Boolean", false); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3551 %! assert (b.compareTo (true), -1); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3552 %! assert (b.compareTo (false), 0); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3553 |
22489
93ea313301f9
test: Add bug ids (<#####>) to BIST tests.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
3554 ## Test for automatic conversion of specific numeric classes |
23573
1b4f4ec53b4a
use new script to tag fixed bugs in tests
John W. Eaton <jwe@octave.org>
parents:
23572
diff
changeset
|
3555 %!testif HAVE_JAVA; usejava ("jvm") <*48013> |
22203
2f301a30aeed
Add tests for Java numeric type conversion (bug #48013)
Mike Miller <mtmiller@octave.org>
parents:
22202
diff
changeset
|
3556 %! 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
|
3557 %! 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
|
3558 %! 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
|
3559 %! 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
|
3560 %! 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
|
3561 %! 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
|
3562 %! 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
|
3563 %! 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
|
3564 |
22489
93ea313301f9
test: Add bug ids (<#####>) to BIST tests.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
3565 ## Automatic conversion from string cell array into String[] |
23573
1b4f4ec53b4a
use new script to tag fixed bugs in tests
John W. Eaton <jwe@octave.org>
parents:
23572
diff
changeset
|
3566 %!testif HAVE_JAVA; usejava ("jvm") <*45290> |
21580
ecce63c99c3f
maint: Add semicolons to terminate code in %! blocks.
Rik <rik@octave.org>
parents:
21547
diff
changeset
|
3567 %! 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
|
3568 %! 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
|
3569 %! assert (javaMethod ("binarySearch", "java.util.Arrays", {"aaa", "bbb", "ccc", "zzz"}, "hhh") < 0); |
23671
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3570 |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3571 ## Test that Octave index syntax allows Java object method calls with args |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3572 %!testif HAVE_JAVA; usejava ("jvm") <*51152> |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3573 %! s = javaObject ("java.lang.String", "Octave"); |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3574 %! assert (s.length (), 6) |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3575 %! assert (s.charAt (0), "O") |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3576 %! assert (s.charAt (5), "e") |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3577 %! assert (s.matches ("^Octave$")) |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3578 %! assert (s.startsWith ("Oct")) |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3579 %! ## same tests with Java object as part of another indexing expression |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3580 %! a(1).s = s; |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3581 %! assert (! a(1).s.isEmpty ()) |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3582 %! assert (a(1).s.length (), 6) |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3583 %! assert (a(1).s.charAt (0), "O") |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3584 %! assert (a(1).s.charAt (5), "e") |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3585 %! assert (a(1).s.matches ("^Octave$")) |
d197f62cde8a
restore Java method calls by delegating indexing properly (bug #51152)
Mike Miller <mtmiller@octave.org>
parents:
23592
diff
changeset
|
3586 %! assert (a(1).s.startsWith ("Oct")) |
23681
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3587 |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3588 ## Check for basic usability of the java awt library |
24853
1e207bd05b5d
avoid AWT test on OS X (bug #53305)
John W. Eaton <jwe@octave.org>
parents:
24684
diff
changeset
|
3589 ## Skip the test on OS X where we currently have Java 9 and attempting |
1e207bd05b5d
avoid AWT test on OS X (bug #53305)
John W. Eaton <jwe@octave.org>
parents:
24684
diff
changeset
|
3590 ## to use awt causes Octave to exit with a message about Java not being |
1e207bd05b5d
avoid AWT test on OS X (bug #53305)
John W. Eaton <jwe@octave.org>
parents:
24684
diff
changeset
|
3591 ## installed (it is) instead of returning false. |
1e207bd05b5d
avoid AWT test on OS X (bug #53305)
John W. Eaton <jwe@octave.org>
parents:
24684
diff
changeset
|
3592 %!testif HAVE_JAVA; ! ismac () && usejava ("jvm") && usejava ("awt") && have_window_system () |
23681
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3593 %! frame = javaObject ("java.awt.Frame"); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3594 %! frame.setResizable (true); |
8b5bc5e5f74b
add unit tests creating and calling methods on some basic Java types
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
23671
diff
changeset
|
3595 %! assert (frame.isResizable ()); |
20120
2db2db2df55b
Automatically convert arrays of java primitives into Octave types (bug #44882)
Carnë Draug <carandraug@octave.org>
parents:
20028
diff
changeset
|
3596 */ |
29958
32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29655
diff
changeset
|
3597 |
32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29655
diff
changeset
|
3598 OCTAVE_NAMESPACE_END |