diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/Slices.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/Slices.java index f5bcb047b1a..6560483c60d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/Slices.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/Slices.java @@ -47,17 +47,6 @@ public class Slices { private Slices() { } - public interface KeyNormalizer { - KeyNormalizer DO_NOTHING = new KeyNormalizer() { - @Override - public Object normalize(Object key) { - return key; - } - }; - - K normalize(K key); - } - public static SliceBuilder sliceBuilder() { return new SliceBuilder(ONLY_REWRITE_TO_EQUAL); } @@ -86,7 +75,6 @@ public class Slices { private V defaultValue = null; private List> furtherLookupSlices = null; private WritableSlice opposite = null; - private KeyNormalizer keyNormalizer = null; private final RewritePolicy rewritePolicy; @@ -116,11 +104,6 @@ public class Slices { return this; } - public SliceBuilder setKeyNormalizer(KeyNormalizer keyNormalizer) { - this.keyNormalizer = keyNormalizer; - return this; - } - public RemovableSlice build() { SliceWithOpposite result = doBuild(); if (debugName != null) { @@ -131,7 +114,7 @@ public class Slices { private SliceWithOpposite doBuild() { if (defaultValue != null) { - return new SliceWithOpposite(rewritePolicy, opposite, keyNormalizer) { + return new SliceWithOpposite(rewritePolicy, opposite) { @Override public V computeValue(SlicedMap map, K key, V value, boolean valueNotFound) { if (valueNotFound) return defaultValue; @@ -140,7 +123,7 @@ public class Slices { }; } if (furtherLookupSlices != null) { - return new SliceWithOpposite(rewritePolicy, opposite, keyNormalizer) { + return new SliceWithOpposite(rewritePolicy, opposite) { @Override public V computeValue(SlicedMap map, K key, V value, boolean valueNotFound) { if (valueNotFound) { @@ -156,7 +139,7 @@ public class Slices { } }; } - return new SliceWithOpposite(rewritePolicy, opposite, keyNormalizer); + return new SliceWithOpposite(rewritePolicy, opposite); } } @@ -172,12 +155,10 @@ public class Slices { public static class SliceWithOpposite extends BasicRemovableSlice { private final WritableSlice opposite; - private final KeyNormalizer keyNormalizer; - public SliceWithOpposite(RewritePolicy rewritePolicy, WritableSlice opposite, KeyNormalizer keyNormalizer) { + public SliceWithOpposite(RewritePolicy rewritePolicy, WritableSlice opposite) { super(rewritePolicy); this.opposite = opposite; - this.keyNormalizer = keyNormalizer; } @Override