Fix for javadoc on Java14+

Thrameos · Thrameos · commit 7eb209819260 · 2022-02-27T09:16:37.000-08:00
diff --git a/native/java/org/jpype/javadoc/JavadocExtractor.java b/native/java/org/jpype/javadoc/JavadocExtractor.java
@@ -115,7 +115,11 @@ public static Javadoc extractDocument(Class cls, Document doc)
     {
       Javadoc documentation = new Javadoc();
       XPath xPath = XPathFactory.newInstance().newXPath();
-      Node description = toFragment((Node) xPath.compile("//div[@class='description']/ul/li").evaluate(doc, XPathConstants.NODE));
+      // Javadoc 8-13
+      Node n = (Node) xPath.compile("//div[@class='description']/ul/li").evaluate(doc, XPathConstants.NODE);
+      if (n == null)  // Javadoc 14+
+        n = (Node) xPath.compile("//section[@class='description']").evaluate(doc, XPathConstants.NODE);
+      Node description = toFragment(n);
       if (description != null)
       {
         documentation.descriptionNode = description;

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,11 @@ public static Javadoc extractDocument(Class cls, Document doc)`
`115`	`115`	`{`
`116`	`116`	`Javadoc documentation = new Javadoc();`
`117`	`117`	`XPath xPath = XPathFactory.newInstance().newXPath();`
`118`		`- Node description = toFragment((Node) xPath.compile("//div[@class='description']/ul/li").evaluate(doc, XPathConstants.NODE));`
	`118`	`+ // Javadoc 8-13`
	`119`	`+ Node n = (Node) xPath.compile("//div[@class='description']/ul/li").evaluate(doc, XPathConstants.NODE);`
	`120`	`+ if (n == null) // Javadoc 14+`
	`121`	`+ n = (Node) xPath.compile("//section[@class='description']").evaluate(doc, XPathConstants.NODE);`
	`122`	`+ Node description = toFragment(n);`
`119`	`123`	`if (description != null)`
`120`	`124`	`{`
`121`	`125`	`documentation.descriptionNode = description;`