Skip to content

Commit 5cf2a7a

Browse files
committed
Ensure the correct java version is used, although the list
of package suffixes comes from java 8.
1 parent 80fd9dd commit 5cf2a7a

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/main/java/org/scijava/ui/swing/script/ClassUtil.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,21 @@ static public HashMap<String, ArrayList<String>> findDocumentationForClass(final
7474
final HashMap<String, JarProperties> matches = findClassDocumentationURLs(s);
7575
ensureSciJavaSubURLCache();
7676

77-
final Pattern java8 = Pattern.compile("^(java|javax|org.omg|org.w3c|org.xml|org.ietf.jgss)\\..*$");
78-
77+
final Pattern javaPackages = Pattern.compile("^(java|javax|org\\.omg|org\\.w3c|org\\.xml|org\\.ietf\\.jgss)\\..*$");
78+
final String version = System.getProperty("java.version");
79+
final String majorVersion = version.startsWith("1.") ?
80+
version.substring(2, version.indexOf('.', 2))
81+
: version.substring(0, version.indexOf('.'));
82+
final String javaDoc = "java" + majorVersion;
83+
7984
final HashMap<String, ArrayList<String>> class_urls = new HashMap<>();
8085

8186
for (final Map.Entry<String, JarProperties> entry: matches.entrySet()) {
8287
final String classname = entry.getKey();
8388
final ArrayList<String> urls = new ArrayList<>();
8489
class_urls.put(classname, urls);
85-
if (java8.matcher(classname).matches()) {
86-
urls.add(scijava_javadoc_URLs.get("java8") + classname.replace('.', '/') + ".html");
90+
if (javaPackages.matcher(classname).matches()) {
91+
urls.add(scijava_javadoc_URLs.get(javaDoc) + classname.replace('.', '/') + ".html");
8792
} else {
8893
final JarProperties props = entry.getValue();
8994
// Find the first URL with git in it

0 commit comments

Comments
 (0)