From d7e06aeb6a69a6130f0e799d1ffdafedc3457324 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Tue, 22 Nov 2011 14:25:28 +0400 Subject: [PATCH] cleanup --- src/org/jetbrains/jet/j2k/ast/Class.java | 6 +++--- .../jet/j2k/ast/DeclarationStatement.java | 2 +- .../jetbrains/jet/j2k/ast/IdentifierImpl.java | 2 +- .../jet/j2k/ast/MethodCallExpression.java | 2 +- .../jet/j2k/ast/ReferenceElement.java | 4 ++-- .../jet/j2k/visitors/ExpressionVisitor.java | 21 ++++++++++--------- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/org/jetbrains/jet/j2k/ast/Class.java b/src/org/jetbrains/jet/j2k/ast/Class.java index 2e8daa79fa9..2bff21daaa7 100644 --- a/src/org/jetbrains/jet/j2k/ast/Class.java +++ b/src/org/jetbrains/jet/j2k/ast/Class.java @@ -18,7 +18,7 @@ public class Class extends Member { String TYPE = "class"; final Identifier myName; private final List myBaseClassParams; - private List myMembers; + private final List myMembers; private final List myTypeParameters; private final List myExtendsTypes; private final List myImplementsTypes; @@ -174,7 +174,7 @@ public class Class extends Member { "}"; } - private List getStatic(List members) { + private static List getStatic(List members) { List result = new LinkedList(); for (Member m : members) if (m.isStatic()) @@ -182,7 +182,7 @@ public class Class extends Member { return result; } - private List getNonStatic(List members) { + private static List getNonStatic(List members) { List result = new LinkedList(); for (Member m : members) if (!m.isStatic()) diff --git a/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java b/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java index d38956881da..756153ac13d 100644 --- a/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java +++ b/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java @@ -16,7 +16,7 @@ public class DeclarationStatement extends Statement { myElements = elements; } - private List toStringList(List elements) { + private static List toStringList(List elements) { List result = new LinkedList(); for (Element e : elements) { if (e instanceof LocalVariable) { diff --git a/src/org/jetbrains/jet/j2k/ast/IdentifierImpl.java b/src/org/jetbrains/jet/j2k/ast/IdentifierImpl.java index 4fcfcd6ebb2..c487cfb5fff 100644 --- a/src/org/jetbrains/jet/j2k/ast/IdentifierImpl.java +++ b/src/org/jetbrains/jet/j2k/ast/IdentifierImpl.java @@ -30,7 +30,7 @@ public class IdentifierImpl extends Expression implements Identifier { return myName.length() == 0; } - private String quote(String str) { + private static String quote(String str) { return BACKTICK + str + BACKTICK; } diff --git a/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.java b/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.java index c190d546d9c..0c8a1d21536 100644 --- a/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.java +++ b/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.java @@ -12,7 +12,7 @@ public class MethodCallExpression extends Expression { private final Expression myMethodCall; private final Element myParamList; private final boolean myIsResultNullable; - private List myTypeParameters; + private final List myTypeParameters; public MethodCallExpression(Expression methodCall, Element paramList, boolean nullable, List typeParameters) { myMethodCall = methodCall; diff --git a/src/org/jetbrains/jet/j2k/ast/ReferenceElement.java b/src/org/jetbrains/jet/j2k/ast/ReferenceElement.java index 21210a994ea..c557edf4065 100644 --- a/src/org/jetbrains/jet/j2k/ast/ReferenceElement.java +++ b/src/org/jetbrains/jet/j2k/ast/ReferenceElement.java @@ -9,8 +9,8 @@ import java.util.List; * @author ignatov */ public class ReferenceElement extends Element { - private Identifier myReference; - private List myTypes; + private final Identifier myReference; + private final List myTypes; public ReferenceElement(@NotNull Identifier reference, @NotNull List types) { myReference = reference; diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java index dcf71736c8b..126a1b1653c 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java +++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java @@ -77,7 +77,7 @@ public class ExpressionVisitor extends StatementVisitor { } @NotNull - private String getOperatorString(@NotNull IElementType tokenType) { + private static String getOperatorString(@NotNull IElementType tokenType) { if (tokenType == JavaTokenType.PLUS) return "+"; if (tokenType == JavaTokenType.MINUS) return "-"; if (tokenType == JavaTokenType.ASTERISK) return "*"; @@ -197,7 +197,7 @@ public class ExpressionVisitor extends StatementVisitor { } @NotNull - private Expression createNewClassExpression(@NotNull PsiNewExpression expression) { + private static Expression createNewClassExpression(@NotNull PsiNewExpression expression) { final PsiAnonymousClass anonymousClass = expression.getAnonymousClass(); final PsiMethod constructor = expression.resolveMethod(); if (constructor == null || isConstructorPrimary(constructor)) { @@ -209,7 +209,8 @@ public class ExpressionVisitor extends StatementVisitor { ); } // is constructor secondary - final List typeParameters = expression.getClassReference() != null ? typesToTypeList(expression.getClassReference().getTypeParameters()) : Collections.emptyList(); + final PsiJavaCodeReferenceElement reference = expression.getClassReference(); + final List typeParameters = reference != null ? typesToTypeList(reference.getTypeParameters()) : Collections.emptyList(); return new CallChainExpression( new IdentifierImpl(constructor.getName(), false), new MethodCallExpression( @@ -220,7 +221,7 @@ public class ExpressionVisitor extends StatementVisitor { } @NotNull - private NewClassExpression createNewNonEmptyArray(@NotNull PsiNewExpression expression) { + private static NewClassExpression createNewNonEmptyArray(@NotNull PsiNewExpression expression) { final List callExpression = expressionsToExpressionList(expression.getArrayDimensions()); callExpression.add(new IdentifierImpl("{null}")); // TODO: remove return new NewClassExpression( @@ -291,7 +292,7 @@ public class ExpressionVisitor extends StatementVisitor { } @NotNull - private String getClassName(PsiReferenceExpression expression) { + private static String getClassName(@NotNull PsiReferenceExpression expression) { PsiElement context = expression.getContext(); while (context != null) { if (context instanceof PsiMethod && ((PsiMethod) context).isConstructor()) { @@ -307,7 +308,7 @@ public class ExpressionVisitor extends StatementVisitor { return ""; } - private boolean isFieldReference(PsiReferenceExpression expression, PsiClass currentClass) { + private static boolean isFieldReference(@NotNull PsiReferenceExpression expression, PsiClass currentClass) { final PsiReference reference = expression.getReference(); if (reference != null) { final PsiElement resolvedReference = reference.resolve(); @@ -320,7 +321,7 @@ public class ExpressionVisitor extends StatementVisitor { return false; } - private boolean isInsideSecondaryConstructor(PsiReferenceExpression expression) { + private static boolean isInsideSecondaryConstructor(PsiReferenceExpression expression) { PsiElement context = expression.getContext(); while (context != null) { if (context instanceof PsiMethod && ((PsiMethod) context).isConstructor()) @@ -330,7 +331,7 @@ public class ExpressionVisitor extends StatementVisitor { return false; } - private boolean isInsidePrimaryConstructor(PsiExpression expression) { + private static boolean isInsidePrimaryConstructor(PsiExpression expression) { PsiElement context = expression.getContext(); while (context != null) { if (context instanceof PsiMethod && ((PsiMethod) context).isConstructor()) @@ -341,7 +342,7 @@ public class ExpressionVisitor extends StatementVisitor { } @Nullable - private PsiClass getContainingClass(@NotNull PsiExpression expression) { + private static PsiClass getContainingClass(@NotNull PsiExpression expression) { PsiElement context = expression.getContext(); while (context != null) { if (context instanceof PsiMethod && ((PsiMethod) context).isConstructor()) @@ -351,7 +352,7 @@ public class ExpressionVisitor extends StatementVisitor { return null; } - private boolean isThisExpression(PsiReferenceExpression expression) { + private static boolean isThisExpression(PsiReferenceExpression expression) { for (PsiReference r : expression.getReferences()) if (r.getCanonicalText().equals("this")) { final PsiElement res = r.resolve();