diff --git a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java index d005142f006..d4931342d5d 100644 --- a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java @@ -36,12 +36,12 @@ public class InjectorForJvmCodegen { private final GenerationState generationState; private final ClassBuilderFactory classBuilderFactory; private final Project project; - private BindingTrace bindingTrace; - private BindingContext bindingContext; - private ClassBuilderMode classBuilderMode; - private ScriptCodegen scriptCodegen; - private IntrinsicMethods intrinsics; - private ClassFileFactory classFileFactory; + private final BindingTrace bindingTrace; + private final BindingContext bindingContext; + private final ClassBuilderMode classBuilderMode; + private final ScriptCodegen scriptCodegen; + private final IntrinsicMethods intrinsics; + private final ClassFileFactory classFileFactory; public InjectorForJvmCodegen( @NotNull JetTypeMapper jetTypeMapper, diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java index abca44baa87..f0a15388e43 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -46,24 +46,24 @@ public class InjectorForJavaDescriptorResolver { private final Project project; private final BindingTrace bindingTrace; private final ModuleDescriptor moduleDescriptor; - private JavaBridgeConfiguration javaBridgeConfiguration; - private JavaSemanticServices javaSemanticServices; - private JavaDescriptorResolver javaDescriptorResolver; - private PsiClassFinderImpl psiClassFinder; - private PsiDeclarationProviderFactory psiDeclarationProviderFactory; - private JavaTypeTransformer javaTypeTransformer; - private JavaClassResolver javaClassResolver; - private JavaAnnotationResolver javaAnnotationResolver; - private JavaCompileTimeConstResolver javaCompileTimeConstResolver; - private JavaClassObjectResolver javaClassObjectResolver; - private JavaSupertypeResolver javaSupertypeResolver; - private JavaFunctionResolver javaFunctionResolver; - private JavaValueParameterResolver javaValueParameterResolver; - private JavaSignatureResolver javaSignatureResolver; - private JavaNamespaceResolver javaNamespaceResolver; - private JavaConstructorResolver javaConstructorResolver; - private JavaInnerClassResolver javaInnerClassResolver; - private JavaPropertyResolver javaPropertyResolver; + private final JavaBridgeConfiguration javaBridgeConfiguration; + private final JavaSemanticServices javaSemanticServices; + private final JavaDescriptorResolver javaDescriptorResolver; + private final PsiClassFinderImpl psiClassFinder; + private final PsiDeclarationProviderFactory psiDeclarationProviderFactory; + private final JavaTypeTransformer javaTypeTransformer; + private final JavaClassResolver javaClassResolver; + private final JavaAnnotationResolver javaAnnotationResolver; + private final JavaCompileTimeConstResolver javaCompileTimeConstResolver; + private final JavaClassObjectResolver javaClassObjectResolver; + private final JavaSupertypeResolver javaSupertypeResolver; + private final JavaFunctionResolver javaFunctionResolver; + private final JavaValueParameterResolver javaValueParameterResolver; + private final JavaSignatureResolver javaSignatureResolver; + private final JavaNamespaceResolver javaNamespaceResolver; + private final JavaConstructorResolver javaConstructorResolver; + private final JavaInnerClassResolver javaInnerClassResolver; + private final JavaPropertyResolver javaPropertyResolver; public InjectorForJavaDescriptorResolver( @NotNull Project project, diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java index 809bf1da9af..1d045b66f02 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java @@ -43,27 +43,27 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForJavaSemanticServices { - private JavaSemanticServices javaSemanticServices; - private JavaDescriptorResolver javaDescriptorResolver; - private BindingTrace bindingTrace; - private JavaBridgeConfiguration javaBridgeConfiguration; - private PsiClassFinderImpl psiClassFinder; - private ModuleDescriptorImpl moduleDescriptor; + private final JavaSemanticServices javaSemanticServices; + private final JavaDescriptorResolver javaDescriptorResolver; + private final BindingTrace bindingTrace; + private final JavaBridgeConfiguration javaBridgeConfiguration; + private final PsiClassFinderImpl psiClassFinder; + private final ModuleDescriptorImpl moduleDescriptor; private final Project project; - private PsiDeclarationProviderFactory psiDeclarationProviderFactory; - private JavaTypeTransformer javaTypeTransformer; - private JavaClassResolver javaClassResolver; - private JavaAnnotationResolver javaAnnotationResolver; - private JavaCompileTimeConstResolver javaCompileTimeConstResolver; - private JavaClassObjectResolver javaClassObjectResolver; - private JavaSupertypeResolver javaSupertypeResolver; - private JavaFunctionResolver javaFunctionResolver; - private JavaValueParameterResolver javaValueParameterResolver; - private JavaSignatureResolver javaSignatureResolver; - private JavaNamespaceResolver javaNamespaceResolver; - private JavaConstructorResolver javaConstructorResolver; - private JavaInnerClassResolver javaInnerClassResolver; - private JavaPropertyResolver javaPropertyResolver; + private final PsiDeclarationProviderFactory psiDeclarationProviderFactory; + private final JavaTypeTransformer javaTypeTransformer; + private final JavaClassResolver javaClassResolver; + private final JavaAnnotationResolver javaAnnotationResolver; + private final JavaCompileTimeConstResolver javaCompileTimeConstResolver; + private final JavaClassObjectResolver javaClassObjectResolver; + private final JavaSupertypeResolver javaSupertypeResolver; + private final JavaFunctionResolver javaFunctionResolver; + private final JavaValueParameterResolver javaValueParameterResolver; + private final JavaSignatureResolver javaSignatureResolver; + private final JavaNamespaceResolver javaNamespaceResolver; + private final JavaConstructorResolver javaConstructorResolver; + private final JavaInnerClassResolver javaInnerClassResolver; + private final JavaPropertyResolver javaPropertyResolver; public InjectorForJavaSemanticServices( @NotNull Project project diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index cc1d90358f5..63b92638dfc 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -68,52 +68,52 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnalyzer { - private TopDownAnalyzer topDownAnalyzer; - private TopDownAnalysisContext topDownAnalysisContext; - private BodyResolver bodyResolver; - private ControlFlowAnalyzer controlFlowAnalyzer; - private DeclarationsChecker declarationsChecker; - private DescriptorResolver descriptorResolver; - private NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; + private final TopDownAnalyzer topDownAnalyzer; + private final TopDownAnalysisContext topDownAnalysisContext; + private final BodyResolver bodyResolver; + private final ControlFlowAnalyzer controlFlowAnalyzer; + private final DeclarationsChecker declarationsChecker; + private final DescriptorResolver descriptorResolver; + private final NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; private final Project project; private final TopDownAnalysisParameters topDownAnalysisParameters; private final BindingTrace bindingTrace; private final ModuleDescriptorImpl moduleDescriptor; - private JavaBridgeConfiguration javaBridgeConfiguration; - private JavaDescriptorResolver javaDescriptorResolver; - private PsiClassFinderImpl psiClassFinder; - private NamespaceFactoryImpl namespaceFactory; - private DeclarationResolver declarationResolver; - private AnnotationResolver annotationResolver; - private CallResolver callResolver; - private ArgumentTypeResolver argumentTypeResolver; - private ExpressionTypingServices expressionTypingServices; - private CallExpressionResolver callExpressionResolver; - private TypeResolver typeResolver; - private QualifiedExpressionResolver qualifiedExpressionResolver; - private CandidateResolver candidateResolver; - private ImportsResolver importsResolver; - private JetImportsFactory jetImportsFactory; - private ScriptHeaderResolver scriptHeaderResolver; - private OverloadResolver overloadResolver; - private OverrideResolver overrideResolver; - private TypeHierarchyResolver typeHierarchyResolver; - private ScriptBodyResolver scriptBodyResolver; - private JavaSemanticServices javaSemanticServices; - private PsiDeclarationProviderFactory psiDeclarationProviderFactory; - private JavaTypeTransformer javaTypeTransformer; - private JavaClassResolver javaClassResolver; - private JavaAnnotationResolver javaAnnotationResolver; - private JavaCompileTimeConstResolver javaCompileTimeConstResolver; - private JavaClassObjectResolver javaClassObjectResolver; - private JavaSupertypeResolver javaSupertypeResolver; - private JavaFunctionResolver javaFunctionResolver; - private JavaValueParameterResolver javaValueParameterResolver; - private JavaSignatureResolver javaSignatureResolver; - private JavaNamespaceResolver javaNamespaceResolver; - private JavaConstructorResolver javaConstructorResolver; - private JavaInnerClassResolver javaInnerClassResolver; - private JavaPropertyResolver javaPropertyResolver; + private final JavaBridgeConfiguration javaBridgeConfiguration; + private final JavaDescriptorResolver javaDescriptorResolver; + private final PsiClassFinderImpl psiClassFinder; + private final NamespaceFactoryImpl namespaceFactory; + private final DeclarationResolver declarationResolver; + private final AnnotationResolver annotationResolver; + private final CallResolver callResolver; + private final ArgumentTypeResolver argumentTypeResolver; + private final ExpressionTypingServices expressionTypingServices; + private final CallExpressionResolver callExpressionResolver; + private final TypeResolver typeResolver; + private final QualifiedExpressionResolver qualifiedExpressionResolver; + private final CandidateResolver candidateResolver; + private final ImportsResolver importsResolver; + private final JetImportsFactory jetImportsFactory; + private final ScriptHeaderResolver scriptHeaderResolver; + private final OverloadResolver overloadResolver; + private final OverrideResolver overrideResolver; + private final TypeHierarchyResolver typeHierarchyResolver; + private final ScriptBodyResolver scriptBodyResolver; + private final JavaSemanticServices javaSemanticServices; + private final PsiDeclarationProviderFactory psiDeclarationProviderFactory; + private final JavaTypeTransformer javaTypeTransformer; + private final JavaClassResolver javaClassResolver; + private final JavaAnnotationResolver javaAnnotationResolver; + private final JavaCompileTimeConstResolver javaCompileTimeConstResolver; + private final JavaClassObjectResolver javaClassObjectResolver; + private final JavaSupertypeResolver javaSupertypeResolver; + private final JavaFunctionResolver javaFunctionResolver; + private final JavaValueParameterResolver javaValueParameterResolver; + private final JavaSignatureResolver javaSignatureResolver; + private final JavaNamespaceResolver javaNamespaceResolver; + private final JavaConstructorResolver javaConstructorResolver; + private final JavaInnerClassResolver javaInnerClassResolver; + private final JavaPropertyResolver javaPropertyResolver; public InjectorForTopDownAnalyzerForJvm( @NotNull Project project, diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java index ac6bb8a5ad6..a1c9dad9af3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java @@ -42,26 +42,26 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForBodyResolve { - private BodyResolver bodyResolver; - private NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; + private final BodyResolver bodyResolver; + private final NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; private final Project project; private final TopDownAnalysisParameters topDownAnalysisParameters; private final BindingTrace bindingTrace; private final BodiesResolveContext bodiesResolveContext; private final ModuleDescriptor moduleDescriptor; - private AnnotationResolver annotationResolver; - private CallResolver callResolver; - private ArgumentTypeResolver argumentTypeResolver; - private ExpressionTypingServices expressionTypingServices; - private CallExpressionResolver callExpressionResolver; - private DescriptorResolver descriptorResolver; - private TypeResolver typeResolver; - private QualifiedExpressionResolver qualifiedExpressionResolver; - private CandidateResolver candidateResolver; - private ControlFlowAnalyzer controlFlowAnalyzer; - private DeclarationsChecker declarationsChecker; - private ScriptBodyResolver scriptBodyResolver; - private TopDownAnalysisContext topDownAnalysisContext; + private final AnnotationResolver annotationResolver; + private final CallResolver callResolver; + private final ArgumentTypeResolver argumentTypeResolver; + private final ExpressionTypingServices expressionTypingServices; + private final CallExpressionResolver callExpressionResolver; + private final DescriptorResolver descriptorResolver; + private final TypeResolver typeResolver; + private final QualifiedExpressionResolver qualifiedExpressionResolver; + private final CandidateResolver candidateResolver; + private final ControlFlowAnalyzer controlFlowAnalyzer; + private final DeclarationsChecker declarationsChecker; + private final ScriptBodyResolver scriptBodyResolver; + private final TopDownAnalysisContext topDownAnalysisContext; public InjectorForBodyResolve( @NotNull Project project, diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java index 845263ea0ca..cb82b4a5cfc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java @@ -40,18 +40,18 @@ public class InjectorForLazyResolve { private final Project project; private final ResolveSession resolveSession; private final ModuleDescriptor moduleDescriptor; - private DescriptorResolver descriptorResolver; - private ExpressionTypingServices expressionTypingServices; - private TypeResolver typeResolver; - private ScopeProvider scopeProvider; - private AnnotationResolver annotationResolver; - private QualifiedExpressionResolver qualifiedExpressionResolver; - private JetImportsFactory jetImportsFactory; - private NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; - private CallExpressionResolver callExpressionResolver; - private CallResolver callResolver; - private ArgumentTypeResolver argumentTypeResolver; - private CandidateResolver candidateResolver; + private final DescriptorResolver descriptorResolver; + private final ExpressionTypingServices expressionTypingServices; + private final TypeResolver typeResolver; + private final ScopeProvider scopeProvider; + private final AnnotationResolver annotationResolver; + private final QualifiedExpressionResolver qualifiedExpressionResolver; + private final JetImportsFactory jetImportsFactory; + private final NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; + private final CallExpressionResolver callExpressionResolver; + private final CallResolver callResolver; + private final ArgumentTypeResolver argumentTypeResolver; + private final CandidateResolver candidateResolver; public InjectorForLazyResolve( @NotNull Project project, diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java index b4625f5ba1f..7028b35c9de 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java @@ -34,18 +34,18 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForMacros { - private ExpressionTypingServices expressionTypingServices; - private NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; + private final ExpressionTypingServices expressionTypingServices; + private final NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; private final Project project; private final ModuleDescriptor moduleDescriptor; - private CallExpressionResolver callExpressionResolver; - private CallResolver callResolver; - private ArgumentTypeResolver argumentTypeResolver; - private TypeResolver typeResolver; - private AnnotationResolver annotationResolver; - private DescriptorResolver descriptorResolver; - private QualifiedExpressionResolver qualifiedExpressionResolver; - private CandidateResolver candidateResolver; + private final CallExpressionResolver callExpressionResolver; + private final CallResolver callResolver; + private final ArgumentTypeResolver argumentTypeResolver; + private final TypeResolver typeResolver; + private final AnnotationResolver annotationResolver; + private final DescriptorResolver descriptorResolver; + private final QualifiedExpressionResolver qualifiedExpressionResolver; + private final CandidateResolver candidateResolver; public InjectorForMacros( @NotNull Project project, diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index 5e1e7e47cd7..a13e5a56562 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -51,35 +51,35 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForTopDownAnalyzerBasic { - private TopDownAnalyzer topDownAnalyzer; - private TopDownAnalysisContext topDownAnalysisContext; - private BodyResolver bodyResolver; - private ControlFlowAnalyzer controlFlowAnalyzer; - private DeclarationsChecker declarationsChecker; - private DescriptorResolver descriptorResolver; - private NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; + private final TopDownAnalyzer topDownAnalyzer; + private final TopDownAnalysisContext topDownAnalysisContext; + private final BodyResolver bodyResolver; + private final ControlFlowAnalyzer controlFlowAnalyzer; + private final DeclarationsChecker declarationsChecker; + private final DescriptorResolver descriptorResolver; + private final NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; private final Project project; private final TopDownAnalysisParameters topDownAnalysisParameters; private final BindingTrace bindingTrace; private final ModuleDescriptorImpl moduleDescriptor; - private DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummy; - private NamespaceFactoryImpl namespaceFactory; - private DeclarationResolver declarationResolver; - private AnnotationResolver annotationResolver; - private CallResolver callResolver; - private ArgumentTypeResolver argumentTypeResolver; - private ExpressionTypingServices expressionTypingServices; - private CallExpressionResolver callExpressionResolver; - private TypeResolver typeResolver; - private QualifiedExpressionResolver qualifiedExpressionResolver; - private CandidateResolver candidateResolver; - private ImportsResolver importsResolver; - private JetImportsFactory jetImportsFactory; - private ScriptHeaderResolver scriptHeaderResolver; - private OverloadResolver overloadResolver; - private OverrideResolver overrideResolver; - private TypeHierarchyResolver typeHierarchyResolver; - private ScriptBodyResolver scriptBodyResolver; + private final DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummy; + private final NamespaceFactoryImpl namespaceFactory; + private final DeclarationResolver declarationResolver; + private final AnnotationResolver annotationResolver; + private final CallResolver callResolver; + private final ArgumentTypeResolver argumentTypeResolver; + private final ExpressionTypingServices expressionTypingServices; + private final CallExpressionResolver callExpressionResolver; + private final TypeResolver typeResolver; + private final QualifiedExpressionResolver qualifiedExpressionResolver; + private final CandidateResolver candidateResolver; + private final ImportsResolver importsResolver; + private final JetImportsFactory jetImportsFactory; + private final ScriptHeaderResolver scriptHeaderResolver; + private final OverloadResolver overloadResolver; + private final OverrideResolver overrideResolver; + private final TypeHierarchyResolver typeHierarchyResolver; + private final ScriptBodyResolver scriptBodyResolver; public InjectorForTopDownAnalyzerBasic( @NotNull Project project, diff --git a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java index 0692ca721cc..0ec51088246 100644 --- a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java @@ -35,19 +35,19 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForTests { - private DescriptorResolver descriptorResolver; - private ExpressionTypingServices expressionTypingServices; - private TypeResolver typeResolver; - private CallResolver callResolver; - private NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; - private KotlinBuiltIns kotlinBuiltIns; + private final DescriptorResolver descriptorResolver; + private final ExpressionTypingServices expressionTypingServices; + private final TypeResolver typeResolver; + private final CallResolver callResolver; + private final NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; + private final KotlinBuiltIns kotlinBuiltIns; private final Project project; private final ModuleDescriptor moduleDescriptor; - private AnnotationResolver annotationResolver; - private CallExpressionResolver callExpressionResolver; - private QualifiedExpressionResolver qualifiedExpressionResolver; - private ArgumentTypeResolver argumentTypeResolver; - private CandidateResolver candidateResolver; + private final AnnotationResolver annotationResolver; + private final CallExpressionResolver callExpressionResolver; + private final QualifiedExpressionResolver qualifiedExpressionResolver; + private final ArgumentTypeResolver argumentTypeResolver; + private final CandidateResolver candidateResolver; public InjectorForTests( @NotNull Project project, diff --git a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java b/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java index 62f29e6a602..7dfe8f13452 100644 --- a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java +++ b/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java @@ -235,8 +235,7 @@ public class DependencyInjectorGenerator { private void generateFields(Printer out) { for (Field field : fields) { - String _final = backsParameter.contains(field) ? "final " : ""; - out.println("private " + _final + type(InjectorGeneratorUtil.getEffectiveFieldType(field)) + " " + field.getName() + ";"); + out.println("private final " + type(InjectorGeneratorUtil.getEffectiveFieldType(field)) + " " + field.getName() + ";"); } } @@ -299,7 +298,7 @@ public class DependencyInjectorGenerator { private void generateGetters(Printer out) { for (Field field : fields) { if (!field.isPublic()) continue; - String visibility = field.isPublic() ? "public" : "private"; + String visibility = "public"; out.println(visibility + " " + type(field.getType()) + " " + field.getGetterName() + "() {"); out.pushIndent(); diff --git a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index 0b4037bb055..83d57dd332c 100644 --- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -51,35 +51,35 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForTopDownAnalyzerForJs { - private TopDownAnalyzer topDownAnalyzer; - private TopDownAnalysisContext topDownAnalysisContext; - private BodyResolver bodyResolver; - private ControlFlowAnalyzer controlFlowAnalyzer; - private DeclarationsChecker declarationsChecker; - private DescriptorResolver descriptorResolver; - private NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; + private final TopDownAnalyzer topDownAnalyzer; + private final TopDownAnalysisContext topDownAnalysisContext; + private final BodyResolver bodyResolver; + private final ControlFlowAnalyzer controlFlowAnalyzer; + private final DeclarationsChecker declarationsChecker; + private final DescriptorResolver descriptorResolver; + private final NeedSyntheticCallResolverExtension needSyntheticCallResolverExtension; private final Project project; private final TopDownAnalysisParameters topDownAnalysisParameters; private final BindingTrace bindingTrace; private final ModuleDescriptorImpl moduleDescriptor; - private DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummy; - private NamespaceFactoryImpl namespaceFactory; - private DeclarationResolver declarationResolver; - private AnnotationResolver annotationResolver; - private CallResolver callResolver; - private ArgumentTypeResolver argumentTypeResolver; - private ExpressionTypingServices expressionTypingServices; - private CallExpressionResolver callExpressionResolver; - private TypeResolver typeResolver; - private QualifiedExpressionResolver qualifiedExpressionResolver; - private CandidateResolver candidateResolver; - private ImportsResolver importsResolver; - private JetImportsFactory jetImportsFactory; - private ScriptHeaderResolver scriptHeaderResolver; - private OverloadResolver overloadResolver; - private OverrideResolver overrideResolver; - private TypeHierarchyResolver typeHierarchyResolver; - private ScriptBodyResolver scriptBodyResolver; + private final DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummy; + private final NamespaceFactoryImpl namespaceFactory; + private final DeclarationResolver declarationResolver; + private final AnnotationResolver annotationResolver; + private final CallResolver callResolver; + private final ArgumentTypeResolver argumentTypeResolver; + private final ExpressionTypingServices expressionTypingServices; + private final CallExpressionResolver callExpressionResolver; + private final TypeResolver typeResolver; + private final QualifiedExpressionResolver qualifiedExpressionResolver; + private final CandidateResolver candidateResolver; + private final ImportsResolver importsResolver; + private final JetImportsFactory jetImportsFactory; + private final ScriptHeaderResolver scriptHeaderResolver; + private final OverloadResolver overloadResolver; + private final OverrideResolver overrideResolver; + private final TypeHierarchyResolver typeHierarchyResolver; + private final ScriptBodyResolver scriptBodyResolver; public InjectorForTopDownAnalyzerForJs( @NotNull Project project,