java compatiblity

scivision · scivision · commit 94d0d6dc58a6 · 2025-08-13T02:47:08.000-04:00
diff --git a/+stdlib/+java/cpu_arch.m b/+stdlib/+java/cpu_arch.m
@@ -1,5 +1,5 @@
 function a = cpu_arch()
 
-a = char(javaMethod("getProperty", "java.lang.System", "os.arch"));
+a = char(java.lang.System.getProperty('os.arch'));
 
 end
diff --git a/+stdlib/+java/cpu_load.m b/+stdlib/+java/cpu_load.m
@@ -1,7 +1,6 @@
 function L = cpu_load()
 
-
-b = javaMethod("getOperatingSystemMXBean", "java.lang.management.ManagementFactory");
+b = java.lang.management.ManagementFactory.getOperatingSystemMXBean();
 
 L = b.getSystemLoadAverage();
 if L < 0
diff --git a/+stdlib/+java/device.m b/+stdlib/+java/device.m
@@ -1,8 +1,8 @@
 function i = device(file)
 
-opt = javaMethod("values", "java.nio.file.LinkOption");
+opt = java.nio.file.LinkOption.values();
 p = javaPathObject(file);
-i = java.nio.file.Files.getAttribute(p, "unix:dev", opt);
+i = java.nio.file.Files.getAttribute(p, 'unix:dev', opt);
 
 i = uint64(i);
 end
diff --git a/+stdlib/+java/disk_capacity.m b/+stdlib/+java/disk_capacity.m
@@ -1,5 +1,5 @@
 function f = disk_capacity(d)
 
-f = uint64(javaObject("java.io.File", d).getTotalSpace());
+f = uint64(java.io.File(d).getTotalSpace());
 
 end
diff --git a/+stdlib/+java/get_hostname.m b/+stdlib/+java/get_hostname.m
@@ -1,5 +1,5 @@
 function n = get_hostname()
 
-n = char(javaMethod("getLocalHost", "java.net.InetAddress").getHostName());
+n = char(java.net.InetAddress.getLocalHost().getHostName());
 
 end
diff --git a/+stdlib/+java/get_owner.m b/+stdlib/+java/get_owner.m
@@ -6,10 +6,14 @@
 % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/nio/file/LinkOption.html
 
 if stdlib.exists(p)
-  opt = javaMethod("values", "java.nio.file.LinkOption");
-  n = string(java.nio.file.Files.getOwner(javaPathObject(p), opt));
+  opt = java.nio.file.LinkOption.values();
+  n = char(java.nio.file.Files.getOwner(javaPathObject(p), opt));
 else
-  n = "";
+  n = '';
+end
+
+try %#ok<TRYNC>
+  n = string(n);
 end
 
 end
diff --git a/+stdlib/+java/get_username.m b/+stdlib/+java/get_username.m
@@ -1,5 +1,5 @@
 function n = get_username()
 
-n = char(javaMethod("getProperty", "java.lang.System", "user.name"));
+n = char(java.lang.System.getProperty('user.name'));
 
 end
diff --git a/+stdlib/+java/is_exe.m b/+stdlib/+java/is_exe.m
@@ -6,6 +6,6 @@
   y = y && stdlib.native.has_windows_executable_suffix(p);
 end
 
-y = y && javaObject("java.io.File", p).canExecute();
+y = y && java.io.File(p).canExecute();
 
 end
diff --git a/+stdlib/+java/is_readable.m b/+stdlib/+java/is_readable.m
@@ -1,5 +1,5 @@
 function y = is_readable(p)
 
-y = javaObject("java.io.File", p).canRead();
+y = java.io.File(p).canRead();
 
 end
diff --git a/+stdlib/+java/is_writable.m b/+stdlib/+java/is_writable.m
@@ -7,5 +7,5 @@
 % file = stdlib.absolute(file, "", false);
 % ok = java.nio.file.Files.isWritable(javaPathObject(file));
 
-y = javaObject("java.io.File", p).canWrite();
+y = java.io.File(p).canWrite();
 end
diff --git a/+stdlib/+java/os_version.m b/+stdlib/+java/os_version.m
@@ -1,6 +1,6 @@
 function [os, version] = os_version()
 
-os = char(javaMethod("getProperty", "java.lang.System", "os.name"));
-version = char(javaMethod("getProperty", "java.lang.System", "os.version"));
+os = char(java.lang.System.getProperty('os.name'));
+version = char(java.lang.System.getProperty('os.version'));
 
 end
diff --git a/+stdlib/+java/parent.m b/+stdlib/+java/parent.m
@@ -1,6 +1,6 @@
 function p = parent(pth)
 
-p = javaObject("java.io.File", pth).getParent();
+p = java.io.File(pth).getParent();
 if isempty(p)
   rn = stdlib.root_name(pth);
   if ispc() && ~stdlib.strempty(pth) && ~stdlib.strempty(rn) && startsWith(pth, rn)
diff --git a/+stdlib/+java/private/javaPathObject.m b/+stdlib/+java/private/javaPathObject.m
@@ -1,9 +1,9 @@
 %% JAVAPATHOBJECT Return a Java nio.file.Path object for a given file path.
 function o = javaPathObject(p)
 
-o = javaMethod("get", "java.nio.file.Paths", p, javaArray('java.lang.String', 0));
+o = java.nio.file.Paths.get(p, javaArray('java.lang.String', 0));
 
-% o = javaObject("java.io.File", p).toPath();
+% o = java.io.File(p).toPath();
 % javaArray way about 20% faster
 
 end
diff --git a/+stdlib/+java/ram_free.m b/+stdlib/+java/ram_free.m
@@ -1,6 +1,6 @@
 function bytes = ram_free()
 
-b = javaMethod("getOperatingSystemMXBean", "java.lang.management.ManagementFactory");
+b = java.lang.management.ManagementFactory.getOperatingSystemMXBean();
 
 if stdlib.java_api() < 14
   bytes = b.getFreePhysicalMemorySize();
diff --git a/+stdlib/+java/ram_total.m b/+stdlib/+java/ram_total.m
@@ -4,7 +4,7 @@
 
 % https://docs.oracle.com/en/java/javase/21/docs/api/jdk.management/com/sun/management/OperatingSystemMXBean.html#getTotalMemorySize()
 
-b = javaMethod("getOperatingSystemMXBean", "java.lang.management.ManagementFactory");
+b = java.lang.management.ManagementFactory.getOperatingSystemMXBean();
 
 if stdlib.java_api() < 14
   bytes = b.getTotalPhysicalMemorySize();
diff --git a/+stdlib/+java/set_modtime.m b/+stdlib/+java/set_modtime.m
@@ -4,6 +4,6 @@
 
 utc = convertTo(datetime(t, 'TimeZone', "UTC"), "posixtime");
 
-ok = javaObject("java.io.File", file).setLastModified(int64(utc) * 1000);
+ok = java.io.File(file).setLastModified(int64(utc) * 1000);
 
 end
diff --git a/+stdlib/cpu_count.m b/+stdlib/cpu_count.m
@@ -3,7 +3,7 @@
 
 N = maxNumCompThreads;
 
-if N < 2 && ~stdlib.isoctave() % happens on some HPC
+if N < 2 % happens on some HPC
   N = feature('NumCores');
 end
 
diff --git a/+stdlib/h5get_version.m b/+stdlib/h5get_version.m
@@ -4,6 +4,6 @@
 
 [major, minor, rel] = H5.get_libversion();
 
-v = sprintf("%d.%d.%d", major, minor, rel);
+v = sprintf('%d.%d.%d', major, minor, rel);
 
 end
diff --git a/+stdlib/java_api.m b/+stdlib/java_api.m
@@ -3,13 +3,10 @@
 function a = java_api()
 
 try
-  a = javaMethod("getProperty", "java.lang.System", "java.specification.version");
+  a = java.lang.System.getProperty('java.specification.version');
+  a = str2double(a);
 catch
   a = [];
 end
 
-if ~isempty(a)
-  a = str2double(a);
-end
-
 end
diff --git a/+stdlib/java_home.m b/+stdlib/java_home.m
@@ -3,11 +3,11 @@
 function h = java_home()
 
 try
-  h = javaMethod("getProperty", "java.lang.System", "java.home");
+  h = java.lang.System.getProperty('java.home');
 catch
   h = '';
 end
 
-h = string(h);
+h = char(h);
 
 end
diff --git a/+stdlib/java_vendor.m b/+stdlib/java_vendor.m
@@ -2,8 +2,8 @@
 
 function v = java_vendor()
 
-v = javaMethod("getProperty", "java.lang.System", "java.vendor");
+v = java.lang.System.getProperty('java.vendor');
 
-v = string(v);
+v = char(v);
 
 end
diff --git a/+stdlib/java_version.m b/+stdlib/java_version.m
@@ -10,11 +10,11 @@
 function v = java_version()
 
 try
-  v = javaMethod("getProperty", "java.lang.System", "java.version");
+  v = java.lang.System.getProperty('java.version');
 catch
   v = '';
 end
 
-v = string(v);
+v = char(v);
 
 end
diff --git a/+stdlib/matlabOlderThan.m b/+stdlib/matlabOlderThan.m
@@ -1,5 +1,5 @@
 %% MATLABOLDERTHAN compare Matlab release name only e.g. R2025a
-% this is to allow a basic version check back to very old Matlab
+% works back to Matlab R2011b at least
 
 function isOlder = matlabOlderThan(release)
 
@@ -11,7 +11,7 @@
   end
 
   r = char(release);
-  assert(length(r) == 6 && r(1) == 'R', "Release must be a string like 'R2025a'")
+  assert(length(r) == 6 && r(1) == 'R', 'Release must be a string like ''R2025a''')
 
   curr = version('-release');
   nc = str2double(curr(1:4));
diff --git a/+stdlib/platform_tell.m b/+stdlib/platform_tell.m
@@ -1,5 +1,5 @@
 %% PLATFORM_TELL - Display information about the platform and environment
-% designed to work back to R2016b
+% works back to very old Matlab (R2011b at least)
 
 function json = platform_tell()
 
@@ -44,7 +44,7 @@
   raw.(vt) = '';
 
   if ~isempty(co)
-    raw.(ct) = co.ShortName;
+    raw.(ct) = co.Name;
     raw.(vt) = co.Version;
   end
 end
diff --git a/+stdlib/private/h5save_new.m b/+stdlib/private/h5save_new.m
@@ -25,7 +25,7 @@ function h5save_new(filename, varname, A, sizeA, compressLevel)
   else
     h5create(filename, varname, sizeA, 'Datatype', class(A))
   end
-elseif ~compressLevel || stdlib.isoctave()
+elseif ~compressLevel
   h5create(filename, varname, sizeA, 'Datatype', class(A))
 else
   h5create(filename, varname, sizeA, 'Datatype', class(A), ...
diff --git a/+stdlib/private/javaPathObject.m b/+stdlib/private/javaPathObject.m
@@ -1,9 +1,9 @@
 %% JAVAPATHOBJECT Return a Java nio.file.Path object for a given file path.
 function o = javaPathObject(p)
 
-o = javaMethod("get", "java.nio.file.Paths", p, javaArray('java.lang.String', 0));
+o = java.nio.file.Paths.get(p, javaArray('java.lang.String', 0));
 
-% o = javaObject("java.io.File", p).toPath();
+% o = java.io.File(p).toPath();
 % javaArray way about 20% faster
 
 end
diff --git a/+stdlib/version_atleast.m b/+stdlib/version_atleast.m
@@ -14,12 +14,6 @@
   ref (1,1) string
 end
 
-
-if stdlib.isoctave()
-  r = compare_versions(in, ref, '>=');
-  return
-end
-
 parts1 = str2double(strsplit(in, '.'));
 parts2 = str2double(strsplit(ref, '.'));
 
diff --git a/scripts/MatlabReleaseUpgrade.m b/scripts/MatlabReleaseUpgrade.m
@@ -79,7 +79,7 @@ function MatlabReleaseUpgrade(doUpgrade)
 elseif ispc()
   head = fullfile(getenv("LOCALAPPDATA"), 'MathWorks/ServiceHost');
 else
-  hostname = string(javaMethod("getLocalHost", "java.net.InetAddress").getHostName());
+  hostname = char(java.net.InetAddress.getLocalHost().getHostName());
   head = fullfile(getenv("HOME"), '.MathWorks/ServiceHost', hostname);
 end
 mustBeFolder(head)
diff --git a/test/TestDisk.m b/test/TestDisk.m
@@ -149,12 +149,10 @@ function test_owner(tc, Po, all_fun)
   return
 end
 
-tc.verifyClass(o, "string")
-
 if stdlib.exists(Po)
   tc.verifyGreaterThan(strlength(o), 0)
 else
-  tc.verifyEqual(o, "")
+  tc.verifyEqual(strlength(o), 0)
 end
 
 end
