# HG changeset patch # User Carnë Draug # Date 1405203793 -3600 # Node ID 54ab08d8de558ce15298bcd8c2c4c448131728a6 # Parent 310fd62e9d4bb42470f6eadde264b26f8dac29d7 "Un"-deprecate java_get() and java_set() functions (bug #41239). * java_get.m, java_set.m: move from scripts/deprecated into scripts/java. These are being un-deprecated because there is no alternative for them yet. These functions never existed as m .files, they were previously loadable functions, now __java_set__ and __java_get__, which were removed with 4698ea77aa75. diff -r 310fd62e9d4b -r 54ab08d8de55 scripts/deprecated/java_get.m --- a/scripts/deprecated/java_get.m Fri Jul 04 17:12:50 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -## Copyright (C) 2012-2013 Rik Wehbring -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## . - -## -*- texinfo -*- -## @deftypefn {Loadable Function} {@var{val} =} java_get (@var{obj}, @var{name}) -## Get the value of the field @var{name} of the Java object @var{obj}. For -## static fields, @var{obj} can be a string representing the fully qualified -## name of the corresponding class. -## -## When @var{obj} is a regular Java object, structure-like indexing can be -## used as a shortcut syntax. For instance, the two following statements are -## equivalent -## -## @example -## @group -## java_get (x, "field1") -## x.field1 -## @end group -## @end example -## -## @seealso{java_set, javaMethod, javaObject} -## @end deftypefn - -function retval = java_get (obj, name) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "java_get is obsolete and will be removed from a future version of Octave; use structure-like indexing instead"); - endif - - if (nargin != 2) - print_usage (); - endif - - if (isjava (obj)) - retval = obj.(name); - elseif (ischar (obj)) - ## FIXME: Need a solution for getting static fields of class - ## which does not depend on __java_get__ which will be removed. - retval = __java_get__ (obj, name); - else - error ("java_get: OBJ must be a Java object"); - endif - -endfunction - diff -r 310fd62e9d4b -r 54ab08d8de55 scripts/deprecated/java_set.m --- a/scripts/deprecated/java_set.m Fri Jul 04 17:12:50 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -## Copyright (C) 2012-2013 Rik Wehbring -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## . - -## -*- texinfo -*- -## @deftypefn {Loadable Function} {@var{obj} =} java_set (@var{obj}, @var{name}, @var{val}) -## Set the value of the field @var{name} of the Java object @var{obj} to -## @var{val}. For static fields, @var{obj} can be a string representing the -## fully qualified named of the corresponding Java class. -## -## When @var{obj} is a regular Java object, structure-like indexing can be -## used as a shortcut syntax. For instance, the two following statements are -## equivalent -## -## @example -## @group -## java_set (x, "field1", val) -## x.field1 = val -## @end group -## @end example -## -## @seealso{java_get, javaMethod, javaObject} -## @end deftypefn - -function retval = java_set (obj, name, val) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "java_set is obsolete and will be removed from a future version of Octave; use structure-like indexing instead"); - endif - - if (nargin != 3) - print_usage (); - endif - - if (isjava (obj)) - obj.(name) = val; - elseif (ischar (obj)) - ## FIXME: Need a solution for getting static fields of class - ## which does not depend on __java_set__ which will be removed. - retval = __java_set__ (obj, name, val); - else - error ("java_set: OBJ must be a Java object"); - endif - -endfunction - diff -r 310fd62e9d4b -r 54ab08d8de55 scripts/java/java_get.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/java/java_get.m Sat Jul 12 23:23:13 2014 +0100 @@ -0,0 +1,54 @@ +## Copyright (C) 2012-2013 Rik Wehbring +## +## This file is part of Octave. +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or (at +## your option) any later version. +## +## Octave is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, see +## . + +## -*- texinfo -*- +## @deftypefn {Loadable Function} {@var{val} =} java_get (@var{obj}, @var{name}) +## Get the value of the field @var{name} of the Java object @var{obj}. For +## static fields, @var{obj} can be a string representing the fully qualified +## name of the corresponding class. +## +## When @var{obj} is a regular Java object, structure-like indexing can be +## used as a shortcut syntax. For instance, the two following statements are +## equivalent +## +## @example +## @group +## java_get (x, "field1") +## x.field1 +## @end group +## @end example +## +## @seealso{java_set, javaMethod, javaObject} +## @end deftypefn + +function retval = java_get (obj, name) + + if (nargin != 2) + print_usage (); + endif + + if (isjava (obj)) + retval = obj.(name); + elseif (ischar (obj)) + retval = __java_get__ (obj, name); + else + error ("java_get: OBJ must be a Java object"); + endif + +endfunction + diff -r 310fd62e9d4b -r 54ab08d8de55 scripts/java/java_set.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/java/java_set.m Sat Jul 12 23:23:13 2014 +0100 @@ -0,0 +1,54 @@ +## Copyright (C) 2012-2013 Rik Wehbring +## +## This file is part of Octave. +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or (at +## your option) any later version. +## +## Octave is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, see +## . + +## -*- texinfo -*- +## @deftypefn {Loadable Function} {@var{obj} =} java_set (@var{obj}, @var{name}, @var{val}) +## Set the value of the field @var{name} of the Java object @var{obj} to +## @var{val}. For static fields, @var{obj} can be a string representing the +## fully qualified named of the corresponding Java class. +## +## When @var{obj} is a regular Java object, structure-like indexing can be +## used as a shortcut syntax. For instance, the two following statements are +## equivalent +## +## @example +## @group +## java_set (x, "field1", val) +## x.field1 = val +## @end group +## @end example +## +## @seealso{java_get, javaMethod, javaObject} +## @end deftypefn + +function retval = java_set (obj, name, val) + + if (nargin != 3) + print_usage (); + endif + + if (isjava (obj)) + obj.(name) = val; + elseif (ischar (obj)) + retval = __java_set__ (obj, name, val); + else + error ("java_set: OBJ must be a Java object"); + endif + +endfunction +