Skip to content

Commit 215ba48

Browse files
committed
java: remove redundant fcn
1 parent 38a1b4a commit 215ba48

File tree

7 files changed

+7
-27
lines changed

7 files changed

+7
-27
lines changed

+stdlib/disk_available.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
if NET.isNETSupported
1717
f = System.IO.DriveInfo(stdlib.absolute(d)).AvailableFreeSpace();
1818
else
19-
f = javaFileObject(d).getUsableSpace();
19+
f = javaMethod("getUsableSpace", "java.io.File", d);
2020
f = uint64(f);
2121
end
2222

+stdlib/disk_capacity.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
if NET.isNETSupported
1515
f = System.IO.DriveInfo(stdlib.absolute(d)).TotalSize();
1616
else
17-
f = javaFileObject(d).getTotalSpace();
17+
f = javaMethod("getTotalSpace", "java.io.File", d);
1818
f = uint64(f);
1919
end
2020

+stdlib/get_modtime.m

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,7 @@
1212
end
1313

1414

15-
if stdlib.isoctave()
16-
[s, err] = stat(p);
17-
if err == 0
18-
t = s.mtime;
19-
else
20-
t = [];
21-
end
22-
return
23-
end
24-
25-
t = javaFileObject(p).lastModified() / 1000;
15+
t = javaObject("java.io.File", p).lastModified() / 1000;
2616

2717
if t > 0
2818
t = datetime(t, ConvertFrom="PosixTime");

+stdlib/java_run_octave.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
if ~strempty(cwd)
5757
% https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/ProcessBuilder.html#directory(java.io.File)
58-
proc.directory(javaFileObject(cwd));
58+
proc.directory(javaObject("java.io.File", cwd));
5959
end
6060

6161
%% start process

+stdlib/private/javaFileObject.m

Lines changed: 0 additions & 10 deletions
This file was deleted.

+stdlib/private/javaPathObject.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
function o = javaPathObject(p)
33

44
if stdlib.isoctave()
5-
o = javaFileObject(p).toPath();
5+
o = javaObject("java.io.File", p).toPath();
66
else
77
o = java.nio.file.Paths.get(p, javaArray('java.lang.String', 0));
8-
% o = javaFileObject(p).toPath(); % above way about 20% faster
8+
% o = javaObject("java.io.File", p).toPath(); % above way about 20% faster
99
end
1010

1111
end

+stdlib/set_modtime.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
end
1717
end
1818

19-
ok = javaFileObject(p).setLastModified(int64(utc) * 1000);
19+
ok = javaObject("java.io.File", p).setLastModified(int64(utc) * 1000);
2020

2121
end
2222

0 commit comments

Comments
 (0)