MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

kotlin compatibility restored

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-06-30 17:02:18 +03:00
parent 0a03f1b7f6
commit 9bbd2c30dc
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/JavaProjectCodeInsightSettings.java
+1 -1
View File
@@ -44,7 +44,7 @@ import java.util.regex.Pattern;
@State(name = "JavaProjectCodeInsightSettings", storages = @Storage("codeInsightSettings.xml"))
public class JavaProjectCodeInsightSettings implements PersistentStateComponent<JavaProjectCodeInsightSettings> {
@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
private static final ConcurrentMap<String, Pattern> ourPatterns = ConcurrentWeakFactoryMap.createMap(key->
private static final ConcurrentMap<String, Pattern> ourPatterns = ConcurrentWeakFactoryMap.createWeakMap(key->
PatternUtil.fromMask(key)
);
platform/util/src/com/intellij/AbstractBundle.java
+1 -1
View File
@@ -70,7 +70,7 @@ public abstract class AbstractBundle {
@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
private static final Map<ClassLoader, Map<String, ResourceBundle>> ourCache =
ConcurrentWeakFactoryMap.createMap(new Function<ClassLoader, Map<String, ResourceBundle>>() {
ConcurrentWeakFactoryMap.createWeakMap(new Function<ClassLoader, Map<String, ResourceBundle>>() {
@Override
public Map<String, ResourceBundle> fun(ClassLoader k) {return ContainerUtil.createConcurrentSoftValueMap();}
});
platform/util/src/com/intellij/util/containers/ConcurrentWeakFactoryMap.java
+10 -2
View File
@@ -25,9 +25,17 @@ import java.util.concurrent.ConcurrentMap;
/**
* @author peter
*/
public abstract class ConcurrentWeakFactoryMap {
public abstract class ConcurrentWeakFactoryMap extends ConcurrentFactoryMap {
/**
* Use {@link #createWeakMap(Function)} instead
* TODO to remove in IDEA 2018
*/
@Deprecated
public ConcurrentWeakFactoryMap() {
}
@NotNull
public static <T, V> ConcurrentMap<T, V> createMap(@NotNull Function<T, V> compute) {
public static <T, V> ConcurrentMap<T, V> createWeakMap(@NotNull Function<T, V> compute) {
return ConcurrentFactoryMap.createMap(compute, new Producer<ConcurrentMap<T, V>>() {
@Override
public ConcurrentMap<T, V> produce() {return ContainerUtil.createConcurrentWeakMap();}