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 remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Konstantin Bulenkov
2012-09-11 13:24:51 +04:00
parent ab0a349c52 449a920c9c
commit 441260da7b
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+2 -7
View File
@@ -38,7 +38,6 @@ import com.intellij.psi.search.*;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.CommonProcessors;
import com.intellij.util.Processor;
import com.intellij.util.SmartList;
import com.intellij.util.codeInsight.CommentUtilCore;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.MultiMap;
@@ -659,12 +658,8 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
}
private static MultiMap<VirtualFile, RequestWithProcessor> createMultiMap() {
return new MultiMap<VirtualFile, RequestWithProcessor>(){
@Override
protected Collection<RequestWithProcessor> createCollection() {
return new SmartList<RequestWithProcessor>(); // usually there is just one request
}
};
// usually there is just one request
return MultiMap.createSmartList();
}
private static GlobalSearchScope uniteScopes(Collection<RequestWithProcessor> requests) {
platform/util/src/com/intellij/util/containers/MultiMap.java
+12 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.util.containers;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import java.io.Serializable;
@@ -230,6 +231,16 @@ public class MultiMap<K, V> implements Serializable {
return new MultiMap<K, V>();
}
@NotNull
public static <K, V> MultiMap<K, V> createSmartList() {
return new MultiMap<K, V>() {
@Override
protected Collection<V> createCollection() {
return new SmartList<V>();
}
};
}
@NotNull
public static <K, V> MultiMap<K, V> create(int i, float v) {
return new MultiMap<K, V>(i, v);
@@ -251,4 +262,4 @@ public class MultiMap<K, V> implements Serializable {
public String toString() {
return myMap.toString();
}
}
}