From 5ba283397bc537ea619125acf07e02bcfdd1b6c4 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 1 Jun 2015 21:33:12 +0200 Subject: [PATCH] use more compact map implementation in ObservableBindingTrace --- .../jetbrains/kotlin/resolve/ObservableBindingTrace.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ObservableBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ObservableBindingTrace.java index 770eea8ba46..845ace54779 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ObservableBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ObservableBindingTrace.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.resolve; -import com.google.common.collect.Maps; +import com.intellij.util.SmartFMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.diagnostics.Diagnostic; @@ -26,7 +26,6 @@ import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice; import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import java.util.Collection; -import java.util.Map; public class ObservableBindingTrace implements BindingTrace { public interface RecordHandler { @@ -36,7 +35,7 @@ public class ObservableBindingTrace implements BindingTrace { private final BindingTrace originalTrace; - private Map handlers = Maps.newHashMap(); + private SmartFMap handlers = SmartFMap.emptyMap(); public ObservableBindingTrace(BindingTrace originalTrace) { this.originalTrace = originalTrace; @@ -89,7 +88,7 @@ public class ObservableBindingTrace implements BindingTrace { } public ObservableBindingTrace addHandler(@NotNull WritableSlice slice, @NotNull RecordHandler handler) { - handlers.put(slice, handler); + handlers = handlers.plus(slice, handler); return this; }