Merge remote-tracking branch 'upstream/develop' into encodedFiles

This commit is contained in:
Ann Priestman 2016-08-01 09:58:42 -04:00
commit c2005d2e61
3 changed files with 6 additions and 3 deletions

View File

@ -358,7 +358,7 @@ public class ExtractedContent implements AutopsyVisitableItem {
Logger.getLogger(TypeNode.class.getName())
.log(Level.WARNING, "Error getting child count", ex); //NON-NLS
}
super.setDisplayName(type.getDisplayName() + " (" + childCount + ")");
super.setDisplayName(type.getDisplayName() + " \u200E(\u200E" + childCount + ")\u200E");
}
@Override

View File

@ -244,7 +244,7 @@ public class Tags implements AutopsyVisitableItem {
} catch (TskCoreException ex) {
Logger.getLogger(TagNameNode.class.getName()).log(Level.SEVERE, "Failed to get tags count for " + tagName.getDisplayName() + " tag name", ex); //NON-NLS
}
setDisplayName(tagName.getDisplayName() + " (" + tagsCount + ")");
setDisplayName(tagName.getDisplayName() + " \u200E(\u200E" + tagsCount + ")\u200E");
}
@Override

View File

@ -75,7 +75,10 @@ class DirectoryTreeFilterNode extends FilterNode {
if (file != null) {
try {
final int numChildren = file.getChildrenCount();
name = name + " (" + numChildren + ")";
// left-to-right marks here are necessary to keep the count and parens together
// for mixed right-to-left and left-to-right names
name = name + " \u200E(\u200E" + numChildren + ")\u200E";
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Error getting children count to display for file: " + file, ex); //NON-NLS
}