From e4c539232a74c42bf1a317e9440cb55599c75fd5 Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Wed, 27 Jul 2016 08:56:49 -0400
Subject: [PATCH 1/2] Adding left-to-right markers to children count

---
 .../autopsy/directorytree/DirectoryTreeFilterNode.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java
index a25f7c819e..0ae016bd00 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java
@@ -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
                 }

From 3022fb73e3135a7877ab1f976f513e5b198dc26a Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Mon, 1 Aug 2016 08:56:02 -0400
Subject: [PATCH 2/2] Added left to right codes to display name in Tags and
 ExtractedContent

---
 Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java | 2 +-
 Core/src/org/sleuthkit/autopsy/datamodel/Tags.java             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
index 8a9b31936f..6aac72300a 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
@@ -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
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java b/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
index 16f0ac7084..ac85cd8787 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
@@ -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