java_version,api: simplify use

Author: scivision

+stdlib/inode.m

@@ -11,7 +11,7 @@
 
 if stdlib.has_python()
   i = uint64(py.pathlib.Path(path).stat().st_ino);
-elseif isunix() && stdlib.has_java() && stdlib.java_api() >= 11
+elseif isunix() && stdlib.java_api() >= 11
   % Java 1.8 is buggy in some corner cases, so we require at least 11.
   opt = javaMethod("values", "java.nio.file.LinkOption");
   i = javaMethod("getAttribute", "java.nio.file.Files", javaPathObject(path), "unix:ino", opt);

+stdlib/java_version.m

@@ -9,7 +9,11 @@
 
 function v = java_version()
 
-v = javaMethod("getProperty", "java.lang.System", "java.version");
+try
+  v = javaMethod("getProperty", "java.lang.System", "java.version");
+catch
+  v = '';
+end
 
 try %#ok<*TRYNC>
   v = string(v);

+stdlib/samepath.m

@@ -32,7 +32,7 @@
   f1 = System.IO.Path.GetFullPath(path1).TrimEnd(separators);
   f2 = System.IO.Path.GetFullPath(path2).TrimEnd(separators);
   y = System.String.Equals(f1, f2, System.StringComparison.OrdinalIgnoreCase);
-elseif stdlib.has_java() && stdlib.java_api() >= 11
+elseif stdlib.java_api() >= 11
 % https://docs.oracle.com/en/java/javase/24/docs/api/java.base/java/nio/file/Files.html#isSameFile(java.nio.file.Path,java.nio.file.Path)
 % Java 1.8 is buggy in some corner cases, so we require at least 11.
   y = java.nio.file.Files.isSameFile(javaPathObject(path1), javaPathObject(path2));

test/TestDisk.m

@@ -60,7 +60,7 @@ function test_filesystem_type(tc, Ps)
 
 function test_device(tc)
 
-tc.assumeTrue(stdlib.has_python() || (isunix() && stdlib.has_java() && stdlib.java_api() >= 11))
+tc.assumeTrue(stdlib.has_python() || (isunix() && stdlib.java_api() >= 11))
 
 if ispc()
   tc.verifyGreaterThan(stdlib.device(pwd()), 0)
@@ -71,7 +71,7 @@ function test_device(tc)
 
 
 function test_inode(tc)
-tc.assumeTrue(stdlib.has_python() || (~ispc() && stdlib.has_java() && stdlib.java_api() >= 11))
+tc.assumeTrue(stdlib.has_python() || (~ispc() && stdlib.java_api() >= 11))
 
 tc.verifyEqual(stdlib.inode("."), stdlib.inode(pwd()))
 end