From 80fcdd3cbe0a0b30cdb2344afef069df65a1fdc1 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 27 Nov 2019 21:23:12 -0400 Subject: [PATCH 1/2] settings search returns ordered results --- src/main/java/carpet/settings/SettingsManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/settings/SettingsManager.java b/src/main/java/carpet/settings/SettingsManager.java index cb21506e..50c6ccbe 100644 --- a/src/main/java/carpet/settings/SettingsManager.java +++ b/src/main/java/carpet/settings/SettingsManager.java @@ -270,7 +270,7 @@ public class SettingsManager if (Sets.newHashSet(rule.description.toLowerCase(Locale.ROOT).split("\\W+")).contains(lcSearch)) return true; // contains full term in description, but case insensitive return false; - }).collect(ImmutableList.toImmutableList()); + }).sorted().collect(ImmutableList.toImmutableList()); } public int printAllRulesToLog(String category) From f3620ddafe2ae84b5cf2d244d8faf04a5dfc5717 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 27 Nov 2019 21:24:05 -0400 Subject: [PATCH 2/2] settings search returns ordered results --- src/main/java/carpet/settings/SettingsManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/carpet/settings/SettingsManager.java b/src/main/java/carpet/settings/SettingsManager.java index 50c6ccbe..d962441e 100644 --- a/src/main/java/carpet/settings/SettingsManager.java +++ b/src/main/java/carpet/settings/SettingsManager.java @@ -259,9 +259,7 @@ public class SettingsManager } } - - - public Collection> getRulesMatching(String search) { + private Collection> getRulesMatching(String search) { String lcSearch = search.toLowerCase(Locale.ROOT); return rules.values().stream().filter(rule -> {