Some code cleanup

Author: StanleyGoldman

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

@@ -333,11 +333,50 @@ private void OnTreeGUI(Rect rect)
             GUILayout.Space(rect.y - initialRect.y);
         }
 
-        private void CheckoutRemoteBranch(string selectedNodeName)
+        private GenericMenu CreateContextMenuForLocalBranchNode(TreeNode node)
+        {
+            var genericMenu = new GenericMenu();
+
+            var deleteGuiContent = new GUIContent("Delete");
+            var switchGuiContent = new GUIContent("Switch");
+
+            if (node.IsActive)
+            {
+                genericMenu.AddDisabledItem(deleteGuiContent);
+                genericMenu.AddDisabledItem(switchGuiContent);
+            }
+            else
+            {
+                genericMenu.AddItem(deleteGuiContent, false, () => {
+                    DeleteLocalBranch(node.Name);
+                });
+
+                genericMenu.AddItem(switchGuiContent, false, () => {
+                    SwitchBranch(node.Name);
+                });
+            }
+
+            return genericMenu;
+        }
+
+        private GenericMenu CreateContextMenuForRemoteBranchNode(TreeNode node)
+        {
+            var genericMenu = new GenericMenu();
+
+            var checkoutGuiContent = new GUIContent("Checkout");
+            
+            genericMenu.AddItem(checkoutGuiContent, false, () => {
+                CheckoutRemoteBranch(node.Name);
+            });
+            
+            return genericMenu;
+        }
+
+        private void CheckoutRemoteBranch(string branch)
         {
-            var indexOfFirstSlash = selectedNodeName.IndexOf('/');
-            var originName = selectedNodeName.Substring(0, indexOfFirstSlash);
-            var branchName = selectedNodeName.Substring(indexOfFirstSlash + 1);
+            var indexOfFirstSlash = branch.IndexOf('/');
+            var originName = branch.Substring(0, indexOfFirstSlash);
+            var branchName = branch.Substring(indexOfFirstSlash + 1);
 
             if (Repository.LocalBranches.Any(localBranch => localBranch.Name == branchName))
             {
@@ -347,93 +386,54 @@ private void CheckoutRemoteBranch(string selectedNodeName)
             else
             {
                 var confirmCheckout = EditorUtility.DisplayDialog(ConfirmCheckoutBranchTitle,
-                    String.Format(ConfirmCheckoutBranchMessage, selectedNodeName, originName), ConfirmCheckoutBranchOK,
+                    String.Format(ConfirmCheckoutBranchMessage, branch, originName), ConfirmCheckoutBranchOK,
                     ConfirmCheckoutBranchCancel);
 
                 if (confirmCheckout)
                 {
-                    GitClient.CreateBranch(branchName, selectedNodeName).FinallyInUI((success, e) => {
+                    GitClient.CreateBranch(branchName, branch).FinallyInUI((success, e) => {
                         if (success)
                         {
                             Redraw();
                         }
                         else
                         {
                             EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
-                                String.Format(Localization.SwitchBranchFailedDescription, selectedNodeName), Localization.Ok);
+                                String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);
                         }
                     }).Start();
                 }
             }
         }
 
-        private GenericMenu CreateContextMenuForLocalBranchNode(TreeNode node)
+        private void SwitchBranch(string branch)
         {
-            var genericMenu = new GenericMenu();
-
-            var deleteGuiContent = new GUIContent("Delete");
-            var switchGuiContent = new GUIContent("Switch");
-
-            if (node.IsActive)
-            {
-                genericMenu.AddDisabledItem(deleteGuiContent);
-                genericMenu.AddDisabledItem(switchGuiContent);
-            }
-            else
-            {
-                genericMenu.AddItem(deleteGuiContent, false, () => {
-                    DeleteLocalBranch(node.Name);
-                });
-
-                genericMenu.AddItem(switchGuiContent, false, () => {
-                    SwitchBranch(node.Name);
-                });
-            }
-
-            return genericMenu;
-        }
-
-        private void SwitchBranch(string branchName)
-        {
-            if (EditorUtility.DisplayDialog(ConfirmSwitchTitle, String.Format(ConfirmSwitchMessage, branchName), ConfirmSwitchOK,
+            if (EditorUtility.DisplayDialog(ConfirmSwitchTitle, String.Format(ConfirmSwitchMessage, branch), ConfirmSwitchOK,
                 ConfirmSwitchCancel))
             {
-                GitClient.SwitchBranch(branchName).FinallyInUI((success, e) => {
+                GitClient.SwitchBranch(branch).FinallyInUI((success, e) => {
                     if (success)
                     {
                         Redraw();
                     }
                     else
                     {
                         EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
-                            String.Format(Localization.SwitchBranchFailedDescription, branchName), Localization.Ok);
+                            String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);
                     }
                 }).Start();
             }
         }
 
-        private void DeleteLocalBranch(string branchName)
+        private void DeleteLocalBranch(string branch)
         {
-            var dialogMessage = string.Format(DeleteBranchMessageFormatString, branchName);
+            var dialogMessage = string.Format(DeleteBranchMessageFormatString, branch);
             if (EditorUtility.DisplayDialog(DeleteBranchTitle, dialogMessage, DeleteBranchButton, CancelButtonLabel))
             {
-                GitClient.DeleteBranch(branchName, true).Start();
+                GitClient.DeleteBranch(branch, true).Start();
             }
         }
 
-        private GenericMenu CreateContextMenuForRemoteBranchNode(TreeNode node)
-        {
-            var genericMenu = new GenericMenu();
-
-            var checkoutGuiContent = new GUIContent("Checkout");
-            
-            genericMenu.AddItem(checkoutGuiContent, false, () => {
-                CheckoutRemoteBranch(node.Name);
-            });
-            
-            return genericMenu;
-        }
-
         private int CompareBranches(GitBranch a, GitBranch b)
         {
             if (a.Name.Equals("master"))