From 8d057f8cd947f69b16e9d65e7a615c4e9c7df1fc Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 1 Feb 2010 17:41:43 +0300 Subject: [PATCH] deprecation removed --- .../intellij/psi/impl/JavaConstantExpressionEvaluator.java | 3 ++- .../reference/impl/providers/JavaClassReferenceProvider.java | 2 +- .../src/com/intellij/facet/impl/FacetFinderImpl.java | 2 +- .../resolve/reference/impl/providers/FileReferenceSet.java | 2 +- .../org/jetbrains/plugins/groovy/gant/AntTasksProvider.java | 2 +- .../plugins/groovy/gradle/GradlePositionManager.java | 5 +++-- .../xpath/xslt/impl/references/XsltReferenceProvider.java | 2 +- .../src/com/intellij/util/xml/impl/GetInvocation.java | 2 +- .../src/com/intellij/util/xml/DomResolveConverter.java | 3 ++- .../src/com/intellij/util/xml/model/DomModelCache.java | 2 +- 10 files changed, 14 insertions(+), 11 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaConstantExpressionEvaluator.java b/java/java-impl/src/com/intellij/psi/impl/JavaConstantExpressionEvaluator.java index fda3fe6e00d5..6286f0df796a 100644 --- a/java/java-impl/src/com/intellij/psi/impl/JavaConstantExpressionEvaluator.java +++ b/java/java-impl/src/com/intellij/psi/impl/JavaConstantExpressionEvaluator.java @@ -21,6 +21,7 @@ import com.intellij.openapi.util.Key; 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.PsiModificationTracker; import com.intellij.util.ConcurrencyUtil; import com.intellij.util.containers.ConcurrentSoftHashMap; @@ -48,7 +49,7 @@ public class JavaConstantExpressionEvaluator extends JavaRecursiveElementWalking public ConcurrentMap create() { final Key>> key = throwExceptionOnOverflow ? CONSTANT_VALUE_WITH_OVERFLOW_MAP_KEY : CONSTANT_VALUE_WO_OVERFLOW_MAP_KEY; - return PsiManager.getInstance(myProject).getCachedValuesManager().getCachedValue(myProject, key, PROVIDER, false); + return CachedValuesManager.getManager(myProject).getCachedValue(myProject, key, PROVIDER, false); } }; myProject = project; diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java index 7c9004f6f66f..a21c030c697e 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java @@ -65,7 +65,7 @@ public class JavaClassReferenceProvider extends GenericReferenceProvider impleme public JavaClassReferenceProvider(GlobalSearchScope scope, final Project project) { myScope = scope; - myDefaltPackages = PsiManager.getInstance(project).getCachedValuesManager().createCachedValue(new CachedValueProvider>() { + myDefaltPackages = CachedValuesManager.getManager(project).createCachedValue(new CachedValueProvider>() { public Result> compute() { final List psiPackages = new ArrayList(); final String defPackageName = DEFAULT_PACKAGE.getValue(myOptions); diff --git a/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java index 667d3454a699..fa75429a9f3d 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java @@ -49,7 +49,7 @@ public class FacetFinderImpl extends FacetFinder { public FacetFinderImpl(Project project) { myProject = project; - myCachedValuesManager = PsiManager.getInstance(project).getCachedValuesManager(); + myCachedValuesManager = CachedValuesManager.getManager(project); myModuleManager = ModuleManager.getInstance(myProject); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java index 56058372db69..6139a75577e0 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java @@ -254,7 +254,7 @@ public class FileReferenceSet { PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT); } }; - final CachedValuesManager cachedValuesManager = PsiManager.getInstance(myElement.getProject()).getCachedValuesManager(); + final CachedValuesManager cachedValuesManager = CachedValuesManager.getManager(myElement.getProject()); final Collection value = cachedValuesManager.getCachedValue(file, DEFAULT_CONTEXTS_KEY, myDefaultContextProvider, false); return value == null ? Collections.emptyList() : value; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java index e44c8aa2cd87..71827de6343d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java @@ -49,7 +49,7 @@ public class AntTasksProvider { public AntTasksProvider(Project project) { myProject = project; - final CachedValuesManager manager = PsiManager.getInstance(myProject).getCachedValuesManager(); + final CachedValuesManager manager = CachedValuesManager.getManager(myProject); myCachedValue = manager.createCachedValue(new CachedValueProvider>() { public Result> compute() { final Set set = findAntTasks(myProject); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradlePositionManager.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradlePositionManager.java index 6de89dfb1fbb..5e6e3bb298cb 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradlePositionManager.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradlePositionManager.java @@ -29,6 +29,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; +import com.intellij.psi.util.CachedValuesManager; import com.intellij.util.containers.FactoryMap; import com.intellij.util.containers.ConcurrentFactoryMap; import com.intellij.util.lang.UrlClassLoader; @@ -74,7 +75,7 @@ public class GradlePositionManager extends ScriptPositionManagerHelper { } final File scriptFile = VfsUtil.virtualToIoFile(virtualFile); - final String className = PsiManager.getInstance(module.getProject()).getCachedValuesManager() + final String className = CachedValuesManager.getManager(module.getProject()) .getCachedValue(module, GRADLE_CLASS_NAME, new ScriptSourceMapCalculator(module), false).get(scriptFile); return className == null ? "" : className; } @@ -105,7 +106,7 @@ public class GradlePositionManager extends ScriptPositionManagerHelper { @Nullable private static ClassLoader getGradleClassLoader(@NotNull final Module module) { final Project project = module.getProject(); - return PsiManager.getInstance(project).getCachedValuesManager().getCachedValue(module, GRADLE_CLASS_LOADER, new CachedValueProvider() { + return CachedValuesManager.getManager(project).getCachedValue(module, GRADLE_CLASS_LOADER, new CachedValueProvider() { public Result compute() { return Result.create(createGradleClassLoader(module), ProjectRootManager.getInstance(project)); } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/XsltReferenceProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/XsltReferenceProvider.java index a42a4e33b264..81857312dc77 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/XsltReferenceProvider.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/XsltReferenceProvider.java @@ -48,7 +48,7 @@ public class XsltReferenceProvider extends PsiReferenceProvider { private final XsltElementFactory myXsltElementFactory = XsltElementFactory.getInstance(); public XsltReferenceProvider(Project project) { - myCacheManager = PsiManager.getInstance(project).getCachedValuesManager(); + myCacheManager = CachedValuesManager.getManager(project); } @NotNull diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/GetInvocation.java b/xml/dom-impl/src/com/intellij/util/xml/impl/GetInvocation.java index 320d7b31c589..4d82880a67ce 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/GetInvocation.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/GetInvocation.java @@ -43,7 +43,7 @@ public class GetInvocation implements Invocation { if (value == null) { final DomManagerImpl domManager = handler.getManager(); final Project project = domManager.getProject(); - final CachedValuesManager cachedValuesManager = PsiManager.getInstance(project).getCachedValuesManager(); + final CachedValuesManager cachedValuesManager = CachedValuesManager.getManager(project); handler.putUserData(DOM_VALUE_KEY, value = cachedValuesManager.createCachedValue(new CachedValueProvider>>() { public Result>> compute() { return Result.create(ContainerUtil.>createEmptyCOWList(), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT, domManager, diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomResolveConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/DomResolveConverter.java index ba18c9677ab0..d865735cbcc1 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomResolveConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomResolveConverter.java @@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiManager; 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.util.containers.ConcurrentFactoryMap; import com.intellij.util.containers.FactoryMap; @@ -51,7 +52,7 @@ public class DomResolveConverter extends ResolvingConverte protected CachedValue> create(final DomElement scope) { final DomManager domManager = scope.getManager(); final Project project = domManager.getProject(); - return PsiManager.getInstance(project).getCachedValuesManager().createCachedValue(new CachedValueProvider>() { + return CachedValuesManager.getManager(project).createCachedValue(new CachedValueProvider>() { public Result> compute() { final Map map = new THashMap(); visitDomElement(scope, map); diff --git a/xml/dom-openapi/src/com/intellij/util/xml/model/DomModelCache.java b/xml/dom-openapi/src/com/intellij/util/xml/model/DomModelCache.java index 97dcd6cf201c..1a1829ed7e66 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/DomModelCache.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/DomModelCache.java @@ -50,7 +50,7 @@ public abstract class DomModelCache { return computeValue(dataHolder); } }; - final CachedValuesManager manager = PsiManager.getInstance(myProject).getCachedValuesManager(); + final CachedValuesManager manager = CachedValuesManager.getManager(myProject); cachedValue = manager.createCachedValue(myProvider, false); dataHolder.putUserData(myKey, cachedValue); }