From 99cf24d3ca076ef96cecdf7c86fe620557fa45e8 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 8 Aug 2011 12:10:35 +0400 Subject: [PATCH] Cleanup --- .../impl/file/impl/JavaFileManagerImpl.java | 39 ++++++------------- .../intellij/psi/stubs/AbstractStubIndex.java | 10 ++--- 2 files changed, 15 insertions(+), 34 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java index 094aefc89807..e229d429dee7 100644 --- a/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2011 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. @@ -14,9 +14,6 @@ * limitations under the License. */ -/* - * @author max - */ package com.intellij.psi.impl.file.impl; import com.intellij.AppTopics; @@ -25,7 +22,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileEditor.FileDocumentManagerAdapter; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.roots.*; -import com.intellij.openapi.vcs.ComparableComparator; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.openapi.vfs.newvfs.BulkFileListener; @@ -35,8 +31,7 @@ import com.intellij.psi.impl.PsiManagerEx; 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.PsiUtil; -import com.intellij.util.ConcurrencyUtil; +import com.intellij.psi.util.PsiUtilBase; import com.intellij.util.Query; import com.intellij.util.containers.ConcurrentHashMap; import com.intellij.util.containers.ContainerUtil; @@ -48,14 +43,18 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.*; -import java.util.concurrent.ConcurrentMap; +/** + * @author max + */ public class JavaFileManagerImpl implements JavaFileManager { private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.file.impl.JavaFileManagerImpl"); - private final ConcurrentHashMap myCachedObjectClassMap = new ConcurrentHashMap(); - private final Map myNameToClassMap = new ConcurrentHashMap(); // used only in mode without repository + @NonNls private static final String JAVA_EXTENSION = ".java"; @NonNls private static final String CLASS_EXTENSION = ".class"; + + private final ConcurrentHashMap myCachedObjectClassMap = new ConcurrentHashMap(); + private final Map myNameToClassMap = new ConcurrentHashMap(); // used only in mode without repository private final PsiManagerEx myManager; private final ProjectRootManager myProjectRootManager; private final FileManager myFileManager; @@ -166,8 +165,8 @@ public class JavaFileManagerImpl implements JavaFileManager { public static boolean notClass(final PsiElement found) { if (found instanceof PsiClass) return false; - VirtualFile faultyContainer = PsiUtil.getVirtualFile(found); - LOG.error("Non class in class list: " + faultyContainer+". found: "+found); + VirtualFile faultyContainer = PsiUtilBase.getVirtualFile(found); + LOG.error("Non class in class list: " + faultyContainer + ". found: " + found); if (faultyContainer != null && faultyContainer.isValid()) { FileBasedIndex.getInstance().requestReindex(faultyContainer); } @@ -175,24 +174,8 @@ public class JavaFileManagerImpl implements JavaFileManager { return true; } - /* - private static ConcurrentMap ourStats = new ConcurrentHashMap(); - - public static void printStats() { - TreeMap> map = new TreeMap>(new ComparableComparator.Descending()); - for (Map.Entry entry : ourStats.entrySet()) { - ContainerUtil.getOrCreate(map, entry.getValue(), new ArrayList()).add(entry.getKey()); - } - for (Map.Entry> entry : map.entrySet()) { - System.out.println(entry.getKey() + ": " + entry.getValue()); - } - } - */ - @Nullable public PsiClass findClass(@NotNull String qName, @NotNull GlobalSearchScope scope) { - //ourStats.put(qName, ConcurrencyUtil.cacheOrGet(ourStats, qName, 0) + 1); - if (!myUseRepository) { return findClassWithoutRepository(qName); } diff --git a/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java b/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java index 34f4876394ed..1d5c648f844d 100644 --- a/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java +++ b/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2011 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. @@ -13,10 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* - * @author max - */ package com.intellij.psi.stubs; import com.intellij.openapi.project.Project; @@ -25,6 +21,9 @@ import com.intellij.psi.search.GlobalSearchScope; import java.util.Collection; +/** + * @author max + */ public abstract class AbstractStubIndex implements StubIndexExtension { public Collection getAllKeys(Project project) { return StubIndex.getInstance().getAllKeys(getKey(), project); @@ -33,5 +32,4 @@ public abstract class AbstractStubIndex implements public Collection get(Key key, final Project project, final GlobalSearchScope scope) { return StubIndex.getInstance().get(getKey(), key, project, scope); } - }