8182736: javadoc generates bad names and broken module graph links
Reviewed-by: jjg, bpatel, darcy, ksrini
Contributed-by: bhavesh.patel@oracle.com, jonathan.gibbons@oracle.com
--- a/jdk/make/src/classes/build/tools/taglet/ModuleGraph.java Fri Jun 23 14:32:59 2017 -0400
+++ b/jdk/make/src/classes/build/tools/taglet/ModuleGraph.java Mon Jun 26 18:48:25 2017 -0700
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.Set;
import javax.lang.model.element.Element;
+import javax.lang.model.element.ModuleElement;
import com.sun.source.doctree.DocTree;
import jdk.javadoc.doclet.Taglet;
import static jdk.javadoc.doclet.Taglet.Location.*;
@@ -62,7 +63,7 @@
return "";
}
- String moduleName = element.getSimpleName().toString();
+ String moduleName = ((ModuleElement) element).getQualifiedName().toString();
String imageFile = moduleName + "-graph.png";
int thumbnailHeight = -1;
String hoverImage = "";