Merge remote-tracking branch 'origin/master'

.idea/modules.xml

@@ -51,6 +51,8 @@
       <module fileurl="file://$PROJECT_DIR$/platform/icons/icons.iml" filepath="$PROJECT_DIR$/platform/icons/icons.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/java/idea-ui/idea-ui.iml" filepath="$PROJECT_DIR$/java/idea-ui/idea-ui.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/images/images.iml" filepath="$PROJECT_DIR$/images/images.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/indexing-api/indexing-api.iml" filepath="$PROJECT_DIR$/platform/indexing-api/indexing-api.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/platform/indexing-impl/indexing-impl.iml" filepath="$PROJECT_DIR$/platform/indexing-impl/indexing-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/java/compiler/instrumentation-util/instrumentation-util.iml" filepath="$PROJECT_DIR$/java/compiler/instrumentation-util/instrumentation-util.iml" group="java/compiler" />
       <module fileurl="file://$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" filepath="$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/java/java-impl/java-impl.iml" filepath="$PROJECT_DIR$/java/java-impl/java-impl.iml" group="java" />

images/src/org/intellij/images/index/ImageInfoIndex.java

@@ -36,7 +36,7 @@ import java.io.IOException;
 public class ImageInfoIndex extends SingleEntryFileBasedIndexExtension<ImageInfoIndex.ImageInfo> {
   public static final ID<Integer, ImageInfo> 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<ImageInfo
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return myInputFilter;
   }
 

platform/indexing-api/indexing-api.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="core-api" exported="" />
+  </component>
+</module>
+

platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java

@@ -44,7 +44,7 @@ public abstract class FileBasedIndexExtension<K, V> {
   
   public abstract DataExternalizer<V> getValueExternalizer();
   
-  public abstract FileBasedIndex.InputFilter getInputFilter();
+  public abstract InputFilter getInputFilter();
   
   public abstract boolean dependsOnFileContent();
   

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);
+}

platform/indexing-impl/indexing-impl.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="core-impl" />
+  </component>
+</module>
+

platform/lang-api/lang-api.iml

@@ -11,6 +11,7 @@
     <orderEntry type="module" module-name="lvcs-api" exported="" />
     <orderEntry type="library" exported="" name="NanoXML" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="module" module-name="indexing-api" exported="" />
   </component>
 </module>
 

platform/lang-impl/lang-impl.iml

@@ -21,6 +21,8 @@
     <orderEntry type="library" name="xpp3-1.1.4-min" level="project" />
     <orderEntry type="library" exported="" name="cli-parser" level="project" />
     <orderEntry type="library" name="http-client-3.1" level="project" />
+    <orderEntry type="module" module-name="indexing-api" />
+    <orderEntry type="module" module-name="indexing-impl" />
   </component>
 </module>
 

platform/lang-impl/src/com/intellij/find/ngrams/TrigramIndex.java

@@ -36,13 +36,13 @@ public class TrigramIndex extends ScalarIndexExtension<Integer> {
 
   public static final ID<Integer,Void> 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<Integer> {
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     if (ENABLED) {
       return INPUT_FILTER;
     }

platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionIndex.java

@@ -98,7 +98,7 @@ public class FrameworkDetectionIndex extends ScalarIndexExtension<Integer> {
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     if (myInputFilter == null) {
       final Set<FileType> acceptedTypes = new HashSet<FileType>();
       for (FrameworkDetector detector : FrameworkDetector.EP_NAME.getExtensions()) {
@@ -119,7 +119,7 @@ public class FrameworkDetectionIndex extends ScalarIndexExtension<Integer> {
     return myRegistry.getDetectorsVersion();
   }
 
-  private static class FileTypesInputFilter implements FileBasedIndex.InputFilter {
+  private static class FileTypesInputFilter implements InputFilter {
     private final Set<FileType> myAcceptedTypes;
 
     public FileTypesInputFilter(Set<FileType> acceptedTypes) {

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<IdIndexEntry, Integer> {
   @NonNls public static final ID<IdIndexEntry, Integer> 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<IdIndexEntry, Integer> {
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return myInputFilter;
   }
   

platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java

@@ -109,7 +109,7 @@ public class TodoIndex extends FileBasedIndexExtension<TodoIndexEntry, Integer>
     }
   };
   
-  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<TodoIndexEntry, Integer>
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return myInputFilter;
   }
 }

platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeIndex.java

@@ -159,8 +159,8 @@ public class FileIncludeIndex extends FileBasedIndexExtension<FileIncludeIndex.K
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
-    return new FileBasedIndex.InputFilter() {
+  public InputFilter getInputFilter() {
+    return new InputFilter() {
       @Override
       public boolean acceptInput(VirtualFile file) {
         if (file.getFileSystem() == JarFileSystem.getInstance()) {

platform/lang-impl/src/com/intellij/psi/search/FileTypeIndex.java

@@ -19,7 +19,7 @@ import java.util.Map;
  * @author Dmitry Avdeev
  */
 public class FileTypeIndex extends ScalarIndexExtension<FileType>
-  implements FileBasedIndex.InputFilter, KeyDescriptor<FileType>, DataIndexer<FileType, Void, FileContent> {
+  implements InputFilter, KeyDescriptor<FileType>, DataIndexer<FileType, Void, FileContent> {
 
 
   public static Collection<VirtualFile> getFiles(FileType fileType, GlobalSearchScope scope) {
@@ -52,7 +52,7 @@ public class FileTypeIndex extends ScalarIndexExtension<FileType>
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return this;
   }
 

platform/lang-impl/src/com/intellij/psi/search/FilenameIndex.java

@@ -57,7 +57,7 @@ public class FilenameIndex extends ScalarIndexExtension<String> {
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return myInputFilter;
   }
 
@@ -102,7 +102,7 @@ public class FilenameIndex extends ScalarIndexExtension<String> {
     }
   }
 
-  private static class MyInputFilter implements FileBasedIndex.InputFilter {
+  private static class MyInputFilter implements InputFilter {
     @Override
     public boolean acceptInput(final VirtualFile file) {
       return true;

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;
   }
 

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;

plugins/android/src/org/jetbrains/android/AndroidIdIndex.java

@@ -41,7 +41,7 @@ public class AndroidIdIndex extends ScalarIndexExtension<String> {
   public static final ID<String, Void> 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<String> {
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return INPUT_FILTER;
   }
 

plugins/android/src/org/jetbrains/android/AndroidValueResourcesIndex.java

@@ -29,7 +29,7 @@ import java.util.Set;
 public class AndroidValueResourcesIndex extends FileBasedIndexExtension<ResourceEntry, Set<ResourceEntry>> {
   public static final ID<ResourceEntry, Set<ResourceEntry>> 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<Resource
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return myInputFilter;
   }
 

plugins/ant/src/com/intellij/lang/ant/psi/impl/AntImportsIndex.java

@@ -81,7 +81,7 @@ public class AntImportsIndex extends ScalarIndexExtension<Integer>{
       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<Integer>{
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return INPUT_FILTER;
   }
 

plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java

@@ -132,7 +132,7 @@ public class GroovyDslFileIndex extends ScalarIndexExtension<String> {
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return myInputFilter;
   }
 
@@ -410,7 +410,7 @@ public class GroovyDslFileIndex extends ScalarIndexExtension<String> {
     }
   }
 
-  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());

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<XmlPropertiesIndex.Key, String>
-  implements FileBasedIndex.InputFilter, DataIndexer<XmlPropertiesIndex.Key, String, FileContent>,
+  implements InputFilter, DataIndexer<XmlPropertiesIndex.Key, String, FileContent>,
              KeyDescriptor<XmlPropertiesIndex.Key> {
 
   public final static Key MARKER_KEY = new Key();
@@ -53,7 +53,7 @@ public class XmlPropertiesIndex extends FileBasedIndexExtension<XmlPropertiesInd
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return this;
   }
 

plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassIndex.java

@@ -62,7 +62,7 @@ public class FormClassIndex extends ScalarIndexExtension<String> {
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return myInputFilter;
   }
 
@@ -94,7 +94,7 @@ public class FormClassIndex extends ScalarIndexExtension<String> {
     }
   }
 
-  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;

plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltSymbolIndex.java

@@ -143,8 +143,8 @@ public class XsltSymbolIndex extends FileBasedIndexExtension<String, XsltSymbolI
     }
 
     @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) {

xml/dom-impl/src/com/intellij/util/xml/DomFileIndex.java

@@ -38,7 +38,7 @@ import java.util.Set;
  */
 public class DomFileIndex extends ScalarIndexExtension<String>{
   public static final ID<String,Void> 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<String>{
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return INPUT_FILTER;
   }
 

xml/impl/src/com/intellij/html/index/Html5CustomAttributesIndex.java

@@ -75,7 +75,7 @@ public class Html5CustomAttributesIndex extends ScalarIndexExtension<String> {
     }
   };
 
-  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<String> {
   }
 
   @Override
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return myInputFilter;
   }
 

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<V> extends FileBasedIndexExtension<String, V> {
 
   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<V> extends FileBasedIndexExtension<String, V> {
     return KEY_DESCRIPTOR;
   }
 
-  public FileBasedIndex.InputFilter getInputFilter() {
+  public InputFilter getInputFilter() {
     return INPUT_FILTER;
   }
 

xml/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java

@@ -135,8 +135,8 @@ public class RelaxSymbolIndex extends ScalarIndexExtension<String> {
   }
 
   @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) {