data: changed name of Java generic type to use name of declaration

* changed the name resolution of generic type instantiations to use the name of the type's declaration instead of using the provided type arguments here.
* fixed tests
This commit is contained in:
malte_langkabel
2016-10-03 12:50:51 +02:00
parent 3dffd55f75
commit 47d7a3a509
4 changed files with 6 additions and 2 deletions
+1
View File
@@ -37,6 +37,7 @@ public class ASTDumper extends JavaAstVisitor{
line += " [" + ((ClassOrInterfaceType)n).getName() + "]";
}
System.out.println(line);
}
+1 -1
View File
@@ -126,7 +126,7 @@ public class JavaDeclName
return string;
}
private String getTypeParameterString()
public String getTypeParameterString()
{
String string = "";
if (m_typeParameterNames != null && !m_typeParameterNames.isEmpty())
@@ -82,6 +82,8 @@ public class JavaSymbolSolverTypeNameResolver extends JavaNameResolver
m_ignoredContexts
);
return new JavaTypeName(declName.getName() + declName.getTypeParameterString(), new ArrayList<JavaTypeName>(), declName.getParent());
/*
if (declName != null)
{
List<JavaTypeName> typeArgumentNames = new ArrayList<>();
@@ -92,6 +94,7 @@ public class JavaSymbolSolverTypeNameResolver extends JavaNameResolver
}
return new JavaTypeName(declName.getName(), typeArgumentNames, declName.getParent());
}
*/
}
else if (typeUsage instanceof TypeParameterUsage)
{