From 773bc1ced2c53770fd8db93db0719841d1e4b037 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Wed, 16 Nov 2011 18:42:20 +0400 Subject: [PATCH] cleanup --- src/org/jetbrains/jet/j2k/Converter.java | 67 +++++++++++-------- src/org/jetbrains/jet/j2k/ast/Class.java | 4 +- .../j2k/ast/ClassObjectAccessExpression.java | 2 +- .../jetbrains/jet/j2k/ast/Initializer.java | 2 +- .../jet/j2k/visitors/ExpressionVisitor.java | 5 +- 5 files changed, 46 insertions(+), 34 deletions(-) diff --git a/src/org/jetbrains/jet/j2k/Converter.java b/src/org/jetbrains/jet/j2k/Converter.java index 02ddc71a6f7..36ea5c9313e 100644 --- a/src/org/jetbrains/jet/j2k/Converter.java +++ b/src/org/jetbrains/jet/j2k/Converter.java @@ -17,13 +17,14 @@ import java.util.*; */ public class Converter { @NotNull - public static File fileToFile(PsiJavaFile javaFile) { + public static File fileToFile(@NotNull PsiJavaFile javaFile) { final PsiImportList importList = javaFile.getImportList(); List imports = importList == null ? Collections.emptyList() : importsToImportList(importList.getAllImportStatements()); return new File(quoteKeywords(javaFile.getPackageName()), imports, classesToClassList(javaFile.getClasses())); } - private static String quoteKeywords(String packageName) { + @NotNull + private static String quoteKeywords(@NotNull String packageName) { List result = new LinkedList(); for (String part : packageName.split("\\.")) result.add(new IdentifierImpl(part).toKotlin()); @@ -31,13 +32,14 @@ public class Converter { } @NotNull - private static List classesToClassList(PsiClass[] classes) { + private static List classesToClassList(@NotNull PsiClass[] classes) { List result = new LinkedList(); for (PsiClass t : classes) result.add(classToClass(t)); return result; } - public static AnonymousClass anonymousClassToAnonymousClass(PsiAnonymousClass anonymousClass) { + @NotNull + public static AnonymousClass anonymousClassToAnonymousClass(@NotNull PsiAnonymousClass anonymousClass) { // TODO: replace by Block, use class.getChild() method return new AnonymousClass( classesToClassList(anonymousClass.getAllInnerClasses()), @@ -47,7 +49,8 @@ public class Converter { ); } - private static List getFinalOrWithEmptyInitializer(List fields) { + @NotNull + private static List getFinalOrWithEmptyInitializer(@NotNull List fields) { List result = new LinkedList(); for (Field f : fields) if (f.isFinal() || f.getInitializer().toKotlin().isEmpty()) @@ -55,13 +58,15 @@ public class Converter { return result; } - private static List createParametersFromFields(List fields) { + @NotNull + private static List createParametersFromFields(@NotNull List fields) { List result = new LinkedList(); for (Field f : fields) result.add(new Parameter(f.getIdentifier(), f.getType())); return result; } - private static List createInitStatementsFromFields(List fields) { + @NotNull + private static List createInitStatementsFromFields(@NotNull List fields) { List result = new LinkedList(); for (Field f : fields) { final String identifierToKotlin = f.getIdentifier().toKotlin(); @@ -70,7 +75,8 @@ public class Converter { return result; } - private static String createPrimaryConstructorInvocation(String s, List fields, Map initializers) { + @NotNull + private static String createPrimaryConstructorInvocation(@NotNull String s, @NotNull List fields, @NotNull Map initializers) { List result = new LinkedList(); for (Field f : fields) { final String id = f.getIdentifier().toKotlin(); @@ -79,7 +85,8 @@ public class Converter { return s + "(" + AstUtil.join(result, ", ") + ")"; } - private static Class classToClass(PsiClass psiClass) { + @NotNull + private static Class classToClass(@NotNull PsiClass psiClass) { final Set modifiers = modifiersListToModifiersSet(psiClass.getModifierList()); final List innerClasses = classesToClassList(psiClass.getAllInnerClasses()); final List methods = methodsToFunctionList(psiClass.getMethods()); @@ -171,7 +178,7 @@ public class Converter { } @NotNull - private static List initializersToInitializerList(PsiClassInitializer[] initializers) { + private static List initializersToInitializerList(@NotNull PsiClassInitializer[] initializers) { List result = new LinkedList(); for (PsiClassInitializer i : initializers) result.add(initializerToInitializer(i)); return result; @@ -185,7 +192,8 @@ public class Converter { ); } - private static String getDefaultInitializer(Field f) { + @NotNull + private static String getDefaultInitializer(@NotNull Field f) { if (f.getType().isNullable()) return "null"; else { @@ -202,7 +210,8 @@ public class Converter { // private int ordinal() { ... } // private String name() { ... } // those methods any enum class inherits from java.lang.Enum - private static List fieldsToFieldListForEnums(PsiField[] fields) { + @NotNull + private static List fieldsToFieldListForEnums(@NotNull PsiField[] fields) { List result = new LinkedList(); for (PsiField f : fields) { if ((f.getName().equals("ordinal") @@ -222,13 +231,15 @@ public class Converter { return result; } - private static List fieldsToFieldList(PsiField[] fields) { + @NotNull + private static List fieldsToFieldList(@NotNull PsiField[] fields) { List result = new LinkedList(); for (PsiField f : fields) result.add(fieldToField(f)); return result; } - private static Field fieldToField(PsiField field) { + @NotNull + private static Field fieldToField(@NotNull PsiField field) { Set modifiers = modifiersListToModifiersSet(field.getModifierList()); if (field instanceof PsiEnumConstant) // TODO: remove instanceof return new EnumConstant( @@ -246,14 +257,14 @@ public class Converter { } @NotNull - private static List methodsToFunctionList(PsiMethod[] methods) { + private static List methodsToFunctionList(@NotNull PsiMethod[] methods) { List result = new LinkedList(); for (PsiMethod t : methods) result.add(methodToFunction(t, true)); return result; } @Nullable - private static PsiMethod getPrimaryConstructorForThisCase(PsiClass psiClass) { + private static PsiMethod getPrimaryConstructorForThisCase(@NotNull PsiClass psiClass) { ThisVisitor tv = new ThisVisitor(); psiClass.accept(tv); return tv.getPrimaryConstructor(); @@ -273,7 +284,8 @@ public class Converter { return false; } - private static List removeEmpty(List statements) { + @NotNull + private static List removeEmpty(@NotNull List statements) { List result = new LinkedList(); for (Statement s : statements) if (s != Statement.EMPTY_STATEMENT && s != Expression.EMPTY_EXPRESSION) @@ -282,7 +294,7 @@ public class Converter { } @NotNull - private static Function methodToFunction(PsiMethod method, boolean notEmpty) { + private static Function methodToFunction(@NotNull PsiMethod method, boolean notEmpty) { final IdentifierImpl identifier = new IdentifierImpl(method.getName()); final Type type = typeToType(method.getReturnType()); final Block body = blockToBlock(method.getBody(), notEmpty); @@ -329,7 +341,7 @@ public class Converter { } @NotNull - public static List statementsToStatementList(PsiStatement[] statements) { + public static List statementsToStatementList(@NotNull PsiStatement[] statements) { List result = new LinkedList(); for (PsiStatement t : statements) result.add(statementToStatement(t)); return result; @@ -344,7 +356,7 @@ public class Converter { } @NotNull - public static List expressionsToExpressionList(PsiExpression[] expressions) { + public static List expressionsToExpressionList(@NotNull PsiExpression[] expressions) { List result = new LinkedList(); for (PsiExpression e : expressions) result.add(expressionToExpression(e)); return result; @@ -359,7 +371,7 @@ public class Converter { } @NotNull - public static Element elementToElement(PsiElement e) { + public static Element elementToElement(@Nullable PsiElement e) { if (e == null) return Element.EMPTY_ELEMENT; final ElementVisitor elementVisitor = new ElementVisitor(); e.accept(elementVisitor); @@ -367,7 +379,7 @@ public class Converter { } @NotNull - public static List elementsToElementList(PsiElement[] elements) { + public static List elementsToElementList(@NotNull PsiElement[] elements) { List result = new LinkedList(); for (PsiElement e : elements) result.add(elementToElement(e)); return result; @@ -382,21 +394,21 @@ public class Converter { } @NotNull - public static List typesToTypeList(PsiType[] types) { + public static List typesToTypeList(@NotNull PsiType[] types) { List result = new LinkedList(); for (PsiType t : types) result.add(typeToType(t)); return result; } @NotNull - private static List typesToNotNullableTypeList(PsiType[] types) { + private static List typesToNotNullableTypeList(@NotNull PsiType[] types) { List result = new LinkedList(typesToTypeList(types)); for (Type p : result) p.convertToNotNull(); return result; } @NotNull - private static List importsToImportList(PsiImportStatementBase[] imports) { + private static List importsToImportList(@NotNull PsiImportStatementBase[] imports) { List result = new LinkedList(); for (PsiImportStatementBase t : imports) result.add(importToImport(t)); return result; @@ -411,14 +423,14 @@ public class Converter { } @NotNull - public static List parametersToParameterList(PsiParameter[] parameters) { + public static List parametersToParameterList(@NotNull PsiParameter[] parameters) { List result = new LinkedList(); for (PsiParameter t : parameters) result.add(parameterToParameter(t)); return result; } @NotNull - public static Parameter parameterToParameter(PsiParameter parameter) { + public static Parameter parameterToParameter(@NotNull PsiParameter parameter) { return new Parameter( new IdentifierImpl(parameter.getName()), // TODO: remove typeToType(parameter.getType()) @@ -431,6 +443,7 @@ public class Converter { return new IdentifierImpl(identifier.getText()); } + @NotNull public static Set modifiersListToModifiersSet(PsiModifierList modifierList) { HashSet modifiersSet = new HashSet(); if (modifierList != null) { diff --git a/src/org/jetbrains/jet/j2k/ast/Class.java b/src/org/jetbrains/jet/j2k/ast/Class.java index 519b20bdf80..37fa884aa57 100644 --- a/src/org/jetbrains/jet/j2k/ast/Class.java +++ b/src/org/jetbrains/jet/j2k/ast/Class.java @@ -18,12 +18,12 @@ public class Class extends Member { String TYPE = "class"; final Identifier myName; private final List myBaseClassParams; - private List myInitializers; + private final List myInitializers; private final List myTypeParameters; private final List myExtendsTypes; private final List myImplementsTypes; final List myInnerClasses; - final List myMethods; + private final List myMethods; final List myFields; public Class(Identifier name, Set modifiers, List typeParameters, List extendsTypes, diff --git a/src/org/jetbrains/jet/j2k/ast/ClassObjectAccessExpression.java b/src/org/jetbrains/jet/j2k/ast/ClassObjectAccessExpression.java index 09cd85a5244..b16fedbf19e 100644 --- a/src/org/jetbrains/jet/j2k/ast/ClassObjectAccessExpression.java +++ b/src/org/jetbrains/jet/j2k/ast/ClassObjectAccessExpression.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull; * @author ignatov */ public class ClassObjectAccessExpression extends Expression { - private Element myTypeElement; + private final Element myTypeElement; public ClassObjectAccessExpression(Element typeElement) { myTypeElement = typeElement; diff --git a/src/org/jetbrains/jet/j2k/ast/Initializer.java b/src/org/jetbrains/jet/j2k/ast/Initializer.java index ef590c25f83..d49dc13c1e2 100644 --- a/src/org/jetbrains/jet/j2k/ast/Initializer.java +++ b/src/org/jetbrains/jet/j2k/ast/Initializer.java @@ -8,7 +8,7 @@ import java.util.Set; * @author ignatov */ public class Initializer extends Member { - private Block myBlock; + private final Block myBlock; public Initializer(Block block, Set modifiers) { myBlock = block; diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java index 695a427f1c8..ce4aaa63c50 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java +++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java @@ -194,12 +194,11 @@ public class ExpressionVisitor extends StatementVisitor { new ExpressionList(callExpression) ); } else { // new Class(): common case + final PsiAnonymousClass anonymousClass = expression.getAnonymousClass(); myResult = new NewClassExpression( elementToElement(expression.getClassOrAnonymousClassReference()), elementToElement(expression.getArgumentList()), - expression.getAnonymousClass() != null ? - anonymousClassToAnonymousClass(expression.getAnonymousClass()) : - null + anonymousClass != null ? anonymousClassToAnonymousClass(anonymousClass) : null ); // is constructor secondary final PsiMethod constructor = expression.resolveMethod();