diff options
Diffstat (limited to 'java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageUtil.java')
-rw-r--r-- | java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageUtil.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageUtil.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageUtil.java index e9e999b7b149..bcb4b3d20319 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageUtil.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageUtil.java @@ -21,8 +21,6 @@ import com.intellij.ide.util.treeView.TreeViewUtil; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.*; -import com.intellij.openapi.roots.impl.DirectoryIndex; -import com.intellij.openapi.roots.impl.DirectoryInfo; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.JavaDirectoryService; @@ -230,20 +228,16 @@ public class PackageUtil { } private static class ProjectLibrariesSearchScope extends GlobalSearchScope { - private final DirectoryIndex myDirectoryIndex; + private final ProjectFileIndex myFileIndex; public ProjectLibrariesSearchScope(@NotNull Project project) { super(project); - myDirectoryIndex = DirectoryIndex.getInstance(project); + myFileIndex = ProjectRootManager.getInstance(project).getFileIndex(); } @Override public boolean contains(@NotNull VirtualFile file) { - VirtualFile dir = file.isDirectory() ? file : file.getParent(); - if (dir == null) return false; - - DirectoryInfo info = myDirectoryIndex.getInfoForDirectory(dir); - return info != null && info.hasLibraryClassRoot(); + return myFileIndex.isInLibraryClasses(file); } @Override |