From db101f732e168d1e4e2dad7a4fa7ef9096f5e8cd Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 1 Aug 2012 22:22:35 +0400 Subject: [PATCH] Made some fields final in AlternativeSignatureData. --- .../lang/resolve/java/AlternativeSignatureData.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java index 3e548b7fe3d..158596e02ae 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java @@ -46,17 +46,17 @@ import java.util.Map; * @since 6/5/12 */ class AlternativeSignatureData { - private JetNamedFunction altFunDeclaration; - private PsiMethodWrapper method; + private final JetNamedFunction altFunDeclaration; + private final PsiMethodWrapper method; - private boolean none; + private final boolean none; private String error; private JavaDescriptorResolver.ValueParameterDescriptors altValueParameters; private JetType altReturnType; private List altTypeParameters; - private Map originalToAltTypeParameters = + private final Map originalToAltTypeParameters = new HashMap(); AlternativeSignatureData( @@ -67,9 +67,12 @@ class AlternativeSignatureData { String signature = method.getSignatureAnnotation().signature(); if (signature.isEmpty()) { none = true; + altFunDeclaration = null; + this.method = null; return; } + none = false; this.method = method; Project project = method.getPsiMethod().getProject(); altFunDeclaration = JetPsiFactory.createFunction(project, signature);