Replace generateClassName with JavaTypes.typeOf

1 files changed, 2 insertions, 9 deletions

diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
index ccc37e0..ec6b556 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
@@ -67,9 +67,9 @@ public class JavaReader {
     }
 
     private TypeNode readCompilationUnit(CompilationUnit ast) {
-        TypeName name = generateClassName(ast);
-        Scope scope = Scope.create().enterClass(name);
         TypeDeclaration type = (TypeDeclaration)ast.types().get(0);
+        TypeName name = typeOf(type.resolveBinding());
+        Scope scope = Scope.create().enterClass(name);
         TypeDeclarationBody body = readTypeDeclarationBody(scope, name, type.bodyDeclarations());
         Set<TypeName> superTypes = superTypes(type);
         if (type.isInterface()) {
@@ -345,13 +345,6 @@ public class JavaReader {
         return expressionReader(scope).readExpressionWithoutBoxing(body);
     }
 
-    private TypeName generateClassName(CompilationUnit ast) {
-        TypeDeclaration type = (TypeDeclaration)ast.types().get(0);
-        String packageName = ast.getPackage().getName().getFullyQualifiedName();
-        String className = type.getName().getFullyQualifiedName();
-        return TypeName.of(packageName + "." + className);
-    }
-
     private JavaExpressionReader expressionReader(Scope scope) {
         return new JavaExpressionReader(scope, this);
     }