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

deprecation removed

Browse Source
This commit is contained in:
Alexey Kudravtsev
2010-02-02 11:00:37 +03:00
parent 9e643bc6e2
commit 8d057f8cd9
10 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/JavaConstantExpressionEvaluator.java
+2 -1
View File
@@ -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<PsiElement, Object> create() {
final Key<CachedValue<ConcurrentMap<PsiElement, Object>>> 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;
java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java
+1 -1
View File
@@ -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<List<PsiElement>>() {
myDefaltPackages = CachedValuesManager.getManager(project).createCachedValue(new CachedValueProvider<List<PsiElement>>() {
public Result<List<PsiElement>> compute() {
final List<PsiElement> psiPackages = new ArrayList<PsiElement>();
final String defPackageName = DEFAULT_PACKAGE.getValue(myOptions);
platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java
+1 -1
View File
@@ -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);
}
platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java
+1 -1
View File
@@ -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<PsiFileSystemItem> value =
cachedValuesManager.getCachedValue(file, DEFAULT_CONTEXTS_KEY, myDefaultContextProvider, false);
return value == null ? Collections.<PsiFileSystemItem>emptyList() : value;
plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java
+1 -1
View File
@@ -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<Set<String>>() {
public Result<Set<String>> compute() {
final Set<String> set = findAntTasks(myProject);
plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradlePositionManager.java
+3 -2
View File
@@ -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<ClassLoader>() {
return CachedValuesManager.getManager(project).getCachedValue(module, GRADLE_CLASS_LOADER, new CachedValueProvider<ClassLoader>() {
public Result<ClassLoader> compute() {
return Result.create(createGradleClassLoader(module), ProjectRootManager.getInstance(project));
}
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/XsltReferenceProvider.java
+1 -1
View File
@@ -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
xml/dom-impl/src/com/intellij/util/xml/impl/GetInvocation.java
+1 -1
View File
@@ -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<CopyOnWriteArrayList<Pair<Converter,Object>>>() {
public Result<CopyOnWriteArrayList<Pair<Converter,Object>>> compute() {
return Result.create(ContainerUtil.<Pair<Converter,Object>>createEmptyCOWList(), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT, domManager,
xml/dom-openapi/src/com/intellij/util/xml/DomResolveConverter.java
+2 -1
View File
@@ -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<T extends DomElement> extends ResolvingConverte
protected CachedValue<Map<String, DomElement>> create(final DomElement scope) {
final DomManager domManager = scope.getManager();
final Project project = domManager.getProject();
return PsiManager.getInstance(project).getCachedValuesManager().createCachedValue(new CachedValueProvider<Map<String, DomElement>>() {
return CachedValuesManager.getManager(project).createCachedValue(new CachedValueProvider<Map<String, DomElement>>() {
public Result<Map<String, DomElement>> compute() {
final Map<String, DomElement> map = new THashMap<String, DomElement>();
visitDomElement(scope, map);
xml/dom-openapi/src/com/intellij/util/xml/model/DomModelCache.java
+1 -1
View File
@@ -50,7 +50,7 @@ public abstract class DomModelCache<T, H extends UserDataHolder> {
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);
}