natas_hw
/
UMLGraph
mirror of https://github.com/dspinellis/UMLGraph
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix findClass for UMLNoteOptions / UMLOptions unqualified classes

This commit is contained in:
Laurent SCHOELENS 2023-03-28 18:58:28 +02:00
parent 5a058a3ace
commit 42c648b596
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/umlgraph/doclet/UmlGraph.java
View File

@ -137,19 +137,21 @@ public class UmlGraph implements Doclet {
*/ */
public static Options buildOptions(DocletEnvironment root, Options o) { public static Options buildOptions(DocletEnvironment root, Options o) {
commentOptions = o.clone(); commentOptions = o.clone();
commentOptions.setOptions(root.getDocTrees(), findClass(root, "UMLNoteOptions")); commentOptions.setOptions(root.getDocTrees(), findClass(root, "UMLNoteOptions", false));
commentOptions.shape = Shape.NOTE; commentOptions.shape = Shape.NOTE;
Options opt = o.clone(); Options opt = o.clone();
opt.setOptions(root.getDocTrees(), findClass(root, "UMLOptions")); opt.setOptions(root.getDocTrees(), findClass(root, "UMLOptions", false));
return opt; return opt;
} }
/** Return the ClassDoc for the specified class; null if not found. */ /** Return the ClassDoc for the specified class; null if not found. */
private static TypeElement findClass(DocletEnvironment root, String name) { private static TypeElement findClass(DocletEnvironment root, String name, boolean qualified) {
Set<? extends Element> classes = root.getIncludedElements(); Set<? extends Element> classes = root.getIncludedElements();
for (Element element : classes) { for (Element element : classes) {
if (element instanceof TypeElement && ((TypeElement) element).getQualifiedName().toString().equals(name)) { if (qualified && element instanceof TypeElement && ((TypeElement) element).getQualifiedName().toString().equals(name)) {
return (TypeElement) element;
} else if (!qualified && element instanceof TypeElement && element.getSimpleName().toString().equals(name)) {
return (TypeElement) element; return (TypeElement) element;
} }
} }
@ -206,7 +208,7 @@ public class UmlGraph implements Doclet {
*/ */
public static List<View> buildViews(Options opt, DocletEnvironment srcRootDoc, DocletEnvironment viewRootDoc) { public static List<View> buildViews(Options opt, DocletEnvironment srcRootDoc, DocletEnvironment viewRootDoc) {
if (opt.viewName != null) { if (opt.viewName != null) {
TypeElement viewClass = findClass(viewRootDoc, opt.viewName); TypeElement viewClass = findClass(viewRootDoc, opt.viewName, true);
if (viewClass == null) { if (viewClass == null) {
System.out.println("View " + opt.viewName + " not found! Exiting without generating any output."); System.out.println("View " + opt.viewName + " not found! Exiting without generating any output.");
return null; return null;