diff --git a/.idea/modules.xml b/.idea/modules.xml index 745b7901ffa3..ed5c32e269fe 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -51,6 +51,8 @@ + + diff --git a/images/src/org/intellij/images/index/ImageInfoIndex.java b/images/src/org/intellij/images/index/ImageInfoIndex.java index ec1ee69b8384..472fb9545f4c 100644 --- a/images/src/org/intellij/images/index/ImageInfoIndex.java +++ b/images/src/org/intellij/images/index/ImageInfoIndex.java @@ -36,7 +36,7 @@ import java.io.IOException; public class ImageInfoIndex extends SingleEntryFileBasedIndexExtension { public static final ID INDEX_ID = ID.create("ImageFileInfoIndex"); - private final FileBasedIndex.InputFilter myInputFilter = new FileBasedIndex.InputFilter() { + private final InputFilter myInputFilter = new InputFilter() { @Override public boolean acceptInput(final VirtualFile file) { return (file.getFileSystem() == LocalFileSystem.getInstance() || file.getFileSystem() instanceof TempFileSystem) && @@ -89,7 +89,7 @@ public class ImageInfoIndex extends SingleEntryFileBasedIndexExtension + + + + + + + + + + + + diff --git a/platform/lang-impl/src/com/intellij/util/indexing/DataIndexer.java b/platform/indexing-api/src/com/intellij/util/indexing/DataIndexer.java similarity index 100% rename from platform/lang-impl/src/com/intellij/util/indexing/DataIndexer.java rename to platform/indexing-api/src/com/intellij/util/indexing/DataIndexer.java diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexExtension.java b/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java similarity index 97% rename from platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexExtension.java rename to platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java index 51dc7cc449d0..ceb19fb8040c 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexExtension.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java @@ -44,7 +44,7 @@ public abstract class FileBasedIndexExtension { public abstract DataExternalizer getValueExternalizer(); - public abstract FileBasedIndex.InputFilter getInputFilter(); + public abstract InputFilter getInputFilter(); public abstract boolean dependsOnFileContent(); diff --git a/platform/indexing-api/src/com/intellij/util/indexing/InputFilter.java b/platform/indexing-api/src/com/intellij/util/indexing/InputFilter.java new file mode 100644 index 000000000000..eeddca80a61a --- /dev/null +++ b/platform/indexing-api/src/com/intellij/util/indexing/InputFilter.java @@ -0,0 +1,25 @@ +/* + * Copyright 2000-2012 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.util.indexing; + +import com.intellij.openapi.vfs.VirtualFile; + +/** +* Author: dmitrylomov +*/ +public interface InputFilter { + boolean acceptInput(VirtualFile file); +} diff --git a/platform/indexing-impl/indexing-impl.iml b/platform/indexing-impl/indexing-impl.iml new file mode 100644 index 000000000000..373eaa417d53 --- /dev/null +++ b/platform/indexing-impl/indexing-impl.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/platform/lang-api/lang-api.iml b/platform/lang-api/lang-api.iml index 2f7d0d01747c..1b93301e4d97 100644 --- a/platform/lang-api/lang-api.iml +++ b/platform/lang-api/lang-api.iml @@ -11,6 +11,7 @@ + diff --git a/platform/lang-impl/lang-impl.iml b/platform/lang-impl/lang-impl.iml index e11da7984866..cf57ba46c814 100644 --- a/platform/lang-impl/lang-impl.iml +++ b/platform/lang-impl/lang-impl.iml @@ -21,6 +21,8 @@ + + diff --git a/platform/lang-impl/src/com/intellij/find/ngrams/TrigramIndex.java b/platform/lang-impl/src/com/intellij/find/ngrams/TrigramIndex.java index 9fdc87e70686..bcafd8f4c29d 100644 --- a/platform/lang-impl/src/com/intellij/find/ngrams/TrigramIndex.java +++ b/platform/lang-impl/src/com/intellij/find/ngrams/TrigramIndex.java @@ -36,13 +36,13 @@ public class TrigramIndex extends ScalarIndexExtension { public static final ID INDEX_ID = ID.create("Trigram.Index"); - private static final FileBasedIndex.InputFilter INPUT_FILTER = new FileBasedIndex.InputFilter() { + private static final InputFilter INPUT_FILTER = new InputFilter() { @Override public boolean acceptInput(VirtualFile file) { return !file.getFileType().isBinary(); } }; - private static final FileBasedIndex.InputFilter NO_FILES = new FileBasedIndex.InputFilter() { + private static final InputFilter NO_FILES = new InputFilter() { @Override public boolean acceptInput(VirtualFile file) { return false; @@ -82,7 +82,7 @@ public class TrigramIndex extends ScalarIndexExtension { } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { if (ENABLED) { return INPUT_FILTER; } diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionIndex.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionIndex.java index 4c648d3a3ed9..957921ae7316 100644 --- a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionIndex.java +++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionIndex.java @@ -98,7 +98,7 @@ public class FrameworkDetectionIndex extends ScalarIndexExtension { } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { if (myInputFilter == null) { final Set acceptedTypes = new HashSet(); for (FrameworkDetector detector : FrameworkDetector.EP_NAME.getExtensions()) { @@ -119,7 +119,7 @@ public class FrameworkDetectionIndex extends ScalarIndexExtension { return myRegistry.getDetectorsVersion(); } - private static class FileTypesInputFilter implements FileBasedIndex.InputFilter { + private static class FileTypesInputFilter implements InputFilter { private final Set myAcceptedTypes; public FileTypesInputFilter(Set acceptedTypes) { diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndex.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndex.java index 05814a90524a..fa9b7aa17391 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndex.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndex.java @@ -42,7 +42,7 @@ import java.util.Map; public class IdIndex extends FileBasedIndexExtension { @NonNls public static final ID NAME = ID.create("IdIndex"); - private final FileBasedIndex.InputFilter myInputFilter = new FileBasedIndex.InputFilter() { + private final InputFilter myInputFilter = new InputFilter() { @Override public boolean acceptInput(final VirtualFile file) { final FileType fileType = file.getFileType(); @@ -120,7 +120,7 @@ public class IdIndex extends FileBasedIndexExtension { } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return myInputFilter; } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java index b4e412e0a8a3..594436346a7d 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java @@ -109,7 +109,7 @@ public class TodoIndex extends FileBasedIndexExtension } }; - private final FileBasedIndex.InputFilter myInputFilter = new FileBasedIndex.InputFilter() { + private final InputFilter myInputFilter = new InputFilter() { @Override public boolean acceptInput(final VirtualFile file) { if (!(file.getFileSystem() instanceof LocalFileSystem)) { @@ -166,7 +166,7 @@ public class TodoIndex extends FileBasedIndexExtension } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return myInputFilter; } } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeIndex.java b/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeIndex.java index f11d1fc871b8..45fc9b448b2c 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeIndex.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeIndex.java @@ -159,8 +159,8 @@ public class FileIncludeIndex extends FileBasedIndexExtension - implements FileBasedIndex.InputFilter, KeyDescriptor, DataIndexer { + implements InputFilter, KeyDescriptor, DataIndexer { public static Collection getFiles(FileType fileType, GlobalSearchScope scope) { @@ -52,7 +52,7 @@ public class FileTypeIndex extends ScalarIndexExtension } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return this; } diff --git a/platform/lang-impl/src/com/intellij/psi/search/FilenameIndex.java b/platform/lang-impl/src/com/intellij/psi/search/FilenameIndex.java index 387612fff350..25e603f2c894 100644 --- a/platform/lang-impl/src/com/intellij/psi/search/FilenameIndex.java +++ b/platform/lang-impl/src/com/intellij/psi/search/FilenameIndex.java @@ -57,7 +57,7 @@ public class FilenameIndex extends ScalarIndexExtension { } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return myInputFilter; } @@ -102,7 +102,7 @@ public class FilenameIndex extends ScalarIndexExtension { } } - private static class MyInputFilter implements FileBasedIndex.InputFilter { + private static class MyInputFilter implements InputFilter { @Override public boolean acceptInput(final VirtualFile file) { return true; diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java index 9bd15bedfd31..40fa9d8ac2cd 100644 --- a/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java +++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java @@ -63,7 +63,7 @@ public class StubUpdatingIndex extends CustomImplementationFileBasedIndexExtensi } }; - private static final FileBasedIndex.InputFilter INPUT_FILTER = new FileBasedIndex.InputFilter() { + private static final InputFilter INPUT_FILTER = new InputFilter() { @Override public boolean acceptInput(@NotNull final VirtualFile file) { return canHaveStub(file); @@ -144,7 +144,7 @@ public class StubUpdatingIndex extends CustomImplementationFileBasedIndexExtensi @NotNull @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return INPUT_FILTER; } diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java index a6bd6a8d093f..6e8bcf2a307b 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java @@ -132,10 +132,6 @@ public class FileBasedIndex implements ApplicationComponent { myChangedFilesCollector.invalidateIndices(file, false); } - public interface InputFilter { - boolean acceptInput(VirtualFile file); - } - public FileBasedIndex(final VirtualFileManagerEx vfManager, FileDocumentManager fdm, FileTypeManager fileTypeManager, @NotNull MessageBus bus, SerializationManager sm /*need this parameter to ensure component dependency*/) throws IOException { myVfManager = vfManager; diff --git a/plugins/android/src/org/jetbrains/android/AndroidIdIndex.java b/plugins/android/src/org/jetbrains/android/AndroidIdIndex.java index e68a3ec9ea4b..f705ee42322b 100644 --- a/plugins/android/src/org/jetbrains/android/AndroidIdIndex.java +++ b/plugins/android/src/org/jetbrains/android/AndroidIdIndex.java @@ -41,7 +41,7 @@ public class AndroidIdIndex extends ScalarIndexExtension { public static final ID INDEX_ID = ID.create("android.id.index"); public static final String MARKER = "$"; - private static final FileBasedIndex.InputFilter INPUT_FILTER = new FileBasedIndex.InputFilter() { + private static final InputFilter INPUT_FILTER = new InputFilter() { @Override public boolean acceptInput(final VirtualFile file) { return (file.getFileSystem() == LocalFileSystem.getInstance() || file.getFileSystem() instanceof TempFileSystem) && @@ -98,7 +98,7 @@ public class AndroidIdIndex extends ScalarIndexExtension { } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return INPUT_FILTER; } diff --git a/plugins/android/src/org/jetbrains/android/AndroidValueResourcesIndex.java b/plugins/android/src/org/jetbrains/android/AndroidValueResourcesIndex.java index f40f1a0d024e..97f42753f450 100644 --- a/plugins/android/src/org/jetbrains/android/AndroidValueResourcesIndex.java +++ b/plugins/android/src/org/jetbrains/android/AndroidValueResourcesIndex.java @@ -29,7 +29,7 @@ import java.util.Set; public class AndroidValueResourcesIndex extends FileBasedIndexExtension> { public static final ID> INDEX_ID = ID.create("android.value.resources.index"); - private final FileBasedIndex.InputFilter myInputFilter = new FileBasedIndex.InputFilter() { + private final InputFilter myInputFilter = new InputFilter() { @Override public boolean acceptInput(final VirtualFile file) { return (file.getFileSystem() == LocalFileSystem.getInstance() || file.getFileSystem() instanceof TempFileSystem) && @@ -152,7 +152,7 @@ public class AndroidValueResourcesIndex extends FileBasedIndexExtension{ return map; } }; - private static final FileBasedIndex.InputFilter INPUT_FILTER = new FileBasedIndex.InputFilter() { + private static final InputFilter INPUT_FILTER = new InputFilter() { @Override public boolean acceptInput(final VirtualFile file) { return file.getFileType() instanceof XmlFileType; @@ -111,7 +111,7 @@ public class AntImportsIndex extends ScalarIndexExtension{ } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return INPUT_FILTER; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java index 0ff1054751e4..81856246328f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java @@ -132,7 +132,7 @@ public class GroovyDslFileIndex extends ScalarIndexExtension { } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return myInputFilter; } @@ -410,7 +410,7 @@ public class GroovyDslFileIndex extends ScalarIndexExtension { } } - private static class MyInputFilter implements FileBasedIndex.InputFilter { + private static class MyInputFilter implements InputFilter { @Override public boolean acceptInput(final VirtualFile file) { return "gdsl".equals(file.getExtension()); diff --git a/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java b/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java index 1f576524002e..d68e30bcbf3c 100644 --- a/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java +++ b/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java @@ -22,7 +22,7 @@ import java.util.Map; * Date: 7/25/11 */ public class XmlPropertiesIndex extends FileBasedIndexExtension - implements FileBasedIndex.InputFilter, DataIndexer, + implements InputFilter, DataIndexer, KeyDescriptor { public final static Key MARKER_KEY = new Key(); @@ -53,7 +53,7 @@ public class XmlPropertiesIndex extends FileBasedIndexExtension { } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return myInputFilter; } @@ -94,7 +94,7 @@ public class FormClassIndex extends ScalarIndexExtension { } } - private static class MyInputFilter implements FileBasedIndex.InputFilter { + private static class MyInputFilter implements InputFilter { @Override public boolean acceptInput(final VirtualFile file) { return file.getFileType() == StdFileTypes.GUI_DESIGNER_FORM; diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java index fb62ec3f0fcb..668838c554bb 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java @@ -143,8 +143,8 @@ public class XsltSymbolIndex extends FileBasedIndexExtension{ public static final ID NAME = ID.create("DomFileIndex"); - private static final FileBasedIndex.InputFilter INPUT_FILTER = new FileBasedIndex.InputFilter() { + private static final InputFilter INPUT_FILTER = new InputFilter() { @Override public boolean acceptInput(final VirtualFile file) { return file.getFileType() == StdFileTypes.XML; @@ -97,7 +97,7 @@ public class DomFileIndex extends ScalarIndexExtension{ } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return INPUT_FILTER; } diff --git a/xml/impl/src/com/intellij/html/index/Html5CustomAttributesIndex.java b/xml/impl/src/com/intellij/html/index/Html5CustomAttributesIndex.java index 152018cb1281..97f4f1927a98 100644 --- a/xml/impl/src/com/intellij/html/index/Html5CustomAttributesIndex.java +++ b/xml/impl/src/com/intellij/html/index/Html5CustomAttributesIndex.java @@ -75,7 +75,7 @@ public class Html5CustomAttributesIndex extends ScalarIndexExtension { } }; - private final FileBasedIndex.InputFilter myInputFilter = new FileBasedIndex.InputFilter() { + private final InputFilter myInputFilter = new InputFilter() { @Override public boolean acceptInput(final VirtualFile file) { return (file.getFileSystem() == LocalFileSystem.getInstance() || file.getFileSystem() instanceof TempFileSystem) && @@ -101,7 +101,7 @@ public class Html5CustomAttributesIndex extends ScalarIndexExtension { } @Override - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return myInputFilter; } diff --git a/xml/impl/src/com/intellij/xml/index/XmlIndex.java b/xml/impl/src/com/intellij/xml/index/XmlIndex.java index d466188c5ca0..2e211feeafad 100644 --- a/xml/impl/src/com/intellij/xml/index/XmlIndex.java +++ b/xml/impl/src/com/intellij/xml/index/XmlIndex.java @@ -23,8 +23,8 @@ import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileFilter; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.util.indexing.FileBasedIndex; import com.intellij.util.indexing.FileBasedIndexExtension; +import com.intellij.util.indexing.InputFilter; import com.intellij.util.io.EnumeratorStringDescriptor; import com.intellij.util.io.KeyDescriptor; import org.jetbrains.annotations.NonNls; @@ -39,7 +39,7 @@ public abstract class XmlIndex extends FileBasedIndexExtension { protected static final EnumeratorStringDescriptor KEY_DESCRIPTOR = new EnumeratorStringDescriptor(); - private static final FileBasedIndex.InputFilter INPUT_FILTER = new FileBasedIndex.InputFilter() { + private static final InputFilter INPUT_FILTER = new InputFilter() { public boolean acceptInput(final VirtualFile file) { @NonNls final String extension = file.getExtension(); return extension != null && extension.equals("xsd"); @@ -105,7 +105,7 @@ public abstract class XmlIndex extends FileBasedIndexExtension { return KEY_DESCRIPTOR; } - public FileBasedIndex.InputFilter getInputFilter() { + public InputFilter getInputFilter() { return INPUT_FILTER; } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java index e92869d41b9a..ca55a0546682 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java @@ -135,8 +135,8 @@ public class RelaxSymbolIndex extends ScalarIndexExtension { } @Override - public FileBasedIndex.InputFilter getInputFilter() { - return new FileBasedIndex.InputFilter() { + public InputFilter getInputFilter() { + return new InputFilter() { @Override public boolean acceptInput(VirtualFile file) { if (file.getFileSystem() instanceof JarFileSystem) {