Sort list of rules by name

This commit is contained in:
Ann Priestman 2019-06-10 13:12:13 -04:00
parent 9701ce38fb
commit 5a94e6af39

View File

@ -22,6 +22,8 @@ import java.awt.EventQueue;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -295,8 +297,14 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp
FilesSetDefsPanel.this.copySetButton.setEnabled(canBeEnabled); FilesSetDefsPanel.this.copySetButton.setEnabled(canBeEnabled);
FilesSetDefsPanel.this.exportSetButton.setEnabled(true); FilesSetDefsPanel.this.exportSetButton.setEnabled(true);
// Populate the rule definitions list, sorted by name. // Populate the rule definitions list, sorted by name.
TreeMap<String, FilesSet.Rule> rules = new TreeMap<>(selectedSet.getRules()); List<FilesSet.Rule> rules = new ArrayList<>(selectedSet.getRules().values());
rules.values().forEach((rule) -> { Collections.sort(rules, new Comparator<FilesSet.Rule>() {
@Override
public int compare(FilesSet.Rule rule1, FilesSet.Rule rule2) {
return rule1.toString().compareTo(rule2.toString());
}
});
rules.forEach((rule) -> {
FilesSetDefsPanel.this.rulesListModel.addElement(rule); FilesSetDefsPanel.this.rulesListModel.addElement(rule);
}); });
// Select the first rule by default. // Select the first rule by default.