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

fix generation with primitive array

This commit is contained in:
Laurent SCHOELENS 2023-03-27 12:31:35 +02:00
parent 16c1937aad
commit 27d7821666
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/umlgraph/doclet/ClassGraph.java
View File

@ -808,7 +808,7 @@ class ClassGraph {
for (TypeMirror type : types) { for (TypeMirror type : types) {
// skip primitives and type variables, as well as dependencies // skip primitives and type variables, as well as dependencies
// on the source class // on the source class
if (type.getKind().isPrimitive() if (ElementUtil.isPrimitive(type)
|| ElementUtil.isType(type, TypeKind.TYPEVAR) || ElementUtil.isType(type, TypeKind.WILDCARD) || ElementUtil.isType(type, TypeKind.TYPEVAR) || ElementUtil.isType(type, TypeKind.WILDCARD)
|| type instanceof NoType || type instanceof NoType
|| c.toString().equals(ElementUtil.getTypeElement(type).toString())) { || c.toString().equals(ElementUtil.getTypeElement(type).toString())) {
@ -856,7 +856,7 @@ class ClassGraph {
private FieldRelationInfo getFieldRelationInfo(VariableElement field) { private FieldRelationInfo getFieldRelationInfo(VariableElement field) {
TypeMirror type = field.asType(); TypeMirror type = field.asType();
if (type.getKind().isPrimitive() || ElementUtil.isType(type, TypeKind.WILDCARD) || ElementUtil.isType(type, TypeKind.TYPEVAR)) { if (ElementUtil.isPrimitive(type) || ElementUtil.isType(type, TypeKind.WILDCARD) || ElementUtil.isType(type, TypeKind.TYPEVAR)) {
return null; return null;
} }

10
src/main/java/org/umlgraph/doclet/util/ElementUtil.java
View File

@ -23,6 +23,16 @@ import jdk.javadoc.doclet.DocletEnvironment;
public class ElementUtil { public class ElementUtil {
public static boolean isPrimitive(TypeMirror type) {
if (type.getKind().isPrimitive()) {
return true;
}
if (type.getKind() == TypeKind.ARRAY) {
return isPrimitive(((ArrayType) type).getComponentType());
}
return false;
}
public static boolean isType(TypeMirror type, TypeKind kind) { public static boolean isType(TypeMirror type, TypeKind kind) {
if (type.getKind() == kind) { if (type.getKind() == kind) {
return true; return true;