From 795832ee59ecddb703e82db0bee0aee378d7c69b Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 1 Feb 2010 17:45:25 +0300 Subject: [PATCH] deprecation removed --- .../src/com/intellij/codeInspection/dataFlow/DfaUtil.java | 3 ++- .../src/com/intellij/psi/impl/ElementPresentationUtil.java | 2 +- .../src/com/intellij/psi/impl/PsiClassImplUtil.java | 2 +- .../src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java | 2 +- .../tree/injected/JavaConcatenationInjectorManager.java | 8 +++----- .../src/com/intellij/psi/impl/meta/MetaRegistry.java | 7 +++---- .../plugins/intelliLang/pattern/PatternValidator.java | 3 ++- .../jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java | 4 ++-- .../groovy/lang/resolve/CollectClassMembersUtil.java | 7 ++----- .../intellij/uiDesigner/binding/FormReferenceProvider.java | 7 ++----- .../src/org/intellij/lang/xpath/xslt/XsltSupport.java | 2 +- .../lang/xpath/xslt/context/XsltContextProvider.java | 3 ++- .../com/intellij/util/xml/impl/EvaluatedXmlNameImpl.java | 3 ++- .../util/xml/impl/FileDescriptionCachedValueProvider.java | 3 ++- .../reference/impl/providers/FileBasedUserDataCache.java | 3 ++- .../com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java | 4 ++-- .../com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java | 3 ++- .../src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java | 3 ++- .../com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java | 13 ++++++------- xml/impl/src/com/intellij/xml/util/XmlRefCountHolder.java | 3 ++- xml/impl/src/com/intellij/xml/util/XmlUtil.java | 10 +++------- 21 files changed, 45 insertions(+), 50 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java index dc020b2206..36a7e4878e 100644 --- a/java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java +++ b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java @@ -24,6 +24,7 @@ import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.NullableFunction; import com.intellij.util.containers.ContainerUtil; @@ -53,7 +54,7 @@ public class DfaUtil { CachedValue> cachedValue = context.getUserData(DFA_VARIABLE_INFO_KEY); if (cachedValue == null) { final PsiElement codeBlock = getEnclosingCodeBlock(variable, context); - cachedValue = context.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider>() { + cachedValue = CachedValuesManager.getManager(context.getProject()).createCachedValue(new CachedValueProvider>() { public Result> compute() { final MultiValuesMap result; if (codeBlock == null) { diff --git a/java/java-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java b/java/java-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java index c6df423c7c..c632be2bc9 100644 --- a/java/java-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java @@ -119,7 +119,7 @@ public class ElementPresentationUtil { CachedValue value = aClass.getUserData(CLASS_KIND_KEY); if (value == null) { - value = aClass.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + value = CachedValuesManager.getManager(aClass.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { return Result.createSingleDependency(Integer.valueOf(getClassKindImpl(aClass)), aClass); } diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java b/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java index 7ce38be3b0..61601dd5b0 100644 --- a/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java @@ -272,7 +272,7 @@ public class PsiClassImplUtil { CachedValue value = aClass.getUserData(MAP_IN_CLASS_KEY); if (value == null) { final CachedValueProvider provider = new ByNameCachedValueProvider(aClass); - value = aClass.getManager().getCachedValuesManager().createCachedValue(provider, false); + value = CachedValuesManager.getManager(aClass.getProject()).createCachedValue(provider, false); //Do not cache for nonphysical elements if (aClass.isPhysical()) { value = ((UserDataHolderEx)aClass).putUserDataIfAbsent(MAP_IN_CLASS_KEY, value); diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java b/java/java-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java index 2b97f5f305..5e5c93a610 100644 --- a/java/java-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java @@ -276,7 +276,7 @@ public class PsiSuperMethodImplUtil { CachedValue> value = aClass.getUserData(SIGNATURES_KEY); if (value == null) { BySignaturesCachedValueProvider provider = new BySignaturesCachedValueProvider(aClass); - value = aClass.getManager().getCachedValuesManager().createCachedValue(provider, false); + value = CachedValuesManager.getManager(aClass.getProject()).createCachedValue(provider, false); //Do not cache for nonphysical elements if (aClass.isPhysical()) { UserDataHolderEx dataHolder = (UserDataHolderEx)aClass; diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/JavaConcatenationInjectorManager.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/JavaConcatenationInjectorManager.java index 364531dc8c..f067d7eb25 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/JavaConcatenationInjectorManager.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/JavaConcatenationInjectorManager.java @@ -27,10 +27,7 @@ import com.intellij.openapi.util.ModificationTracker; import com.intellij.psi.*; import com.intellij.psi.impl.PsiManagerEx; import com.intellij.psi.impl.PsiParameterizedCachedValue; -import com.intellij.psi.util.CachedValueProvider; -import com.intellij.psi.util.ParameterizedCachedValue; -import com.intellij.psi.util.ParameterizedCachedValueProvider; -import com.intellij.psi.util.PsiModificationTracker; +import com.intellij.psi.util.*; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -137,7 +134,8 @@ public class JavaConcatenationInjectorManager implements ProjectComponent, Modif if (registrar.result != null) { // store this everywhere - ParameterizedCachedValue cachedValue = context.getManager().getCachedValuesManager().createParameterizedCachedValue(this, false); + ParameterizedCachedValue cachedValue = + CachedValuesManager.getManager(context.getProject()).createParameterizedCachedValue(this, false); ((PsiParameterizedCachedValue)cachedValue).setValue(result); for (PsiElement operand : operands) { diff --git a/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java b/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java index 3c0de8084f..4aa8843c6c 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java @@ -31,6 +31,7 @@ import com.intellij.psi.meta.MetaDataRegistrar; import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -51,8 +52,7 @@ public class MetaRegistry extends MetaDataRegistrar { private static final Key> META_DATA_KEY = Key.create("META DATA KEY"); public static void bindDataToElement(final PsiElement element, final PsiMetaData data) { - CachedValue value = - element.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + CachedValue value = CachedValuesManager.getManager(element.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { data.init(element); return new Result(data, data.getDependences()); @@ -69,8 +69,7 @@ public class MetaRegistry extends MetaDataRegistrar { private static final UserDataCache, PsiElement, Object> ourCachedMetaCache = new UserDataCache, PsiElement, Object>() { protected CachedValue compute(final PsiElement element, Object p) { - return element.getManager().getCachedValuesManager() - .createCachedValue(new CachedValueProvider() { + return CachedValuesManager.getManager(element.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { try { ensureContributorsLoaded(); diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/pattern/PatternValidator.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/pattern/PatternValidator.java index 6dbf7b1a52..f23ffd3a89 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/pattern/PatternValidator.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/pattern/PatternValidator.java @@ -27,6 +27,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.JavaRefactoringActionHandlerFactory; import com.intellij.refactoring.RefactoringActionHandler; @@ -212,7 +213,7 @@ public class PatternValidator extends LocalInspectionTool { return Result.create(p, (Object[])annotations); } }; - p = expression.getManager().getCachedValuesManager().createCachedValue(provider, false); + p = CachedValuesManager.getManager(expression.getProject()).createCachedValue(provider, false); psiAnnotation.putUserData(COMPLIED_PATTERN, p); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java index 7e1a2ad5f8..2cb9444107 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java @@ -40,6 +40,7 @@ import com.intellij.psi.scope.PsiScopeProcessor; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiModificationTracker; import com.intellij.unscramble.UnscrambleDialog; import com.intellij.util.containers.*; @@ -230,8 +231,7 @@ public class GroovyDslFileIndex extends ScalarIndexExtension { PsiScopeProcessor processor, final GroovyFile dslFile) { final Project project = dslFile.getProject(); - final ConcurrentFactoryMap map = dslFile.getManager().getCachedValuesManager() - .getCachedValue(dslFile, CACHED_ENHANCEMENTS, new CachedValueProvider>() { + final ConcurrentFactoryMap map = CachedValuesManager.getManager(dslFile.getProject()).getCachedValue(dslFile, CACHED_ENHANCEMENTS, new CachedValueProvider>() { public Result> compute() { final ConcurrentFactoryMap result = new ConcurrentFactoryMap() { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/CollectClassMembersUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/CollectClassMembersUtil.java index f7ce6a94e5..8d0c91cbbd 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/CollectClassMembersUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/CollectClassMembersUtil.java @@ -19,10 +19,7 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Trinity; import com.intellij.psi.*; import com.intellij.psi.infos.CandidateInfo; -import com.intellij.psi.util.CachedValue; -import com.intellij.psi.util.CachedValueProvider; -import com.intellij.psi.util.PsiModificationTracker; -import com.intellij.psi.util.TypeConversionUtil; +import com.intellij.psi.util.*; import com.intellij.util.containers.HashMap; import com.intellij.util.containers.HashSet; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition; @@ -79,7 +76,7 @@ public class CollectClassMembersUtil { } private static CachedValue, Map>, Map>> buildCache(final PsiClass aClass, final boolean includeSynthetic) { - return aClass.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider, Map>, Map>>() { + return CachedValuesManager.getManager(aClass.getProject()).createCachedValue(new CachedValueProvider, Map>, Map>>() { public Result, Map>, Map>> compute() { Map allFields = new HashMap(); Map> allMethods = new HashMap>(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java index 9ff8bcc209..511042ddb8 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java @@ -29,10 +29,7 @@ import com.intellij.psi.*; import com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaClassReferenceProvider; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.PsiReferenceProcessor; -import com.intellij.psi.util.CachedValue; -import com.intellij.psi.util.CachedValueProvider; -import com.intellij.psi.util.InheritanceUtil; -import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.*; import com.intellij.psi.xml.*; import com.intellij.uiDesigner.UIFormXmlConstants; import com.intellij.uiDesigner.compiler.Utils; @@ -342,7 +339,7 @@ public class FormReferenceProvider extends PsiReferenceProvider { CachedValue data = element.getUserData(CACHED_DATA); if(data == null) { - data = element.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + data = CachedValuesManager.getManager(element.getProject()).createCachedValue(new CachedValueProvider() { final Map> map = new HashMap>(); public Result compute() { final PsiReferenceProcessor.CollectElements processor = new PsiReferenceProcessor.CollectElements() { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java index 5c1403e559..ab1a58fb00 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java @@ -206,7 +206,7 @@ public class XsltSupport { } public static XsltChecker.SupportLevel getXsltSupportLevel(PsiFile psiFile) { - final CachedValuesManager mgr = psiFile.getManager().getCachedValuesManager(); + final CachedValuesManager mgr = CachedValuesManager.getManager(psiFile.getProject()); return mgr.getParameterizedCachedValue(psiFile, FORCE_XSLT_KEY, XsltSupportProvider.INSTANCE, false, psiFile); } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProvider.java index 32ebcb4dfc..979dee5ddf 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProvider.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProvider.java @@ -24,6 +24,7 @@ import com.intellij.openapi.util.SimpleFieldCache; import com.intellij.psi.*; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.*; import com.intellij.util.IncorrectOperationException; @@ -228,7 +229,7 @@ public class XsltContextProvider extends ContextProvider { } private CachedValue createCachedValue(final PsiFile file) { - return file.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + return CachedValuesManager.getManager(file.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { final ElementNames names = new ElementNames(); final PsiFile[] associations = myFileAssociationsManager.getAssociationsFor(file, FileAssociationsManager.XML_FILES); diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/EvaluatedXmlNameImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/EvaluatedXmlNameImpl.java index 92f2b2f95a..262a7f9895 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/EvaluatedXmlNameImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/EvaluatedXmlNameImpl.java @@ -20,6 +20,7 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.xml.*; import com.intellij.util.containers.ConcurrentFactoryMap; import com.intellij.util.containers.ConcurrentHashMap; @@ -106,7 +107,7 @@ public class EvaluatedXmlNameImpl implements EvaluatedXmlName { private List getAllowedNamespaces(final XmlFile file) { CachedValue>> value = file.getUserData(NAMESPACE_PROVIDER_KEY); if (value == null) { - file.putUserData(NAMESPACE_PROVIDER_KEY, value = file.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider>>() { + file.putUserData(NAMESPACE_PROVIDER_KEY, value = CachedValuesManager.getManager(file.getProject()).createCachedValue(new CachedValueProvider>>() { public Result>> compute() { final FactoryMap> map = new ConcurrentFactoryMap>() { protected List create(final String key) { diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/FileDescriptionCachedValueProvider.java b/xml/dom-impl/src/com/intellij/util/xml/impl/FileDescriptionCachedValueProvider.java index 32d6316761..8b83544de2 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/FileDescriptionCachedValueProvider.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/FileDescriptionCachedValueProvider.java @@ -21,6 +21,7 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.util.UserDataCache; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.xml.XmlFile; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; @@ -47,7 +48,7 @@ class FileDescriptionCachedValueProvider implements SemEle private static final Key> ROOT_TAG_NS_KEY = Key.create("rootTag&ns"); private static final UserDataCache,XmlFile,Object> ourRootTagCache = new UserDataCache, XmlFile, Object>() { protected CachedValue compute(final XmlFile file, final Object o) { - return file.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + return CachedValuesManager.getManager(file.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { return new Result(DomImplUtil.getXmlFileHeader(file), file); } diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileBasedUserDataCache.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileBasedUserDataCache.java index 1fc27f0183..75c5c3fe7e 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileBasedUserDataCache.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileBasedUserDataCache.java @@ -21,6 +21,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.FileViewProvider; import com.intellij.openapi.util.UserDataCache; import com.intellij.openapi.util.Key; +import com.intellij.psi.util.CachedValuesManager; /** * @author Maxim.Mossienko @@ -29,7 +30,7 @@ import com.intellij.openapi.util.Key; */ public abstract class FileBasedUserDataCache extends UserDataCache, PsiFile, Object> { protected CachedValue compute(final PsiFile xmlFile, final Object o) { - return xmlFile.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + return CachedValuesManager.getManager(xmlFile.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { return new Result(doCompute(xmlFile), getDependencies(xmlFile)); diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java index a1051534bc..4f90301a06 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlEntityRefImpl.java @@ -22,6 +22,7 @@ import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry import com.intellij.psi.search.PsiElementProcessor; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.*; import com.intellij.xml.XmlElementDescriptor; @@ -70,8 +71,7 @@ public class XmlEntityRefImpl extends XmlElementImpl implements XmlEntityRef { final String name = decl.getName(); if (cachingMap.containsKey(name)) return; cachingMap.put( - name, - file.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + name, CachedValuesManager.getManager(file.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { if (decl.isValid() && name.equals(decl.getName())) return new Result(decl,decl); diff --git a/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java index 59fc0cefcd..db0846e4e5 100644 --- a/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java @@ -26,6 +26,7 @@ import com.intellij.psi.scope.processor.FilterElementProcessor; import com.intellij.psi.search.PsiElementProcessor; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.*; import com.intellij.util.IncorrectOperationException; @@ -60,7 +61,7 @@ public class XmlElementDescriptorImpl extends BaseXmlElementDescriptorImpl imple private static final UserDataCache,XmlElement, Object> myAttlistDeclCache = new UserDataCache,XmlElement, Object>() { protected final CachedValue compute(final XmlElement owner, Object o) { - return owner.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + return CachedValuesManager.getManager(owner.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { return new Result(doCollectAttlistDecls(owner),owner); } diff --git a/xml/impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java index ac49e1e6db..7f450b2a01 100644 --- a/xml/impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java @@ -26,6 +26,7 @@ import com.intellij.psi.scope.processor.FilterElementProcessor; import com.intellij.psi.search.PsiElementProcessor; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.xml.*; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.XmlNSDescriptor; @@ -100,7 +101,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptor,Validator> doBuildDeclarationMap() { - return myElement.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider>() { + return CachedValuesManager.getManager(myElement.getProject()).createCachedValue(new CachedValueProvider>() { public Result> compute() { final List result = new ArrayList(); myElement.processElements(new FilterElementProcessor(new ClassFilter(XmlElementDecl.class), result), getDeclaration()); diff --git a/xml/impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java index d387b63c39..afff733e8c 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java @@ -27,6 +27,7 @@ import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.search.PsiElementProcessor; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlDocument; import com.intellij.psi.xml.XmlFile; @@ -174,8 +175,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptor,Validator cachedValue = - tag.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + final CachedValue cachedValue = CachedValuesManager.getManager(tag.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { final String name = tag.getAttributeValue("name"); @@ -311,7 +311,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptor,Validator value = includedDocument.getManager().getCachedValuesManager().createCachedValue( + final CachedValue value = CachedValuesManager.getManager(includedDocument.getProject()).createCachedValue( new CachedValueProvider(){ public Result compute() { return new Result(attributeDescriptor, attributeDescriptor.getDependences()); @@ -509,8 +509,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptor,Validator visited1 = visited; - final CachedValue value = - tag.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + final CachedValue value = CachedValuesManager.getManager(tag.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { final String currentName = tag.getAttributeValue("name"); @@ -584,7 +583,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptor,Validator createAndPutTypesCachedValueSimpleType(final XmlTag tag, final Pair pair) { - final CachedValue value = tag.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + final CachedValue value = CachedValuesManager.getManager(tag.getProject()).createCachedValue(new CachedValueProvider() { public CachedValueProvider.Result compute() { final SimpleTypeDescriptor simpleTypeDescriptor = new SimpleTypeDescriptor(tag); return new Result(simpleTypeDescriptor, tag); @@ -595,7 +594,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptor,Validator createAndPutTypesCachedValue(final XmlTag tag, final Pair pair) { - final CachedValue value = tag.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + final CachedValue value = CachedValuesManager.getManager(tag.getProject()).createCachedValue(new CachedValueProvider() { public CachedValueProvider.Result compute() { final String name = tag.getAttributeValue("name"); diff --git a/xml/impl/src/com/intellij/xml/util/XmlRefCountHolder.java b/xml/impl/src/com/intellij/xml/util/XmlRefCountHolder.java index 8244cd5cbd..690a4bfb3d 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlRefCountHolder.java +++ b/xml/impl/src/com/intellij/xml/util/XmlRefCountHolder.java @@ -25,6 +25,7 @@ import com.intellij.psi.impl.source.resolve.reference.impl.providers.IdReference import com.intellij.psi.templateLanguages.OuterLanguageElement; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.*; import com.intellij.xml.XmlAttributeDescriptor; @@ -43,7 +44,7 @@ public class XmlRefCountHolder { private final static UserDataCache, XmlFile, Object> CACHE = new UserDataCache, XmlFile, Object>() { protected CachedValue compute(final XmlFile file, final Object p) { - return file.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + return CachedValuesManager.getManager(file.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { final XmlRefCountHolder holder = new XmlRefCountHolder(); final Language language = file.getViewProvider().getBaseLanguage(); diff --git a/xml/impl/src/com/intellij/xml/util/XmlUtil.java b/xml/impl/src/com/intellij/xml/util/XmlUtil.java index 91da281245..fa9e5fbd82 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlUtil.java +++ b/xml/impl/src/com/intellij/xml/util/XmlUtil.java @@ -51,10 +51,7 @@ import com.intellij.psi.impl.source.xml.XmlEntityRefImpl; import com.intellij.psi.scope.processor.FilterElementProcessor; import com.intellij.psi.search.PsiElementProcessor; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.CachedValue; -import com.intellij.psi.util.CachedValueProvider; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.*; import com.intellij.psi.xml.*; import com.intellij.util.*; import com.intellij.util.containers.ContainerUtil; @@ -598,8 +595,7 @@ public class XmlUtil { private boolean processXInclude(final boolean deepFlag, final boolean wideFlag, final XmlTag xincludeTag) { - final PsiElement[] inclusion = xincludeTag.getManager().getCachedValuesManager() - .getCachedValue(xincludeTag, KEY_RESOLVED_XINCLUDE, new CachedValueProvider() { + final PsiElement[] inclusion = CachedValuesManager.getManager(xincludeTag.getProject()).getCachedValue(xincludeTag, KEY_RESOLVED_XINCLUDE, new CachedValueProvider() { public Result compute() { final Result result = computeInclusion(xincludeTag); result.setLockValue(true); @@ -776,7 +772,7 @@ public class XmlUtil { // return entityDecl.parse(targetFile, type); if (value == null) { - value = entityDecl.getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider() { + value = CachedValuesManager.getManager(entityDecl.getProject()).createCachedValue(new CachedValueProvider() { public Result compute() { final PsiElement res = entityDecl.parse(targetFile, type, entityRef); if (res == null) return new Result(res, targetFile); -- 2.11.4.GIT