Rename Name to Path

Author: StanleyGoldman

src/GitHub.Api/Git/TreeData.cs

@@ -4,7 +4,8 @@ namespace GitHub.Unity
 {
     public interface ITreeData
     {
-        string Name { get; }
+        string FullPath { get; }
+        string Path { get; }
         bool IsActive { get; }
     }
 
@@ -20,7 +21,8 @@ public GitBranchTreeData(GitBranch gitBranch)
             GitBranch = gitBranch;
         }
 
-        public string Name => GitBranch.Name;
+        public string FullPath => GitBranch.Name;
+        public string Path => GitBranch.Name;
         public bool IsActive => GitBranch.IsActive;
     }
 }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs

@@ -179,7 +179,7 @@ private void OnButtonBarGUI()
                 {
                     if (GUILayout.Button(DeleteBranchButton, EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
                     {
-                        DeleteLocalBranch(treeLocals.SelectedNode.Name);
+                        DeleteLocalBranch(treeLocals.SelectedNode.Path);
                     }
                 }
                 EditorGUI.EndDisabledGroup();
@@ -245,7 +245,7 @@ private void OnButtonBarGUI()
                     // Effectuate create
                     if (createBranch)
                     {
-                        GitClient.CreateBranch(newBranchName, treeLocals.SelectedNode.Name)
+                        GitClient.CreateBranch(newBranchName, treeLocals.SelectedNode.Path)
                             .FinallyInUI((success, e) =>
                             {
                                 if (success)
@@ -299,7 +299,7 @@ private void OnTreeGUI(Rect rect)
                     if (node.IsFolder)
                         return;
 
-                    SwitchBranch(node.Name);
+                    SwitchBranch(node.Path);
                 },
                 node => {
                     if (node.IsFolder)
@@ -327,7 +327,7 @@ private void OnTreeGUI(Rect rect)
                     if (node.IsFolder)
                         return;
 
-                    CheckoutRemoteBranch(node.Name);
+                    CheckoutRemoteBranch(node.Path);
                 },
                 node => {
                     if (node.IsFolder)
@@ -364,11 +364,11 @@ private GenericMenu CreateContextMenuForLocalBranchNode(TreeNode node)
             else
             {
                 genericMenu.AddItem(deleteGuiContent, false, () => {
-                    DeleteLocalBranch(node.Name);
+                    DeleteLocalBranch(node.Path);
                 });
 
                 genericMenu.AddItem(switchGuiContent, false, () => {
-                    SwitchBranch(node.Name);
+                    SwitchBranch(node.Path);
                 });
             }
 
@@ -382,7 +382,7 @@ private GenericMenu CreateContextMenuForRemoteBranchNode(TreeNode node)
             var checkoutGuiContent = new GUIContent(CheckoutBranchContextMenuLabel);
 
             genericMenu.AddItem(checkoutGuiContent, false, () => {
-                CheckoutRemoteBranch(node.Name);
+                CheckoutRemoteBranch(node.Path);
             });
 
             return genericMenu;

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

@@ -35,14 +35,14 @@ public abstract class Tree
 
         [NonSerialized] private Stack<bool> indents = new Stack<bool>();
 
-        public bool IsInitialized { get { return nodes != null && nodes.Count > 0 && !String.IsNullOrEmpty(nodes[0].Name); } }
+        public bool IsInitialized { get { return nodes != null && nodes.Count > 0 && !String.IsNullOrEmpty(nodes[0].Path); } }
         public bool RequiresRepaint { get; private set; }
 
         public TreeNode SelectedNode
         {
             get
             {
-                if (selectedNode != null && String.IsNullOrEmpty(selectedNode.Name))
+                if (selectedNode != null && String.IsNullOrEmpty(selectedNode.Path))
                     selectedNode = null;
                 return selectedNode;
             }
@@ -66,7 +66,7 @@ public void Load(IEnumerable<ITreeData> data, string title)
 
             var titleNode = new TreeNode()
             {
-                Name = title,
+                Path = title,
                 Label = title,
                 Level = -1 + displayRootLevel,
                 IsFolder = true,
@@ -80,29 +80,30 @@ public void Load(IEnumerable<ITreeData> data, string title)
 
             foreach (var d in data)
             {
-                var fullName = d.Name;
+                var path = d.Path;
                 if (PathIgnoreRoot != null)
                 {
-                    var indexOf = fullName.IndexOf(PathIgnoreRoot);
+                    var indexOf = path.IndexOf(PathIgnoreRoot);
                     if (indexOf != -1)
                     {
-                        fullName = fullName.Substring(indexOf + PathIgnoreRoot.Length);
+                        path = path.Substring(indexOf + PathIgnoreRoot.Length);
                     }
                 }
 
-                var parts = fullName.Split(new [] {PathSeparator}, StringSplitOptions.None);
+                var parts = path.Split(new [] {PathSeparator}, StringSplitOptions.None);
                 for (int i = 0; i < parts.Length; i++)
                 {
                     var label = parts[i];
                     var level = i + 1;
-                    var name = String.Join(PathSeparator, parts, 0, level);
+                    var nodePath = String.Join(PathSeparator, parts, 0, level);
                     var isFolder = i < parts.Length - 1;
-                    var alreadyExists = folders.ContainsKey(name);
+                    var alreadyExists = folders.ContainsKey(nodePath);
                     if (!alreadyExists)
                     {
                         var node = new TreeNode
                         {
-                            Name = name,
+                            FullPath = d.FullPath,
+                            Path = nodePath,
                             IsActive = d.IsActive,
                             Label = label,
                             Level = i + displayRootLevel,
@@ -132,7 +133,7 @@ public void Load(IEnumerable<ITreeData> data, string title)
                         nodes.Add(node);
                         if (isFolder)
                         {
-                            if (collapsedFolders.Contains(name))
+                            if (collapsedFolders.Contains(nodePath))
                             {
                                 node.IsCollapsed = true;
 
@@ -143,7 +144,7 @@ public void Load(IEnumerable<ITreeData> data, string title)
                                 }
                             }
 
-                            folders.Add(name, node);
+                            folders.Add(nodePath, node);
                         }
                     }
                 }
@@ -441,7 +442,8 @@ protected void LoadNodeIcons()
     [Serializable]
     public class TreeNode
     {
-        public string Name;
+        public string FullPath;
+        public string Path;
         public string Label;
         public int Level;
         public bool IsFolder;
@@ -555,8 +557,8 @@ public TreeNodeRenderResult Render(Rect rect, float indentation, bool isSelected
 
         public override string ToString()
         {
-            return String.Format("name:{0} label:{1} level:{2} isFolder:{3} isCollapsed:{4} isHidden:{5} isActive:{6}",
-                Name, Label, Level, IsFolder, IsCollapsed, IsHidden, IsActive);
+            return String.Format("path:{0} label:{1} level:{2} isFolder:{3} isCollapsed:{4} isHidden:{5} isActive:{6}",
+                Path, Label, Level, IsFolder, IsCollapsed, IsHidden, IsActive);
         }
     }