Skip to content

Commit ac551e5

Browse files
committed
javaLinkOption() dedupe
1 parent a9a0453 commit ac551e5

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

+stdlib/exists.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
if use_java
2020
% 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...)
2121
% this takes 2x longer than java.io.File.exists()
22-
% opt = java.nio.file.LinkOption.values;
22+
% opt = javaLinkOption();
2323
% ok = java.nio.file.Files.exists(java.io.File(p).toPath(), opt);
2424

2525
% https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/io/File.html#exists()

+stdlib/get_owner.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
% https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/nio/file/LinkOption.html
1010

1111
op = javaFileObject(p).toPath();
12+
opt = javaLinkOption();
1213

1314
if stdlib.isoctave()
14-
opt = javaMethod("values", "java.nio.file.LinkOption");
1515
n = javaMethod("getOwner", "java.nio.file.Files", op, opt).toString();
1616
else
17-
opt = java.nio.file.LinkOption.values;
1817
n = string(java.nio.file.Files.getOwner(op, opt));
1918
end
2019

+stdlib/hard_link_count.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
end
1616

1717
op = javaFileObject(p).toPath();
18+
opt = javaLinkOption();
1819

1920
if stdlib.isoctave()
20-
opt = javaMethod("values", "java.nio.file.LinkOption");
2121
c = javaMethod("getAttribute", "java.nio.file.Files", op, "unix:nlink", opt);
2222
else
23-
opt = java.nio.file.LinkOption.values;
2423
c = java.nio.file.Files.getAttribute(op, "unix:nlink", opt);
2524
end
2625

+stdlib/is_regular_file.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
p = stdlib.absolute(p, "", false, true);
1010

1111
op = java.io.File(p).toPath();
12+
opt = javaLinkOption();
1213

1314
if stdlib.isoctave()
14-
opt = javaMethod("values", "java.nio.file.LinkOption");
1515
r = javaMethod("isRegularFile", "java.nio.file.Files", op, opt);
1616
else
17-
opt = java.nio.file.LinkOption.values;
1817
r = java.nio.file.Files.isRegularFile(op, opt);
1918
end
2019

+stdlib/private/javaLinkOption.m

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
function o = javaLinkOption()
2+
3+
try
4+
o = java.nio.file.LinkOption.values;
5+
catch e
6+
7+
8+
end

0 commit comments

Comments
 (0)