Remove useless ObservableBindingTrace from DI

compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java

@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.DeclarationsChecker;
 import org.jetbrains.jet.lang.resolve.DescriptorResolver;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
-import org.jetbrains.jet.lang.resolve.ObservableBindingTrace;
+import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.resolve.java.CompilerDependencies;
 import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
@@ -50,7 +50,7 @@ import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
 import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
-import org.jetbrains.jet.lang.resolve.ObservableBindingTrace;
+import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.resolve.java.CompilerDependencies;
 import org.jetbrains.annotations.NotNull;
@@ -67,7 +67,7 @@ public class InjectorForTopDownAnalyzerForJvm {
     private DescriptorResolver descriptorResolver;
     private final Project project;
     private final TopDownAnalysisParameters topDownAnalysisParameters;
-    private final ObservableBindingTrace observableBindingTrace;
+    private final BindingTrace bindingTrace;
     private final ModuleDescriptor moduleDescriptor;
     private final CompilerDependencies compilerDependencies;
     private CompilerSpecialMode compilerSpecialMode;
@@ -94,7 +94,7 @@ public class InjectorForTopDownAnalyzerForJvm {
     public InjectorForTopDownAnalyzerForJvm(
         @NotNull Project project,
         @NotNull TopDownAnalysisParameters topDownAnalysisParameters,
-        @NotNull ObservableBindingTrace observableBindingTrace,
+        @NotNull BindingTrace bindingTrace,
         @NotNull ModuleDescriptor moduleDescriptor,
         @NotNull CompilerDependencies compilerDependencies
     ) {
@@ -106,7 +106,7 @@ public class InjectorForTopDownAnalyzerForJvm {
         this.descriptorResolver = new DescriptorResolver();
         this.project = project;
         this.topDownAnalysisParameters = topDownAnalysisParameters;
-        this.observableBindingTrace = observableBindingTrace;
+        this.bindingTrace = bindingTrace;
         this.moduleDescriptor = moduleDescriptor;
         this.compilerDependencies = compilerDependencies;
         this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode();
@@ -142,7 +142,7 @@ public class InjectorForTopDownAnalyzerForJvm {
         this.topDownAnalyzer.setOverloadResolver(overloadResolver);
         this.topDownAnalyzer.setOverrideResolver(overrideResolver);
         this.topDownAnalyzer.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        this.topDownAnalyzer.setTrace(observableBindingTrace);
+        this.topDownAnalyzer.setTrace(bindingTrace);
         this.topDownAnalyzer.setTypeHierarchyResolver(typeHierarchyResolver);
 
         this.topDownAnalysisContext.setTopDownAnalysisParameters(topDownAnalysisParameters);
@@ -152,12 +152,12 @@ public class InjectorForTopDownAnalyzerForJvm {
         this.bodyResolver.setExpressionTypingServices(expressionTypingServices);
         this.bodyResolver.setScriptResolver(scriptResolver);
         this.bodyResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        this.bodyResolver.setTrace(observableBindingTrace);
+        this.bodyResolver.setTrace(bindingTrace);
 
         this.controlFlowAnalyzer.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        this.controlFlowAnalyzer.setTrace(observableBindingTrace);
+        this.controlFlowAnalyzer.setTrace(bindingTrace);
 
-        this.declarationsChecker.setTrace(observableBindingTrace);
+        this.declarationsChecker.setTrace(bindingTrace);
 
         this.descriptorResolver.setAnnotationResolver(annotationResolver);
         this.descriptorResolver.setExpressionTypingServices(expressionTypingServices);
@@ -171,7 +171,7 @@ public class InjectorForTopDownAnalyzerForJvm {
         javaDescriptorResolver.setProject(project);
         javaDescriptorResolver.setPsiClassFinder(psiClassFinderForJvm);
         javaDescriptorResolver.setSemanticServices(javaSemanticServices);
-        javaDescriptorResolver.setTrace(observableBindingTrace);
+        javaDescriptorResolver.setTrace(bindingTrace);
 
         psiClassFinderForJvm.setCompilerDependencies(compilerDependencies);
         psiClassFinderForJvm.setProject(project);
@@ -180,7 +180,7 @@ public class InjectorForTopDownAnalyzerForJvm {
         declarationResolver.setContext(topDownAnalysisContext);
         declarationResolver.setDescriptorResolver(descriptorResolver);
         declarationResolver.setImportsResolver(importsResolver);
-        declarationResolver.setTrace(observableBindingTrace);
+        declarationResolver.setTrace(bindingTrace);
 
         annotationResolver.setCallResolver(callResolver);
         annotationResolver.setExpressionTypingServices(expressionTypingServices);
@@ -202,28 +202,28 @@ public class InjectorForTopDownAnalyzerForJvm {
         importsResolver.setConfiguration(javaBridgeConfiguration);
         importsResolver.setContext(topDownAnalysisContext);
         importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
-        importsResolver.setTrace(observableBindingTrace);
+        importsResolver.setTrace(bindingTrace);
 
         delegationResolver.setContext(topDownAnalysisContext);
-        delegationResolver.setTrace(observableBindingTrace);
+        delegationResolver.setTrace(bindingTrace);
 
         namespaceFactoryImpl.setConfiguration(javaBridgeConfiguration);
         namespaceFactoryImpl.setModuleDescriptor(moduleDescriptor);
-        namespaceFactoryImpl.setTrace(observableBindingTrace);
+        namespaceFactoryImpl.setTrace(bindingTrace);
 
         overloadResolver.setContext(topDownAnalysisContext);
-        overloadResolver.setTrace(observableBindingTrace);
+        overloadResolver.setTrace(bindingTrace);
 
         overrideResolver.setContext(topDownAnalysisContext);
         overrideResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        overrideResolver.setTrace(observableBindingTrace);
+        overrideResolver.setTrace(bindingTrace);
 
         typeHierarchyResolver.setContext(topDownAnalysisContext);
         typeHierarchyResolver.setDescriptorResolver(descriptorResolver);
         typeHierarchyResolver.setImportsResolver(importsResolver);
         typeHierarchyResolver.setNamespaceFactory(namespaceFactoryImpl);
         typeHierarchyResolver.setScriptResolver(scriptResolver);
-        typeHierarchyResolver.setTrace(observableBindingTrace);
+        typeHierarchyResolver.setTrace(bindingTrace);
 
         scriptResolver.setContext(topDownAnalysisContext);
         scriptResolver.setDependencyClassByQualifiedNameResolver(javaDescriptorResolver);
@@ -231,11 +231,11 @@ public class InjectorForTopDownAnalyzerForJvm {
         scriptResolver.setModuleDescriptor(moduleDescriptor);
         scriptResolver.setNamespaceFactory(namespaceFactoryImpl);
         scriptResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        scriptResolver.setTrace(observableBindingTrace);
+        scriptResolver.setTrace(bindingTrace);
 
         javaSemanticServices.setDescriptorResolver(javaDescriptorResolver);
         javaSemanticServices.setPsiClassFinder(psiClassFinderForJvm);
-        javaSemanticServices.setTrace(observableBindingTrace);
+        javaSemanticServices.setTrace(bindingTrace);
         javaSemanticServices.setTypeTransformer(javaTypeTransformer);
 
         javaTypeTransformer.setJavaSemanticServices(javaSemanticServices);
@@ -283,8 +283,8 @@ public class InjectorForTopDownAnalyzerForJvm {
         return this.topDownAnalysisParameters;
     }
 
-    public ObservableBindingTrace getObservableBindingTrace() {
+    public BindingTrace getBindingTrace() {
-        return this.observableBindingTrace;
+        return this.bindingTrace;
     }
 
     public JavaBridgeConfiguration getJavaBridgeConfiguration() {

compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java

@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.DeclarationsChecker;
 import org.jetbrains.jet.lang.resolve.DescriptorResolver;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
-import org.jetbrains.jet.lang.resolve.ObservableBindingTrace;
+import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.ModuleConfiguration;
 import org.jetbrains.jet.lang.types.DependencyClassByQualifiedNameResolverDummyImpl;
@@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver;
 import org.jetbrains.jet.lang.resolve.ScriptResolver;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
-import org.jetbrains.jet.lang.resolve.ObservableBindingTrace;
+import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.ModuleConfiguration;
 import org.jetbrains.annotations.NotNull;
@@ -62,7 +62,7 @@ public class InjectorForTopDownAnalyzerBasic {
     private DescriptorResolver descriptorResolver;
     private final Project project;
     private final TopDownAnalysisParameters topDownAnalysisParameters;
-    private final ObservableBindingTrace observableBindingTrace;
+    private final BindingTrace bindingTrace;
     private final ModuleDescriptor moduleDescriptor;
     private final ModuleConfiguration moduleConfiguration;
     private DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummyImpl;
@@ -84,7 +84,7 @@ public class InjectorForTopDownAnalyzerBasic {
     public InjectorForTopDownAnalyzerBasic(
         @NotNull Project project,
         @NotNull TopDownAnalysisParameters topDownAnalysisParameters,
-        @NotNull ObservableBindingTrace observableBindingTrace,
+        @NotNull BindingTrace bindingTrace,
         @NotNull ModuleDescriptor moduleDescriptor,
         @NotNull ModuleConfiguration moduleConfiguration
     ) {
@@ -96,7 +96,7 @@ public class InjectorForTopDownAnalyzerBasic {
         this.descriptorResolver = new DescriptorResolver();
         this.project = project;
         this.topDownAnalysisParameters = topDownAnalysisParameters;
-        this.observableBindingTrace = observableBindingTrace;
+        this.bindingTrace = bindingTrace;
         this.moduleDescriptor = moduleDescriptor;
         this.moduleConfiguration = moduleConfiguration;
         this.dependencyClassByQualifiedNameResolverDummyImpl = new DependencyClassByQualifiedNameResolverDummyImpl();
@@ -127,7 +127,7 @@ public class InjectorForTopDownAnalyzerBasic {
         this.topDownAnalyzer.setOverloadResolver(overloadResolver);
         this.topDownAnalyzer.setOverrideResolver(overrideResolver);
         this.topDownAnalyzer.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        this.topDownAnalyzer.setTrace(observableBindingTrace);
+        this.topDownAnalyzer.setTrace(bindingTrace);
         this.topDownAnalyzer.setTypeHierarchyResolver(typeHierarchyResolver);
 
         this.topDownAnalysisContext.setTopDownAnalysisParameters(topDownAnalysisParameters);
@@ -137,12 +137,12 @@ public class InjectorForTopDownAnalyzerBasic {
         this.bodyResolver.setExpressionTypingServices(expressionTypingServices);
         this.bodyResolver.setScriptResolver(scriptResolver);
         this.bodyResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        this.bodyResolver.setTrace(observableBindingTrace);
+        this.bodyResolver.setTrace(bindingTrace);
 
         this.controlFlowAnalyzer.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        this.controlFlowAnalyzer.setTrace(observableBindingTrace);
+        this.controlFlowAnalyzer.setTrace(bindingTrace);
 
-        this.declarationsChecker.setTrace(observableBindingTrace);
+        this.declarationsChecker.setTrace(bindingTrace);
 
         this.descriptorResolver.setAnnotationResolver(annotationResolver);
         this.descriptorResolver.setExpressionTypingServices(expressionTypingServices);
@@ -152,7 +152,7 @@ public class InjectorForTopDownAnalyzerBasic {
         declarationResolver.setContext(topDownAnalysisContext);
         declarationResolver.setDescriptorResolver(descriptorResolver);
         declarationResolver.setImportsResolver(importsResolver);
-        declarationResolver.setTrace(observableBindingTrace);
+        declarationResolver.setTrace(bindingTrace);
 
         annotationResolver.setCallResolver(callResolver);
         annotationResolver.setExpressionTypingServices(expressionTypingServices);
@@ -174,28 +174,28 @@ public class InjectorForTopDownAnalyzerBasic {
         importsResolver.setConfiguration(moduleConfiguration);
         importsResolver.setContext(topDownAnalysisContext);
         importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
-        importsResolver.setTrace(observableBindingTrace);
+        importsResolver.setTrace(bindingTrace);
 
         delegationResolver.setContext(topDownAnalysisContext);
-        delegationResolver.setTrace(observableBindingTrace);
+        delegationResolver.setTrace(bindingTrace);
 
         namespaceFactoryImpl.setConfiguration(moduleConfiguration);
         namespaceFactoryImpl.setModuleDescriptor(moduleDescriptor);
-        namespaceFactoryImpl.setTrace(observableBindingTrace);
+        namespaceFactoryImpl.setTrace(bindingTrace);
 
         overloadResolver.setContext(topDownAnalysisContext);
-        overloadResolver.setTrace(observableBindingTrace);
+        overloadResolver.setTrace(bindingTrace);
 
         overrideResolver.setContext(topDownAnalysisContext);
         overrideResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        overrideResolver.setTrace(observableBindingTrace);
+        overrideResolver.setTrace(bindingTrace);
 
         typeHierarchyResolver.setContext(topDownAnalysisContext);
         typeHierarchyResolver.setDescriptorResolver(descriptorResolver);
         typeHierarchyResolver.setImportsResolver(importsResolver);
         typeHierarchyResolver.setNamespaceFactory(namespaceFactoryImpl);
         typeHierarchyResolver.setScriptResolver(scriptResolver);
-        typeHierarchyResolver.setTrace(observableBindingTrace);
+        typeHierarchyResolver.setTrace(bindingTrace);
 
         scriptResolver.setContext(topDownAnalysisContext);
         scriptResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummyImpl);
@@ -203,7 +203,7 @@ public class InjectorForTopDownAnalyzerBasic {
         scriptResolver.setModuleDescriptor(moduleDescriptor);
         scriptResolver.setNamespaceFactory(namespaceFactoryImpl);
         scriptResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        scriptResolver.setTrace(observableBindingTrace);
+        scriptResolver.setTrace(bindingTrace);
 
     }
 
@@ -243,8 +243,8 @@ public class InjectorForTopDownAnalyzerBasic {
         return this.topDownAnalysisParameters;
     }
 
-    public ObservableBindingTrace getObservableBindingTrace() {
+    public BindingTrace getBindingTrace() {
-        return this.observableBindingTrace;
+        return this.bindingTrace;
     }
 
 }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java

@@ -149,8 +149,8 @@ public class BodyResolver {
     }
 
     @Inject
-    public void setTrace(@NotNull ObservableBindingTrace trace) {
+    public void setTrace(@NotNull BindingTrace trace) {
-        this.trace = trace;
+        this.trace = new ObservableBindingTrace(trace);
     }
 
     public void resolveBehaviorDeclarationBodies(@NotNull BodiesResolveContext bodiesResolveContext) {

compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java

@@ -46,7 +46,7 @@ public class ImportsResolver {
     @NotNull
     private QualifiedExpressionResolver qualifiedExpressionResolver;
     @NotNull
-    private ObservableBindingTrace trace;
+    private BindingTrace trace;
 
     @Inject
     public void setContext(@NotNull TopDownAnalysisContext context) {
@@ -59,7 +59,7 @@ public class ImportsResolver {
     }
 
     @Inject
-    public void setTrace(@NotNull ObservableBindingTrace trace) {
+    public void setTrace(@NotNull BindingTrace trace) {
         this.trace = trace;
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptResolver.java

@@ -19,14 +19,7 @@ package org.jetbrains.jet.lang.resolve;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.*;
-import org.jetbrains.jet.lang.descriptors.LocalVariableDescriptor;
-import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
-import org.jetbrains.jet.lang.descriptors.NamespaceDescriptorImpl;
-import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
-import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
-import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptorImpl;
-import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.psi.JetPattern;
 import org.jetbrains.jet.lang.psi.JetScript;
@@ -70,7 +63,7 @@ public class ScriptResolver {
     @NotNull
     private ExpressionTypingServices expressionTypingServices;
     @NotNull
-    private ObservableBindingTrace trace;
+    private BindingTrace trace;
     @NotNull
     private TopDownAnalysisParameters topDownAnalysisParameters;
 
@@ -100,7 +93,7 @@ public class ScriptResolver {
     }
 
     @Inject
-    public void setTrace(@NotNull ObservableBindingTrace trace) {
+    public void setTrace(@NotNull BindingTrace trace) {
         this.trace = trace;
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java

@@ -90,7 +90,7 @@ public class TypeHierarchyResolver {
     }
 
     @Inject
-    public void setTrace(@NotNull ObservableBindingTrace trace) {
+    public void setTrace(@NotNull BindingTrace trace) {
         this.trace = trace;
     }
 

injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java

@@ -103,7 +103,7 @@ public class AllInjectorsGenerator {
         // Parameters
         generator.addPublicParameter(Project.class);
         generator.addPublicParameter(TopDownAnalysisParameters.class);
-        generator.addPublicParameter(ObservableBindingTrace.class);
+        generator.addPublicParameter(BindingTrace.class);
         generator.addParameter(ModuleDescriptor.class);
     }
 

js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java

@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.DeclarationsChecker;
 import org.jetbrains.jet.lang.resolve.DescriptorResolver;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
-import org.jetbrains.jet.lang.resolve.ObservableBindingTrace;
+import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.ModuleConfiguration;
 import org.jetbrains.jet.lang.types.DependencyClassByQualifiedNameResolverDummyImpl;
@@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver;
 import org.jetbrains.jet.lang.resolve.ScriptResolver;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
-import org.jetbrains.jet.lang.resolve.ObservableBindingTrace;
+import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.ModuleConfiguration;
 import org.jetbrains.annotations.NotNull;
@@ -62,7 +62,7 @@ public class InjectorForTopDownAnalyzerForJs {
     private DescriptorResolver descriptorResolver;
     private final Project project;
     private final TopDownAnalysisParameters topDownAnalysisParameters;
-    private final ObservableBindingTrace observableBindingTrace;
+    private final BindingTrace bindingTrace;
     private final ModuleDescriptor moduleDescriptor;
     private final ModuleConfiguration moduleConfiguration;
     private DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummyImpl;
@@ -84,7 +84,7 @@ public class InjectorForTopDownAnalyzerForJs {
     public InjectorForTopDownAnalyzerForJs(
         @NotNull Project project,
         @NotNull TopDownAnalysisParameters topDownAnalysisParameters,
-        @NotNull ObservableBindingTrace observableBindingTrace,
+        @NotNull BindingTrace bindingTrace,
         @NotNull ModuleDescriptor moduleDescriptor,
         @NotNull ModuleConfiguration moduleConfiguration
     ) {
@@ -96,7 +96,7 @@ public class InjectorForTopDownAnalyzerForJs {
         this.descriptorResolver = new DescriptorResolver();
         this.project = project;
         this.topDownAnalysisParameters = topDownAnalysisParameters;
-        this.observableBindingTrace = observableBindingTrace;
+        this.bindingTrace = bindingTrace;
         this.moduleDescriptor = moduleDescriptor;
         this.moduleConfiguration = moduleConfiguration;
         this.dependencyClassByQualifiedNameResolverDummyImpl = new DependencyClassByQualifiedNameResolverDummyImpl();
@@ -127,7 +127,7 @@ public class InjectorForTopDownAnalyzerForJs {
         this.topDownAnalyzer.setOverloadResolver(overloadResolver);
         this.topDownAnalyzer.setOverrideResolver(overrideResolver);
         this.topDownAnalyzer.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        this.topDownAnalyzer.setTrace(observableBindingTrace);
+        this.topDownAnalyzer.setTrace(bindingTrace);
         this.topDownAnalyzer.setTypeHierarchyResolver(typeHierarchyResolver);
 
         this.topDownAnalysisContext.setTopDownAnalysisParameters(topDownAnalysisParameters);
@@ -137,12 +137,12 @@ public class InjectorForTopDownAnalyzerForJs {
         this.bodyResolver.setExpressionTypingServices(expressionTypingServices);
         this.bodyResolver.setScriptResolver(scriptResolver);
         this.bodyResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        this.bodyResolver.setTrace(observableBindingTrace);
+        this.bodyResolver.setTrace(bindingTrace);
 
         this.controlFlowAnalyzer.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        this.controlFlowAnalyzer.setTrace(observableBindingTrace);
+        this.controlFlowAnalyzer.setTrace(bindingTrace);
 
-        this.declarationsChecker.setTrace(observableBindingTrace);
+        this.declarationsChecker.setTrace(bindingTrace);
 
         this.descriptorResolver.setAnnotationResolver(annotationResolver);
         this.descriptorResolver.setExpressionTypingServices(expressionTypingServices);
@@ -152,7 +152,7 @@ public class InjectorForTopDownAnalyzerForJs {
         declarationResolver.setContext(topDownAnalysisContext);
         declarationResolver.setDescriptorResolver(descriptorResolver);
         declarationResolver.setImportsResolver(importsResolver);
-        declarationResolver.setTrace(observableBindingTrace);
+        declarationResolver.setTrace(bindingTrace);
 
         annotationResolver.setCallResolver(callResolver);
         annotationResolver.setExpressionTypingServices(expressionTypingServices);
@@ -174,28 +174,28 @@ public class InjectorForTopDownAnalyzerForJs {
         importsResolver.setConfiguration(moduleConfiguration);
         importsResolver.setContext(topDownAnalysisContext);
         importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
-        importsResolver.setTrace(observableBindingTrace);
+        importsResolver.setTrace(bindingTrace);
 
         delegationResolver.setContext(topDownAnalysisContext);
-        delegationResolver.setTrace(observableBindingTrace);
+        delegationResolver.setTrace(bindingTrace);
 
         namespaceFactoryImpl.setConfiguration(moduleConfiguration);
         namespaceFactoryImpl.setModuleDescriptor(moduleDescriptor);
-        namespaceFactoryImpl.setTrace(observableBindingTrace);
+        namespaceFactoryImpl.setTrace(bindingTrace);
 
         overloadResolver.setContext(topDownAnalysisContext);
-        overloadResolver.setTrace(observableBindingTrace);
+        overloadResolver.setTrace(bindingTrace);
 
         overrideResolver.setContext(topDownAnalysisContext);
         overrideResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        overrideResolver.setTrace(observableBindingTrace);
+        overrideResolver.setTrace(bindingTrace);
 
         typeHierarchyResolver.setContext(topDownAnalysisContext);
         typeHierarchyResolver.setDescriptorResolver(descriptorResolver);
         typeHierarchyResolver.setImportsResolver(importsResolver);
         typeHierarchyResolver.setNamespaceFactory(namespaceFactoryImpl);
         typeHierarchyResolver.setScriptResolver(scriptResolver);
-        typeHierarchyResolver.setTrace(observableBindingTrace);
+        typeHierarchyResolver.setTrace(bindingTrace);
 
         scriptResolver.setContext(topDownAnalysisContext);
         scriptResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummyImpl);
@@ -203,7 +203,7 @@ public class InjectorForTopDownAnalyzerForJs {
         scriptResolver.setModuleDescriptor(moduleDescriptor);
         scriptResolver.setNamespaceFactory(namespaceFactoryImpl);
         scriptResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
-        scriptResolver.setTrace(observableBindingTrace);
+        scriptResolver.setTrace(bindingTrace);
 
     }
 
@@ -243,8 +243,8 @@ public class InjectorForTopDownAnalyzerForJs {
         return this.topDownAnalysisParameters;
     }
 
-    public ObservableBindingTrace getObservableBindingTrace() {
+    public BindingTrace getBindingTrace() {
-        return this.observableBindingTrace;
+        return this.bindingTrace;
     }
 
 }