comparison scripts/general/methods.m @ 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 42cff4396de4
children cf3a18843a26
comparison
equal deleted inserted replaced
15789:8056d0e36bef 15790:921912c92102
40 elseif (ischar (obj)) 40 elseif (ischar (obj))
41 ## Could be a classname for an Octave class or Java class. 41 ## Could be a classname for an Octave class or Java class.
42 ## Try Octave class first. 42 ## Try Octave class first.
43 mtds_list = __methods__ (obj); 43 mtds_list = __methods__ (obj);
44 if (isempty (mtds_list)) 44 if (isempty (mtds_list))
45 mtds_str = java_invoke ("org.octave.ClassHelper", "getMethods", obj); 45 mtds_str = javaMethod ("getMethods", "org.octave.ClassHelper", obj);
46 mtds_list = strsplit (mtds_str, ';'); 46 mtds_list = strsplit (mtds_str, ';');
47 endif 47 endif
48 elseif (isjava (obj)) 48 elseif (isjava (obj))
49 mtds_str = java_invoke ("org.octave.ClassHelper", "getMethods", obj); 49 mtds_str = javaMethod ("getMethods", "org.octave.ClassHelper", obj);
50 mtds_list = strsplit (mtds_str, ';'); 50 mtds_list = strsplit (mtds_str, ';');
51 else 51 else
52 error ("methods: Invalid input argument"); 52 error ("methods: Invalid input argument");
53 endif 53 endif
54 54