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

Merge branch 'core-indexing' into upsource-master

Browse Source
This commit is contained in:
Dmitry Lomov
2012-05-09 13:38:38 +02:00
parent f3b1e7b9b1 710b0663bb
commit 59f272d72c
7 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompilerContentIterator.java
-1
View File
@@ -19,7 +19,6 @@ import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.roots.ContentIterator;
import com.intellij.openapi.roots.FileIndex;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import java.util.Collection;
java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/IdCacheTest.java
Vendored
-1
View File
@@ -21,7 +21,6 @@ import com.intellij.psi.search.UsageSearchContext;
import com.intellij.testFramework.PsiTestUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.indexing.FileBasedIndex;
import com.intellij.util.indexing.FileBasedIndexImpl;
import java.io.File;
import java.util.Arrays;
java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java
-1
View File
@@ -44,7 +44,6 @@ import com.intellij.testFramework.PsiTestUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Processor;
import com.intellij.util.indexing.FileBasedIndex;
import com.intellij.util.indexing.FileBasedIndexImpl;
import org.jetbrains.annotations.NonNls;
import java.io.File;
platform/platform-api/src/com/intellij/openapi/roots/ContentIterator.java → platform/core-api/src/com/intellij/openapi/roots/ContentIterator.java
View File
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java → platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndex.java
+2 -2
View File
@@ -16,7 +16,7 @@
package com.intellij.util.indexing;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.ApplicationComponent;
import com.intellij.openapi.components.BaseComponent;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ContentIterator;
@@ -36,7 +36,7 @@ import java.util.Set;
/**
* Author: dmitrylomov
*/
public abstract class FileBasedIndex implements ApplicationComponent {
public abstract class FileBasedIndex implements BaseComponent {
public abstract void iterateIndexableFiles(@NotNull ContentIterator processor, @NotNull Project project, ProgressIndicator indicator);
public abstract void registerIndexableSet(@NotNull IndexableFileSet set, @Nullable Project project);
platform/lang-impl/src/com/intellij/util/indexing/IndexableFileSet.java → platform/indexing-api/src/com/intellij/util/indexing/IndexableFileSet.java
View File
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
-1
View File
@@ -56,7 +56,6 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.ModuleType;
import com.intellij.openapi.project.ModuleAdapter;
import com.intellij.openapi.project.ModuleListener;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.project.ex.ProjectEx;