From 44e6b9e1f09e57a9abe3d6e31d4b3b6e40b4ee47 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 1 Mar 2016 21:19:23 +0000 Subject: Replace generateClassName with JavaTypes.typeOf --- .../java/org/zwobble/couscous/frontends/java/JavaReader.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/main/java/org') 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 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); } -- cgit v1.2.3