From cd6229f9459eeb809a2eb34f4ad51f3bdb784280 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 14 Nov 2014 14:34:14 +0300 Subject: [PATCH] removed cacheOrGet --- .../intellij/psi/impl/file/impl/JavaFileManagerImpl.java | 5 +++-- .../src/com/intellij/psi/impl/PsiElementFactoryImpl.java | 3 ++- .../com/intellij/util/containers/ConcurrentHashMap.java | 8 -------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java b/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java index d5baa42ad2f8..724eecda2d53 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,7 @@ import com.intellij.psi.impl.file.PsiPackageImpl; import com.intellij.psi.impl.java.stubs.index.JavaFullClassNameIndex; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiUtilCore; +import com.intellij.util.ConcurrencyUtil; import com.intellij.util.Query; import com.intellij.util.containers.ConcurrentHashMap; import com.intellij.util.containers.ContainerUtil; @@ -127,7 +128,7 @@ public class JavaFileManagerImpl implements JavaFileManager, Disposable { if (cached == null) { cached = findClassInIndex(qName, scope); if (cached != null) { - cached = myCachedObjectClassMap.cacheOrGet(scope, cached); + cached = ConcurrencyUtil.cacheOrGet(myCachedObjectClassMap, scope, cached); } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java index 2163057032d8..a5e2b67ff50e 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java @@ -35,6 +35,7 @@ import com.intellij.psi.javadoc.PsiDocTag; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiUtil; +import com.intellij.util.ConcurrencyUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ConcurrentHashMap; import com.intellij.util.containers.HashMap; @@ -408,7 +409,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps PsiClass aClass = JavaPsiFacade.getInstance(myManager.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT, resolveScope); if (aClass != null) { cachedObjectType = new PsiImmediateClassType(aClass, PsiSubstitutor.EMPTY); - cachedObjectType = myCachedObjectType.cacheOrGet(resolveScope, cachedObjectType); + cachedObjectType = ConcurrencyUtil.cacheOrGet(myCachedObjectType, resolveScope, cachedObjectType); return cachedObjectType; } } diff --git a/platform/util/src/com/intellij/util/containers/ConcurrentHashMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentHashMap.java index ff09f473d9d1..dc5470a65238 100644 --- a/platform/util/src/com/intellij/util/containers/ConcurrentHashMap.java +++ b/platform/util/src/com/intellij/util/containers/ConcurrentHashMap.java @@ -16,7 +16,6 @@ package com.intellij.util.containers; -import com.intellij.util.ConcurrencyUtil; import com.intellij.util.concurrency.AtomicFieldUpdater; import gnu.trove.TObjectHashingStrategy; import jsr166e.ForkJoinPool; @@ -3826,13 +3825,6 @@ public class ConcurrentHashMap extends AbstractMap implements Concur return o1.equals(o2); } - /** - * @return value if there is no entry in the map, or corresponding value if entry already exists - */ - public V cacheOrGet(final K key, final V value) { - return ConcurrencyUtil.cacheOrGet(this, key, value); - } - private int hash(K key) { return spread(myHashingStrategy.computeHashCode(key)); }