remove use_java option for clarity/brevity

Author: scivision

+stdlib/absolute.m

@@ -16,16 +16,15 @@
 % does not normalize path
 % non-existant path is made absolute relative to pwd
 
-function c = absolute(p, base, expand_tilde, use_java)
+function c = absolute(p, base, expand_tilde)
 arguments
   p (1,1) string
   base (1,1) string = ""
   expand_tilde (1,1) logical = true
-  use_java (1,1) logical = false
 end
 
 if expand_tilde
-  c = stdlib.expanduser(p, use_java);
+  c = stdlib.expanduser(p);
 else
   c = stdlib.posix(p);
 end
@@ -37,7 +36,7 @@
 if stdlib.len(base) == 0
   b = pwd();
 elseif expand_tilde
-  b = stdlib.expanduser(base, use_java);
+  b = stdlib.expanduser(base);
 else
   b = base;
 end

+stdlib/canonical.m

@@ -11,18 +11,16 @@
 % * expand_tilde: expand ~ to username if present
 %%% Outputs
 % * c: canonical path, if determined
-% https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/io/File.html#getCanonicalPath()
 
-function c = canonical(p, expand_tilde, use_java)
+function c = canonical(p, expand_tilde)
 arguments
   p (1,1) string
   expand_tilde (1,1) logical = true
-  use_java (1,1) logical = false
 end
 
 
 if expand_tilde
-  e = stdlib.expanduser(p, use_java);
+  e = stdlib.expanduser(p);
 else
   e = p;
 end
@@ -39,10 +37,6 @@
 if stdlib.isoctave()
 % empty if any component of path does not exist
   c = canonicalize_file_name(e);
-elseif use_java && stdlib.is_absolute(e, true)
-% incorrect result if relative path and any component of path does not exist
-% disp("java")
-  c = javaFileObject(e).getCanonicalPath();
 else
 % errors if any component of path does not exist.
 % disp("builtin")
@@ -52,7 +46,7 @@
 end
 
 if ~stdlib.len(c)
-  c = stdlib.normalize(e, use_java);
+  c = stdlib.normalize(e);
 end
 
 c = stdlib.posix(c);

+stdlib/cpu_count.m

@@ -1,11 +1,11 @@
 %% CPU_COUNT how many CPUs are available
 function N = cpu_count()
 
-  N = maxNumCompThreads;
+N = maxNumCompThreads;
 
-  if N < 2 && ~stdlib.isoctave() % happens on some HPC
-    N = feature('NumCores');
-  end
+if N < 2 && ~stdlib.isoctave() % happens on some HPC
+  N = feature('NumCores');
+end
 
 % logical CPUs
 % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/lang/Runtime.html#getRuntime()

+stdlib/drop_slash.m

@@ -23,7 +23,7 @@
   return;
 end
 
-if ~ispc || (L ~= 3 || ~strcmp(d, stdlib.root(s, false)))
+if ~ispc || (L ~= 3 || ~strcmp(d, stdlib.root(s)))
   if ischar(s)
     if d(end) == '/'
       d = d(1:end-1);

+stdlib/exists.m

@@ -8,27 +8,13 @@
 % * p: path to check
 %%% Outputs
 % * ok: true if exists
-%
 
-function ok = exists(p, use_java)
+function ok = exists(p)
 arguments
   p (1,1) string
-  use_java (1,1) logical = false
 end
 
-if use_java
-  % Windows: does NOT detect App Execution Aliases
-% https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/Files.html#exists(java.nio.file.Path,java.nio.file.LinkOption...)
-% this takes 2x longer than java.io.File.exists()
-% opt = javaLinkOption();
-% ok = java.nio.file.Files.exists(java.io.File(p).toPath(), opt);
-
-% https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/io/File.html#exists()
-% takes 2x longer than native Matlab isfile || isfolder
-  ok = javaFileObject(p).exists();
-else
-  ok = isfile(p) || isfolder(p);
-end
+ok = isfile(p) || isfolder(p);
 
 end
 

+stdlib/expanduser.m

@@ -7,10 +7,9 @@
 %%% Outputs
 % * e: expanded path
 
-function e = expanduser(p, use_java)
+function e = expanduser(p)
 arguments
   p (1,1) string
-  use_java (1,1) logical = false
 end
 
 e = stdlib.drop_slash(p);
@@ -20,7 +19,7 @@
   return
 end
 
-home = stdlib.homedir(use_java);
+home = stdlib.homedir();
 
 if stdlib.len(home) == 0
   return
@@ -41,9 +40,9 @@
 end
 
 
-%!assert(expanduser('', 0), '')
-%!assert(expanduser("~", 0), homedir())
-%!assert(expanduser("~/", 0), homedir())
-%!assert(expanduser("~user", 0), "~user")
-%!assert(expanduser("~user/", 0), "~user")
-%!assert(expanduser("~///c", 0), strcat(homedir(), "/c"))
+%!assert(expanduser(''), '')
+%!assert(expanduser("~"), homedir())
+%!assert(expanduser("~/"), homedir())
+%!assert(expanduser("~user"), "~user")
+%!assert(expanduser("~user/"), "~user")
+%!assert(expanduser("~///c"), strcat(homedir(), "/c"))

+stdlib/file_size.m

@@ -1,17 +1,14 @@
 % FILE_SIZE size in bytes of file
 
-function s = file_size(p, use_java)
+function s = file_size(p)
 arguments
   p (1,1) string
-  use_java (1,1) logical = false
 end
 
 s = [];
 
 if ~isfile(p)
   return
-elseif use_java
-  s = javaFileObject(p).length();
 else
   s = dir(p);
   if ~isempty(s)

+stdlib/get_modtime.m

@@ -7,16 +7,10 @@
 
 if stdlib.exists(p)
 
-  utc = javaFileObject(p).lastModified() / 1000;
+  t = javaFileObject(p).lastModified() / 1000;
 
-  try
-    t = datetime(utc, "ConvertFrom", "PosixTime");
-  catch e
-    if strcmp(e.identifier, "Octave:undefined-function")
-      t = utc;
-    else
-      rethrow(e);
-    end
+  try %#ok<TRYNC>
+    t = datetime(t, "ConvertFrom", "PosixTime");
   end
 else
   try

+stdlib/h5get_version.m

@@ -7,3 +7,5 @@
 v = sprintf("%d.%d.%d", major, minor, rel);
 
 end
+
+%!testif 0

+stdlib/homedir.m

@@ -1,17 +1,8 @@
 %% HOMEDIR get user home directory
-%
-% Ref:
-% * https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/System.html#getProperty(java.lang.String)
-% * https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/System.html#getProperties()
 
-function h = homedir(use_java)
-arguments
-  use_java (1,1) logical = false
-end
+function h = homedir()
 
-if use_java
-  h = javaSystemProperty("user.home");
-elseif ispc
+if ispc
   h = getenv("USERPROFILE");
 else
   h = getenv("HOME");