ClassGraph: support for type parameters in class fields.

Author: cargaji

sdg-core/src/main/java/es/upv/mist/slicing/graphs/ClassGraph.java

@@ -3,6 +3,7 @@
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.body.*;
+import com.github.javaparser.ast.type.TypeParameter;
 import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
 import com.github.javaparser.resolution.UnsolvedSymbolException;
 import com.github.javaparser.resolution.declarations.ResolvedClassDeclaration;
@@ -232,10 +233,14 @@ protected Map<String, Vertex<? extends TypeDeclaration<?>>> findAllFieldsOf(Vert
                         continue;
                     Vertex<? extends TypeDeclaration<?>> v = null;
                     if (var.getType().isClassOrInterfaceType()) {
-                        try {
-                            v = classDeclarationMap.get(mapKey(var.getType().asClassOrInterfaceType().resolve()));
-                        } catch (UnsolvedSymbolException ignored) {
-                        }
+                        boolean isTypeParameter = false;
+                        for (TypeParameter typeParameter : type.asClassOrInterfaceDeclaration().getTypeParameters())
+                            if (typeParameter.getNameAsString().equals(var.getType().asClassOrInterfaceType().getNameAsString()))
+                                isTypeParameter = true;
+                        if (!isTypeParameter)
+                            try {
+                                v = classDeclarationMap.get(mapKey(var.getType().asClassOrInterfaceType().resolve()));
+                            } catch (UnsolvedSymbolException ignored) {}
                     }
                     fieldMap.put(var.getNameAsString(), v);
                 }