Conslidating icon update logic

Author: StanleyGoldman

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

@@ -156,65 +156,14 @@ private void BuildTree()
 
         private void UpdateTreeIcons()
         {
-            var localsLoaded = false;
-            var remotesLoaded = false;
-
             if (treeLocals != null)
             {
-                if (treeLocals.ActiveNodeIcon == null)
-                {
-                    localsLoaded = true;
-                    treeLocals.ActiveNodeIcon = Styles.ActiveBranchIcon;
-                }
-
-                if (treeLocals.NodeIcon == null)
-                {
-                    localsLoaded = true;
-                    treeLocals.NodeIcon = Styles.BranchIcon;
-                }
-
-                if (treeLocals.FolderIcon == null)
-                {
-                    localsLoaded = true;
-                    treeLocals.FolderIcon = Styles.FolderIcon;
-                }
+                treeLocals.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.RootFolderIcon);
             }
 
             if (treeRemotes != null)
             {
-                if (treeRemotes.ActiveNodeIcon == null)
-                {
-                    remotesLoaded = true;
-                    treeRemotes.ActiveNodeIcon = Styles.ActiveBranchIcon;
-                }
-
-                if (treeRemotes.NodeIcon == null)
-                {
-                    remotesLoaded = true;
-                    treeRemotes.NodeIcon = Styles.BranchIcon;
-                }
-
-                if (treeRemotes.RootFolderIcon == null)
-                {
-                    remotesLoaded = true;
-                    treeRemotes.RootFolderIcon = Styles.RootFolderIcon;
-                }
-
-                if (treeRemotes.FolderIcon == null)
-                {
-                    remotesLoaded = true;
-                    treeRemotes.FolderIcon = Styles.FolderIcon;
-                }
-            }
-
-            if (localsLoaded)
-            {
-                treeLocals.LoadNodeIcons();
-            }
-
-            if (remotesLoaded)
-            {
-                treeRemotes.LoadNodeIcons();
+                treeRemotes.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.RootFolderIcon);
             }
         }
 

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

@@ -36,6 +36,40 @@ protected override Texture2D GetNodeIcon(TreeNode node)
             }
             return nodeIcon;
         }
+
+        public void UpdateIcons(Texture2D activeBranchIcon, Texture2D branchIcon, Texture2D folderIcon, Texture2D rootFolderIcon)
+        {
+            var localsLoaded = false;
+
+            if (ActiveNodeIcon == null)
+            {
+                localsLoaded = true;
+                ActiveNodeIcon = activeBranchIcon;
+            }
+
+            if (NodeIcon == null)
+            {
+                localsLoaded = true;
+                NodeIcon = branchIcon;
+            }
+
+            if (FolderIcon == null)
+            {
+                localsLoaded = true;
+                FolderIcon = folderIcon;
+            }
+
+            if (RootFolderIcon == null)
+            {
+                localsLoaded = true;
+                RootFolderIcon = rootFolderIcon;
+            }
+
+            if (localsLoaded)
+            {
+                LoadNodeIcons();
+            }
+        }
     }
 
     [Serializable]
@@ -402,7 +436,7 @@ private void SetNodeIcon(TreeNode node)
 
         protected abstract Texture2D GetNodeIcon(TreeNode node);
 
-        public void LoadNodeIcons()
+        protected void LoadNodeIcons()
         {
             foreach (var treeNode in nodes)
             {