Separating GitBranch from ITreeData

Author: StanleyGoldman

src/GitHub.Api/Git/GitBranch.cs

@@ -2,14 +2,8 @@
 
 namespace GitHub.Unity
 {
-    public interface ITreeData
-    {
-        string Name { get; }
-        bool IsActive { get; }
-    }
-
     [Serializable]
-    public struct GitBranch : ITreeData
+    public struct GitBranch
     {
         public static GitBranch Default = new GitBranch();
 

src/GitHub.Api/Git/TreeData.cs

@@ -0,0 +1,26 @@
+using System;
+
+namespace GitHub.Unity
+{
+    public interface ITreeData
+    {
+        string Name { get; }
+        bool IsActive { get; }
+    }
+
+    [Serializable]
+    public struct GitBranchTreeData : ITreeData
+    {
+        public static GitBranchTreeData Default = new GitBranchTreeData(Unity.GitBranch.Default);
+
+        public GitBranch GitBranch;
+
+        public GitBranchTreeData(GitBranch gitBranch)
+        {
+            GitBranch = gitBranch;
+        }
+
+        public string Name => GitBranch.Name;
+        public bool IsActive => GitBranch.IsActive;
+    }
+}

src/GitHub.Api/GitHub.Api.csproj

@@ -106,6 +106,7 @@
     <Compile Include="Git\ManagedCacheExtensions.cs" />
     <Compile Include="Git\Tasks\GitLfsVersionTask.cs" />
     <Compile Include="Git\Tasks\GitVersionTask.cs" />
+    <Compile Include="Git\TreeData.cs" />
     <Compile Include="Git\ValidateGitInstallResult.cs" />
     <Compile Include="Helpers\AssemblyResources.cs" />
     <Compile Include="Authentication\IKeychain.cs" />

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

@@ -151,8 +151,8 @@ private void BuildTree()
             localBranches.Sort(CompareBranches);
             remoteBranches.Sort(CompareBranches);
 
-            treeLocals.Load(localBranches.Cast<ITreeData>(), LocalTitle);
-            treeRemotes.Load(remoteBranches.Cast<ITreeData>(), RemoteTitle);
+            treeLocals.Load(localBranches.Select(branch => (ITreeData) new GitBranchTreeData(branch)), LocalTitle);
+            treeRemotes.Load(remoteBranches.Select(branch => (ITreeData) new GitBranchTreeData(branch)), RemoteTitle);
             Redraw();
         }