Mercurial > octave
diff libinterp/octave-value/ov-java.h @ 15790:921912c92102
Deprecate java_invoke, replace with javaMethod.
Update all m-files to use javaMethod.
* scripts/deprecated/java_invoke.m: New m-file with warning about function
being deprecated.
* libinterp/octave-value/ov-java.cc(Fjava_invoke, FjavaMethod): Remove
java_invoke. Replace body of javaMethod with old java_invoke code.
* libinterp/octave-value/ov-java.cc(do_java_invoke): Rename to do_javaMethod.
* libinterp/octave-value/ov-java.cc(do_java_create): Rename to do_javaObject.
* libinterp/octave-value/ov-java.h(do_java_invoke, do_java_create): Rename
prototypes for functions to do_javaMethod and do_javaObject respectively.
* scripts/deprecated/javafields.m, scripts/deprecated/javamethods.m,
scripts/deprecated/module.mk, scripts/general/fieldnames.m,
scripts/general/methods.m, scripts/java/errordlg.m, scripts/java/helpdlg.m,
scripts/java/inputdlg.m, scripts/java/javaArray.m, scripts/java/javaaddpath.m,
scripts/java/javaclasspath.m, scripts/java/javamem.m,
scripts/java/javarmpath.m, scripts/java/listdlg.m, scripts/java/msgbox.m,
scripts/java/questdlg.m, scripts/java/warndlg.m: Replace java_invoke calls
with javaMethod calls.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 14 Dec 2012 09:51:37 -0800 |
| parents | e61405133a76 |
| children | 49f5962fa20d |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.h Fri Dec 14 09:43:22 2012 -0800 +++ b/libinterp/octave-value/ov-java.h Fri Dec 14 09:51:37 2012 -0800 @@ -198,34 +198,34 @@ static JNIEnv* thread_jni_env (void); - octave_value do_java_invoke (JNIEnv* jni_env, const std::string& name, - const octave_value_list& args); + octave_value do_javaMethod (JNIEnv* jni_env, const std::string& name, + const octave_value_list& args); octave_value - do_java_invoke (const std::string& name, const octave_value_list& args) + do_javaMethod (const std::string& name, const octave_value_list& args) { - return do_java_invoke(thread_jni_env (), name, args); + return do_javaMethod(thread_jni_env (), name, args); } static octave_value - do_java_invoke (JNIEnv* jni_env, const std::string& class_name, - const std::string& name, const octave_value_list& args); + do_javaMethod (JNIEnv* jni_env, const std::string& class_name, + const std::string& name, const octave_value_list& args); static octave_value - do_java_invoke (const std::string& class_name, const std::string& name, - const octave_value_list& args) + do_javaMethod (const std::string& class_name, const std::string& name, + const octave_value_list& args) { - return do_java_invoke(thread_jni_env (), class_name, name, args); + return do_javaMethod(thread_jni_env (), class_name, name, args); } static octave_value - do_java_create (JNIEnv* jni_env, const std::string& name, - const octave_value_list& args); + do_javaObject (JNIEnv* jni_env, const std::string& name, + const octave_value_list& args); static octave_value - do_java_create (const std::string& name, const octave_value_list& args) + do_javaObject (const std::string& name, const octave_value_list& args) { - return do_java_create (thread_jni_env (), name, args); + return do_javaObject (thread_jni_env (), name, args); } octave_value do_java_get (JNIEnv* jni_env, const std::string& name);