Merge pull request #5930 from kellykelly3/1472-Tags-menu-order-correction

1472 - Put Tag nodes into alphabetical order
This commit is contained in:
Richard Cordovano 2020-06-02 15:16:50 -04:00 committed by GitHub
commit 90b16ace67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.datamodel;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.Collections;
import java.util.Comparator;
import java.util.EnumSet;
import java.util.List;
import java.util.Observable;
@ -252,7 +253,12 @@ public class Tags implements AutopsyVisitableItem {
? Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse(filteringDSObjId)
: Case.getCurrentCaseThrows().getServices().getTagsManager().getTagNamesInUse();
}
Collections.sort(tagNamesInUse);
Collections.sort(tagNamesInUse, new Comparator<TagName>() {
@Override
public int compare(TagName o1, TagName o2) {
return TagUtils.getDecoratedTagDisplayName(o1).compareTo(TagUtils.getDecoratedTagDisplayName(o2));
}
});
keys.addAll(tagNamesInUse);
} catch (TskCoreException | NoCurrentCaseException ex) {
Logger.getLogger(TagNameNodeFactory.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex); //NON-NLS