Skip to content

Commit 58278bc

Browse files
committed
remove javaLinkOption()
1 parent 822cf1c commit 58278bc

File tree

6 files changed

+10
-24
lines changed

6 files changed

+10
-24
lines changed

+stdlib/device.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
end
3939
elseif isunix() && stdlib.java_api() >= 11
4040
% Java 1.8 is buggy in some corner cases, so we require at least 11.
41-
i = java.nio.file.Files.getAttribute(javaPathObject(path), "unix:dev", javaLinkOption());
41+
opt = javaMethod("values", "java.nio.file.LinkOption");
42+
i = java.nio.file.Files.getAttribute(javaPathObject(path), "unix:dev", opt);
4243
end
4344

4445
end

+stdlib/get_owner.m

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@
1414
% https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/nio/file/LinkOption.html
1515

1616
op = javaPathObject(p);
17-
opt = javaLinkOption();
17+
opt = javaMethod("values", "java.nio.file.LinkOption");
1818

19-
if stdlib.isoctave()
20-
n = javaMethod("getOwner", "java.nio.file.Files", op, opt).toString();
21-
else
22-
n = java.nio.file.Files.getOwner(op, opt).string;
23-
end
19+
n = javaMethod("getOwner", "java.nio.file.Files", op, opt).toString();
2420

2521
end
2622

+stdlib/hard_link_count.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
c = s.nlink;
1919
end
2020
elseif isunix()
21-
c = java.nio.file.Files.getAttribute(javaPathObject(p), "unix:nlink", javaLinkOption());
21+
opt = javaMethod("values", "java.nio.file.LinkOption");
22+
c = java.nio.file.Files.getAttribute(javaPathObject(p), "unix:nlink", opt);
2223
end
2324

2425
end

+stdlib/inode.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
end
1717
elseif isunix() && stdlib.java_api() >= 11
1818
% Java 1.8 is buggy in some corner cases, so we require at least 11.
19-
i = java.nio.file.Files.getAttribute(javaPathObject(path), "unix:ino", javaLinkOption());
19+
opt = javaMethod("values", "java.nio.file.LinkOption");
20+
i = java.nio.file.Files.getAttribute(javaPathObject(path), "unix:ino", opt);
2021
end
2122

2223
end

+stdlib/is_regular_file.m

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,9 @@
1010
p = stdlib.absolute(p, pwd());
1111

1212
op = javaPathObject(p);
13-
opt = javaLinkOption();
13+
opt = javaMethod("values", "java.nio.file.LinkOption");
1414

15-
if stdlib.isoctave()
16-
r = javaMethod("isRegularFile", "java.nio.file.Files", op, opt);
17-
else
18-
r = java.nio.file.Files.isRegularFile(op, opt);
19-
end
15+
r = javaMethod("isRegularFile", "java.nio.file.Files", op, opt);
2016

2117
end
2218

+stdlib/private/javaLinkOption.m

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

0 commit comments

Comments
 (0)