consolidate

Author: scivision

+stdlib/filesystem_type.m

@@ -14,9 +14,7 @@
 if stdlib.has_dotnet()
   t = System.IO.DriveInfo(stdlib.absolute(p)).DriveFormat;
 elseif stdlib.has_java()
-  op = javaPathObject(p);
-
-  t = javaMethod("getFileStore", "java.nio.file.Files", op).type;
+  t = javaMethod("getFileStore", "java.nio.file.Files", javaPathObject(p)).type;
 end
 
 try  %#ok<*TRYNC>

+stdlib/get_owner.m

@@ -13,10 +13,14 @@
 % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/nio/file/Files.html#getOwner(java.nio.file.Path,java.nio.file.LinkOption...)
 % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/nio/file/LinkOption.html
 
-op = javaPathObject(p);
 opt = javaMethod("values", "java.nio.file.LinkOption");
 
-n = javaMethod("getOwner", "java.nio.file.Files", op, opt).toString();
+n = javaMethod("getOwner", "java.nio.file.Files", javaPathObject(p), opt).toString();
+% .toString() needed for Octave
+
+try %#ok<*TRYNC>
+  n = string(n);
+end
 
 end
 

+stdlib/get_pid.m

@@ -6,10 +6,12 @@
   pid = matlabProcessID;
 catch e
   switch e.identifier
-    case "MATLAB:UndefinedFunction", pid = uint64(feature("getpid"));
-    case "Octave:undefined-function", pid = uint64(getpid());
+    case "MATLAB:UndefinedFunction", pid = feature("getpid");
+    case "Octave:undefined-function", pid = getpid();
     otherwise, rethrow(e)
   end
+
+  pid = uint64(pid);
 end
 
 end

+stdlib/has_dotnet.m

@@ -1,6 +1,6 @@
 %% HAS_DOTNET check if .NET is available
 function tf = has_dotnet()
 
-tf = ~isMATLABReleaseOlderThan('R2023a') && NET.isNETSupported;
+tf = ~stdlib.isoctave() && ~isMATLABReleaseOlderThan('R2023a') && NET.isNETSupported;
 
 end

+stdlib/private/javaPathObject.m

@@ -1,11 +1,9 @@
 %% JAVAPATHOBJECT Return a Java nio.file.Path object for a given file path.
 function o = javaPathObject(p)
 
-if stdlib.isoctave()
-  o = javaObject("java.io.File", p).toPath();
-else
-  o = java.nio.file.Paths.get(p, javaArray('java.lang.String', 0));
-  % o = javaObject("java.io.File", p).toPath();  % above way about 20% faster
-end
+o = javaMethod("get", "java.nio.file.Paths", p, javaArray('java.lang.String', 0));
+
+% o = javaObject("java.io.File", p).toPath();
+% javaArray way about 20% faster
 
 end