Fix problem found with overview when using mdoclet.

mnlipp · Sep 27, 2023 · 47412e7 · 47412e7
1 parent 41caab0
commit 47412e7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/plantUml9/build.gradle b/plantUml9/build.gradle
@@ -26,7 +26,7 @@ java {
     }
 }
 
-version = '3.0.0'
+version = '3.1.0'
 
 description = 'A taglet for processing PlantUML in javadoc comments'
 
@@ -144,11 +144,12 @@ task testAll(type: JavaExec) {
 check.dependsOn(testAll)
 
 task apidocs(type: JavaExec) {
-    dependsOn classes
+    dependsOn jar
     inputs.file "overview.md"
 
-    jvmArgs = ['--add-exports=jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED',
-        '--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED']
+    jvmArgs = ['--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
+      '--add-exports=jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED'
+        ]
     classpath sourceSets.main.compileClasspath
     classpath files(tasks.jar)
 
@@ -159,8 +160,8 @@ task apidocs(type: JavaExec) {
         '-use',
         '-linksource',
         '-link', 'https://docs.oracle.com/en/java/javase/17/docs/api/',
-        '--add-exports', 'jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED',
         '--add-exports', 'jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
+        '--add-exports', 'jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED',
         '-doclet', 'org.jdrupes.mdoclet.MDoclet',
         '-docletpath', configurations.markdownDoclet.files
             .asType(List).join(File.pathSeparator),

diff --git a/plantUml9/src/org/jdrupes/taglets/plantUml/PlantUml.java b/plantUml9/src/org/jdrupes/taglets/plantUml/PlantUml.java
@@ -32,7 +32,7 @@
 import javax.lang.model.element.Name;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.util.SimpleElementVisitor8;
+import javax.lang.model.util.SimpleElementVisitor14;
 import javax.tools.DocumentationTool;
 import javax.tools.FileObject;
 import javax.tools.JavaFileManager;
@@ -105,7 +105,12 @@ private void processTag(DocTree tree, Element element) {
                 + " tag: Expected filename and PlantUML source");
         }
 
-        String packageName = extractPackageName(element);
+        String packageName = "";
+        String elementType = element.getClass().getName();
+        if (elementType.endsWith("Symbol$ClassSymbol")
+            || elementType.endsWith("Symbol$PackageSymbol")) {
+            packageName = extractPackageName(element);
+        }
         FileObject graphicsFile;
         try {
             graphicsFile = fileManager.getFileForOutput(
@@ -137,7 +142,7 @@ private void processTag(DocTree tree, Element element) {
     }
 
     private String extractPackageName(Element element) {
-        return element.accept(new SimpleElementVisitor8<>() {
+        return element.accept(new SimpleElementVisitor14<>() {
 
             @Override
             public Name visitPackage(PackageElement e, Object p) {