Mercurial > hg > octave-nkf

changeset 19097:54ab08d8de55 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"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.
author Carnë Draug <carandraug@octave.org>
date Sat, 12 Jul 2014 23:23:13 +0100
parents 310fd62e9d4b
children 10c38b9e5423
files scripts/deprecated/java_get.m scripts/deprecated/java_set.m scripts/java/java_get.m scripts/java/java_set.m
diffstat 2 files changed, 0 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
rename from scripts/deprecated/java_get.m
rename to scripts/java/java_get.m
--- a/scripts/deprecated/java_get.m
+++ b/scripts/java/java_get.m
@@ -38,13 +38,6 @@
 
 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
@@ -52,8 +45,6 @@
   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");
rename from scripts/deprecated/java_set.m
rename to scripts/java/java_set.m
--- a/scripts/deprecated/java_set.m
+++ b/scripts/java/java_set.m
@@ -38,13 +38,6 @@
 
 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
@@ -52,8 +45,6 @@
   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");