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

keep rules in a set

Browse Source
This commit is contained in:
Alexander Doroshko
2016-07-15 21:45:12 +03:00
parent a310b65b13
commit 1fa094ccd5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/projectView/impl/NestingTreeStructureProvider.java
+9 -6
View File
@@ -32,7 +32,10 @@ import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
/**
* <code>NestingTreeStructureProvider</code> moves some files in the Project View to be shown as children of another peer file. Standard use
@@ -61,11 +64,11 @@ public class NestingTreeStructureProvider implements TreeStructureProvider, Dumb
}
private static final Logger LOG = Logger.getInstance(NestingTreeStructureProvider.class);
private List<NestingRule> myNestingRules;
private Set<NestingRule> myNestingRules;
private List<NestingRule> getNestingRules() {
private Collection<NestingRule> getNestingRules() {
if (myNestingRules == null) {
myNestingRules = new ArrayList<>();
myNestingRules = new THashSet<>();
final NestingRulesConsumer consumer = new NestingRulesConsumer() {
@Override
@@ -98,7 +101,7 @@ public class NestingTreeStructureProvider implements TreeStructureProvider, Dumb
final ViewSettings settings) {
if (!(parent instanceof PsiDirectoryNode)) return children;
final List<NestingRule> rules = getNestingRules();
final Collection<NestingRule> rules = getNestingRules();
if (rules.isEmpty()) return children;
final MultiMap<PsiFileNode, PsiFileNode> parentToChildren = calcParentToChildren(children, rules);
@@ -142,7 +145,7 @@ public class NestingTreeStructureProvider implements TreeStructureProvider, Dumb
*/
@NotNull
private static MultiMap<PsiFileNode, PsiFileNode> calcParentToChildren(@NotNull final Collection<AbstractTreeNode> nodes,
@NotNull final List<NestingRule> rules) {
@NotNull final Collection<NestingRule> rules) {
// result that will contain number of separated parent-to-many-children sub-graphs
MultiMap<PsiFileNode, PsiFileNode> parentToChildren = null;