azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactorings: remove warnings

Browse Source
This commit is contained in:
Nikolay Krasko
2013-09-05 15:35:04 +04:00
parent 255f08c8d7
commit 9778839d96
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/util/slicedmap/Slices.java
+4 -15
View File
@@ -46,15 +46,14 @@ public class Slices {
} }
public interface KeyNormalizer<K> { public interface KeyNormalizer<K> {
KeyNormalizer DO_NOTHING = new KeyNormalizer<Object>() { KeyNormalizer DO_NOTHING = new KeyNormalizer<Object>() {
@Override @Override
public Object normalize(Object key) { public Object normalize(Object key) {
return key; return key;
} }
}; };
K normalize(K key);
K normalize(K key);
} }
public static <K, V> SliceBuilder<K, V> sliceBuilder() { public static <K, V> SliceBuilder<K, V> sliceBuilder() {
@@ -83,7 +82,7 @@ public class Slices {
private WritableSlice<? super V, ? super K> opposite = null; private WritableSlice<? super V, ? super K> opposite = null;
private KeyNormalizer<K> keyNormalizer = null; private KeyNormalizer<K> keyNormalizer = null;
private RewritePolicy rewritePolicy; private final RewritePolicy rewritePolicy;
private String debugName; private String debugName;
@@ -130,7 +129,7 @@ public class Slices {
@Override @Override
public V computeValue(SlicedMap map, K key, V value, boolean valueNotFound) { public V computeValue(SlicedMap map, K key, V value, boolean valueNotFound) {
if (valueNotFound) return defaultValue; if (valueNotFound) return defaultValue;
return super.computeValue(map, key, value, valueNotFound); return super.computeValue(map, key, value, false);
} }
}; };
} }
@@ -147,7 +146,7 @@ public class Slices {
} }
return defaultValue; return defaultValue;
} }
return super.computeValue(map, key, value, valueNotFound); return super.computeValue(map, key, value, false);
} }
}; };
} }
@@ -167,18 +166,8 @@ public class Slices {
public static class SliceWithOpposite<K, V> extends BasicRemovableSlice<K, V> { public static class SliceWithOpposite<K, V> extends BasicRemovableSlice<K, V> {
private final WritableSlice<? super V, ? super K> opposite; private final WritableSlice<? super V, ? super K> opposite;
private final KeyNormalizer<K> keyNormalizer; private final KeyNormalizer<K> keyNormalizer;
public SliceWithOpposite(String debugName, RewritePolicy rewritePolicy) {
this(debugName, rewritePolicy, KeyNormalizer.DO_NOTHING);
}
public SliceWithOpposite(String debugName, RewritePolicy rewritePolicy, KeyNormalizer<K> keyNormalizer) {
this(rewritePolicy, null, keyNormalizer);
}
public SliceWithOpposite(RewritePolicy rewritePolicy, WritableSlice<? super V, ? super K> opposite, KeyNormalizer<K> keyNormalizer) { public SliceWithOpposite(RewritePolicy rewritePolicy, WritableSlice<? super V, ? super K> opposite, KeyNormalizer<K> keyNormalizer) {
super(rewritePolicy); super(rewritePolicy);
this.opposite = opposite; this.opposite = opposite;