From f34dd7b1b9e276824eb87b00bb36ef6f10eecfe1 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 19 Dec 2012 14:51:41 +0400 Subject: [PATCH] Removing code that is no longer used --- .../jet/asJava/JavaElementFinder.java | 64 +------------------ 1 file changed, 1 insertion(+), 63 deletions(-) diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java index 3bd5ee350c6..79a9e2a87c4 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java @@ -21,7 +21,6 @@ import com.google.common.collect.Collections2; import com.google.common.collect.Sets; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.*; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElementFinder; import com.intellij.psi.PsiManager; @@ -33,7 +32,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.codegen.NamespaceCodegen; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.java.JavaPsiFacadeKotlinHacks; -import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; @@ -42,7 +40,6 @@ import org.jetbrains.jet.util.QualifiedNamesUtil; import java.util.Collection; import java.util.List; import java.util.Set; -import java.util.WeakHashMap; import static org.jetbrains.jet.codegen.CodegenUtil.getLocalNameForObject; @@ -63,56 +60,13 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade private final PsiManager psiManager; private final LightClassGenerationSupport lightClassGenerationSupport; - private final WeakHashMap> jetFiles = new WeakHashMap>(); - public JavaElementFinder( @NotNull Project project, @NotNull LightClassGenerationSupport lightClassGenerationSupport ) { this.project = project; - psiManager = PsiManager.getInstance(project); + this.psiManager = PsiManager.getInstance(project); this.lightClassGenerationSupport = lightClassGenerationSupport; - - // Monitoring for files instead of collecting them each time - VirtualFileManager.getInstance().addVirtualFileListener(new VirtualFileListener() { - @Override - public void fileCreated(VirtualFileEvent event) { - invalidateJetFilesCache(); - } - - @Override - public void fileDeleted(VirtualFileEvent event) { - invalidateJetFilesCache(); - } - - @Override - public void fileMoved(VirtualFileMoveEvent event) { - invalidateJetFilesCache(); - } - - @Override - public void fileCopied(VirtualFileCopyEvent event) { - invalidateJetFilesCache(); - } - - @Override - public void propertyChanged(VirtualFilePropertyEvent event) {} - - @Override - public void contentsChanged(VirtualFileEvent event) {} - - @Override - public void beforePropertyChange(VirtualFilePropertyEvent event) {} - - @Override - public void beforeContentsChange(VirtualFileEvent event) {} - - @Override - public void beforeFileDeletion(VirtualFileEvent event) {} - - @Override - public void beforeFileMovement(VirtualFileMoveEvent event) {} - }); } @Override @@ -258,21 +212,5 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade return answer.toArray(new PsiClass[answer.size()]); } - - private synchronized void invalidateJetFilesCache() { - jetFiles.clear(); - } - - @Deprecated - private synchronized Collection collectProjectJetFiles(final Project project, @NotNull final GlobalSearchScope scope) { - Collection cachedFiles = jetFiles.get(scope); - - if (cachedFiles == null) { - cachedFiles = JetFilesProvider.getInstance(project).allInScope(scope); - jetFiles.put(scope, cachedFiles); - } - - return cachedFiles; - } }