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

Move ProjectViewFileNestingService.RULE_COMPARATOR to FileNestingInProjectViewDialog

Browse Source
This commit is contained in:
Alexander Doroshko
2018-11-21 16:36:39 +03:00
parent fd6c866e81
commit d4cbf004f3
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/projectView/impl/FileNestingInProjectViewDialog.java
+4 -2
View File
@@ -24,6 +24,8 @@ import java.util.*;
import java.util.List;
public class FileNestingInProjectViewDialog extends DialogWrapper {
private static final Comparator<NestingRule> RULE_COMPARATOR =
Comparator.comparing(o -> o.getParentFileSuffix() + " " + o.getChildFileSuffix());
private final JBCheckBox myUseNestingRulesCheckBox;
private final JPanel myRulesPanel;
@@ -189,7 +191,7 @@ public class FileNestingInProjectViewDialog extends DialogWrapper {
private void resetTable(@NotNull final List<NestingRule> rules) {
final SortedMap<String, CombinedNestingRule> result = new TreeMap<>();
for (NestingRule rule : ContainerUtil.sorted(rules, ProjectViewFileNestingService.RULE_COMPARATOR)) {
for (NestingRule rule : ContainerUtil.sorted(rules, RULE_COMPARATOR)) {
final CombinedNestingRule r = result.get(rule.getParentFileSuffix());
if (r == null) {
result.put(rule.getParentFileSuffix(), new CombinedNestingRule(rule.getParentFileSuffix(), rule.getChildFileSuffix()));
@@ -206,7 +208,7 @@ public class FileNestingInProjectViewDialog extends DialogWrapper {
useNestingRulesOptionConsumer.consume(myUseNestingRulesCheckBox.isSelected());
if (myUseNestingRulesCheckBox.isSelected()) {
final SortedSet<NestingRule> result = new TreeSet<>(ProjectViewFileNestingService.RULE_COMPARATOR);
final SortedSet<NestingRule> result = new TreeSet<>(RULE_COMPARATOR);
for (CombinedNestingRule rule : myTable.getListTableModel().getItems()) {
for (String childSuffix : StringUtil.split(rule.childSuffixes, ";")) {
if (!StringUtil.isEmptyOrSpaces(childSuffix)) {
platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewFileNestingService.java
-3
View File
@@ -31,9 +31,6 @@ public class ProjectViewFileNestingService implements PersistentStateComponent<P
private static final ExtensionPointName<ProjectViewNestingRulesProvider> EP_NAME =
ExtensionPointName.create("com.intellij.projectViewNestingRulesProvider");
static final Comparator<NestingRule> RULE_COMPARATOR =
Comparator.comparing(o -> o.getParentFileSuffix() + " " + o.getChildFileSuffix());
private MyState myState = new MyState();
private long myModCount;