minor

javaparser · Nov 6, 2016 · 9a79a6b · 9a79a6b
1 parent 884e2e5
commit 9a79a6b
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/.../javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java b/.../javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java
@@ -17,11 +17,13 @@
 package com.github.javaparser.symbolsolver.javaparsermodel.declarations;
 
 import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.body.BodyDeclaration;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.VariableDeclarator;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.symbolsolver.core.resolution.Context;
+import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFactory;
 import com.github.javaparser.symbolsolver.javaparsermodel.UnsolvedSymbolException;
 import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
@@ -216,20 +218,12 @@ public List<ReferenceType> getAncestors() {
         List<ReferenceType> ancestors = new ArrayList<>();
         if (wrappedNode.getExtends() != null) {
             for (ClassOrInterfaceType extended : wrappedNode.getExtends()) {
-                SymbolReference<TypeDeclaration> ancestor = solveType(extended.getName(), typeSolver);
+                ancestors.add(toReferenceType(extended));
-                if (!ancestor.isSolved()) {
-                    throw new UnsolvedSymbolException(extended.getName());
-                }
-                ancestors.add(new ReferenceTypeImpl((ReferenceTypeDeclaration) ancestor.getCorrespondingDeclaration(), typeSolver));
             }
         }
         if (wrappedNode.getImplements() != null) {
             for (ClassOrInterfaceType implemented : wrappedNode.getImplements()) {
-                SymbolReference<TypeDeclaration> ancestor = solveType(implemented.getName(), typeSolver);
+                ancestors.add(toReferenceType(implemented));
-                if (!ancestor.isSolved()) {
-                    throw new UnsolvedSymbolException(implemented.getName());
-                }
-                ancestors.add(new ReferenceTypeImpl((ReferenceTypeDeclaration) ancestor.getCorrespondingDeclaration(), typeSolver));
             }
         }
         return ancestors;
@@ -259,4 +253,19 @@ public ClassOrInterfaceDeclaration getWrappedNode() {
     public AccessLevel accessLevel() {
         throw new UnsupportedOperationException();
     }
+
+    ///
+    /// Private methods
+    ///
+
+    private ReferenceType toReferenceType(ClassOrInterfaceType classOrInterfaceType) {
+        SymbolReference<TypeDeclaration> ref = solveType(classOrInterfaceType.getName(), typeSolver);
+        if (!ref.isSolved()) {
+            throw new UnsolvedSymbolException(classOrInterfaceType.getName());
+        }
+        List<Type> superClassTypeParameters = classOrInterfaceType.getTypeArguments().orElse(new NodeList<>())
+                .stream().map(ta -> JavaParserFacade.get(typeSolver).convert(ta, ta))
+                .collect(Collectors.toList());
+        return new ReferenceTypeImpl(ref.getCorrespondingDeclaration().asReferenceType(), superClassTypeParameters, typeSolver);
+    }
 }