Skip to content

Commit 4fe031e

Browse files
committed
simplify java internals
1 parent 1374222 commit 4fe031e

File tree

5 files changed

+20
-36
lines changed

5 files changed

+20
-36
lines changed

+stdlib/private/javaFileObject.m

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
%% JAVAFILEOBJECT Return a Java File object for a given file path.
22
function o = javaFileObject(p)
33

4-
try
5-
o = java.io.File(p);
6-
catch e
7-
if strcmp(e.identifier, "Octave:undefined-function")
8-
o = javaObject("java.io.File", p);
9-
else
10-
rethrow(e);
11-
end
4+
if stdlib.isoctave()
5+
o = javaObject("java.io.File", p);
6+
else
7+
o = java.io.File(p);
128
end
139

1410
end

+stdlib/private/javaLinkOption.m

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
function o = javaLinkOption()
22

3-
try
3+
if stdlib.isoctave()
4+
o = javaMethod("values", "java.nio.file.LinkOption");
5+
else
46
o = java.nio.file.LinkOption.values;
5-
catch e
6-
if strcmp(e.identifier, "Octave:undefined-function")
7-
o = javaMethod("values", "java.nio.file.LinkOption");
8-
else
9-
rethrow(e);
10-
end
7+
end
8+
119
end

+stdlib/private/javaOSBean.m

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
function b = javaOSBean()
22

3-
try
3+
if stdlib.isoctave()
4+
b = javaMethod("getOperatingSystemMXBean", "java.lang.management.ManagementFactory");
5+
else
46
b = java.lang.management.ManagementFactory.getOperatingSystemMXBean();
5-
catch e
6-
if strcmp(e.identifier, "Octave:undefined-function")
7-
b = javaMethod("getOperatingSystemMXBean", "java.lang.management.ManagementFactory");
8-
else
9-
rethrow(e);
10-
end
117
end
128

139
end

+stdlib/private/javaPathObject.m

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
%% JAVAPATHOBJECT Return a Java nio.file.Path object for a given file path.
22
function o = javaPathObject(p)
33

4-
try
4+
if stdlib.isoctave()
5+
o = javaFileObject(p).toPath();
6+
else
57
o = java.nio.file.Paths.get(p, javaArray('java.lang.String', 0));
68
% o = javaFileObject(p).toPath(); % above way about 20% faster
7-
catch e
8-
if strcmp(e.identifier, "Octave:undefined-function")
9-
o = javaFileObject(p).toPath();
10-
else
11-
rethrow(e);
12-
end
139
end
1410

1511
end
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
function p = javaSystemProperty(k)
22

3-
try
3+
if stdlib.isoctave()
4+
p = javaMethod("getProperty", "java.lang.System", k);
5+
else
46
p = string(java.lang.System.getProperty(k));
5-
catch e
6-
if strcmp(e.identifier, "Octave:undefined-function")
7-
p = javaMethod("getProperty", "java.lang.System", k);
8-
else
9-
rethrow(e);
10-
end
7+
end
8+
119
end

0 commit comments

Comments
 (0)