Moving OnClose event down to PopupWindow

Author: StanleyGoldman

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

@@ -6,16 +6,13 @@ namespace GitHub.Unity
 {
     abstract class BaseWindow :  EditorWindow, IView
     {
-        [NonSerialized] private bool finishCalled = false;
         [NonSerialized] private bool initialized = false;
 
         [NonSerialized] private IApplicationManager cachedManager;
         [NonSerialized] private IRepository cachedRepository;
         [NonSerialized] private bool initializeWasCalled;
         [NonSerialized] private bool inLayout;
 
-        public event Action<bool> OnClose;
-
         public virtual void Initialize(IApplicationManager applicationManager)
         {
             Logger.Trace("Initialize ApplicationManager:{0} Initialized:{1}", applicationManager, initialized);
@@ -50,18 +47,6 @@ public virtual void Refresh()
 
         public virtual void Finish(bool result)
         {
-            finishCalled = true;
-            RaiseOnClose(result);
-        }
-
-        protected virtual void RaiseOnClose(bool result)
-        {
-            OnClose.SafeInvoke(result);
-        }
-
-        protected void ClearOnClose()
-        {
-            OnClose = null;
         }
 
         public virtual void Awake()
@@ -120,10 +105,7 @@ private void OnGUI()
 
         public virtual void OnDestroy()
         {
-            if (!finishCalled)
-            {
-                RaiseOnClose(false);
-            }
+           
         }
 
         public virtual void OnSelectionChange()

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

@@ -12,7 +12,6 @@ interface IView
         Rect Position { get; }
 
         void Finish(bool result);
-        event Action<bool> OnClose;
         IRepository Repository { get; }
         bool HasRepository { get; }
         IApplicationManager Manager { get; }

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

@@ -19,6 +19,8 @@ public enum PopupViewType
         [SerializeField] private AuthenticationView authenticationView;
         [SerializeField] private PublishView publishView;
 
+        public event Action<bool> OnClose;
+
         [MenuItem("GitHub/Authenticate")]
         public static void Launch()
         {
@@ -29,7 +31,7 @@ public static PopupWindow Open(PopupViewType popupViewType, Action<bool> onClose
         {
             var popupWindow = GetWindow<PopupWindow>(true);
 
-            popupWindow.RaiseOnClose(false);
+            popupWindow.OnClose.SafeInvoke(false);
 
             if (onClose != null)
             {
@@ -83,12 +85,6 @@ public override void Refresh()
             ActiveView.Refresh();
         }
 
-        protected override void RaiseOnClose(bool result)
-        {
-            base.RaiseOnClose(result);
-            ClearOnClose();
-        }
-
         public override void OnSelectionChange()
         {
             base.OnSelectionChange();
@@ -97,10 +93,19 @@ public override void OnSelectionChange()
 
         public override void Finish(bool result)
         {
+            OnClose.SafeInvoke(result);
+            OnClose = null;
             Close();
             base.Finish(result);
         }
 
+        public override void OnDestroy()
+        {
+            base.OnDestroy();
+            OnClose.SafeInvoke(false);
+            OnClose = null;
+        }
+
         private Subview ActiveView
         {
             get { return activeView; }

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

@@ -5,8 +5,6 @@ namespace GitHub.Unity
 {
     abstract class Subview : IView
     {
-        public event Action<bool> OnClose;
-
         private const string NullParentError = "Subview parent is null";
 
         public virtual void InitializeView(IView parent)