refactored to support, but did not implement, centralized error state notification #471

Author: rubberduck203

RetailCoder.VBE/Rubberduck.csproj

@@ -290,6 +290,7 @@
       <DependentUpon>AddMarkerForm.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Settings\IAddTodoSettingsView.cs" />
+    <Compile Include="UI\SourceControl\ActionFailedEventArgs.cs" />
     <Compile Include="UI\SourceControl\App.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -406,7 +407,7 @@
     <Compile Include="UI\SourceControl\ICreateBranchView.cs" />
     <Compile Include="UI\SourceControl\IDeleteBranchView.cs" />
     <Compile Include="UI\SourceControl\IMergeView.cs" />
-    <Compile Include="UI\SourceControl\IProviderPresenter.cs" />
+    <Compile Include="UI\SourceControl\ProviderPresenter.cs" />
     <Compile Include="UI\SourceControl\IRefreshableView.cs" />
     <Compile Include="UI\SourceControl\ISettingsView.cs" />
     <Compile Include="UI\SourceControl\ISourceControlView.cs" />

RetailCoder.VBE/UI/SourceControl/ActionFailedEventArgs.cs

@@ -0,0 +1,23 @@
+using System;
+using Rubberduck.SourceControl;
+
+namespace Rubberduck.UI.SourceControl
+{
+    public class ActionFailedEventArgs : EventArgs
+    {
+        private readonly string _message;
+        public string Message { get { return _message; } }
+
+        private readonly string _title;
+        public string Title { get { return _title; } }
+
+        public ActionFailedEventArgs(string title, string message)
+        {
+            _title = title;
+            _message = message;
+        }
+
+        public ActionFailedEventArgs(SourceControlException ex)
+            : this(ex.Message, ex.InnerException.Message) { }
+    }
+}

RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs

@@ -11,15 +11,13 @@ public interface IBranchesPresenter : IProviderPresenter, IRefreshable
         event EventHandler<EventArgs> BranchChanged;
     }
 
-    public class BranchesPresenter : IBranchesPresenter
+    public class BranchesPresenter : ProviderPresenterBase, IBranchesPresenter
     {
         private readonly IBranchesView _view;
         private readonly ICreateBranchView _createView;
         private readonly IDeleteBranchView _deleteView;
         private readonly IMergeView _mergeView;
 
-        public ISourceControlProvider Provider { get; set; }
-
         public event EventHandler<EventArgs> BranchChanged;
 
         public BranchesPresenter
@@ -77,7 +75,10 @@ private void OnSelectedBranchChanged(object sender, EventArgs e)
             catch (SourceControlException ex)
             {
                 //todo: find a better way of displaying these errors
+                //todo: remove messagebox
                 MessageBox.Show(ex.InnerException.Message, ex.Message, MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+                RaiseActionFailedEvent(ex);
             }
 
             if (BranchChanged != null)
@@ -145,7 +146,16 @@ private void OnDeleteViewSelectionChanged(object sender, BranchDeleteArgs e)
         private void OnDeleteBranch(object sender, BranchDeleteArgs e)
         {
             _deleteView.Hide();
-            Provider.DeleteBranch(e.BranchName);
+
+            try
+            {
+                Provider.DeleteBranch(e.BranchName);
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }
+
             RefreshView();
         }
 
@@ -164,7 +174,16 @@ private void OnShowCreateBranchView(object sender, EventArgs e)
         private void OnCreateBranch(object sender, BranchCreateArgs e)
         {
             HideCreateBranchView();
-            this.Provider.CreateBranch(e.BranchName);
+
+            try
+            {
+                this.Provider.CreateBranch(e.BranchName);
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }            
+            
             RefreshView();
         }
 
@@ -211,6 +230,7 @@ private void OnMerge(object sender, EventArgs e)
             {
                 _mergeView.Status = MergeStatus.Failure;
                 _mergeView.StatusText = ex.Message + ": " + ex.InnerException.Message;
+                //todo: raise action failed event?
             }
         }
 

RetailCoder.VBE/UI/SourceControl/ChangesPresenter.cs

@@ -10,12 +10,10 @@ public interface IChangesPresenter : IProviderPresenter, IRefreshable
         void Commit();
     }
 
-    public class ChangesPresenter : IChangesPresenter
+    public class ChangesPresenter : ProviderPresenterBase, IChangesPresenter
     {
         private readonly IChangesView _view;
 
-        public ISourceControlProvider Provider { get; set; }
-
         public ChangesPresenter(IChangesView view)
         {
             _view = view;
@@ -66,18 +64,25 @@ public void Commit()
                 return;
             }
 
-            this.Provider.Stage(changes);
-            this.Provider.Commit(_view.CommitMessage);
-
-            if (_view.CommitAction == CommitAction.CommitAndSync)
+            try
             {
-                this.Provider.Pull();
-                this.Provider.Push();
+                this.Provider.Stage(changes);
+                this.Provider.Commit(_view.CommitMessage);
+
+                if (_view.CommitAction == CommitAction.CommitAndSync)
+                {
+                    this.Provider.Pull();
+                    this.Provider.Push();
+                }
+
+                if (_view.CommitAction == CommitAction.CommitAndPush)
+                {
+                    this.Provider.Push();
+                }
             }
-
-            if (_view.CommitAction == CommitAction.CommitAndPush)
+            catch(SourceControlException ex)
             {
-                this.Provider.Push();
+                RaiseActionFailedEvent(ex);
             }
         }
 

RetailCoder.VBE/UI/SourceControl/IProviderPresenter.cs

@@ -0,0 +1,26 @@
+using System;
+using Rubberduck.SourceControl;
+
+namespace Rubberduck.UI.SourceControl
+{
+    public interface IProviderPresenter
+    {
+        ISourceControlProvider Provider { get; set; }
+        event EventHandler<ActionFailedEventArgs> ActionFailed;
+    }
+
+    public abstract class ProviderPresenterBase : IProviderPresenter
+    {
+        public virtual ISourceControlProvider Provider { get; set; }
+
+        public event EventHandler<ActionFailedEventArgs> ActionFailed;
+        protected virtual void RaiseActionFailedEvent(SourceControlException ex)
+        {
+            var handler = ActionFailed;
+            if (handler != null)
+            {
+                handler(this, new ActionFailedEventArgs(ex));
+            }
+        }
+    }
+}

RetailCoder.VBE/UI/SourceControl/ProviderPresenter.cs

@@ -7,20 +7,17 @@
 
 namespace Rubberduck.UI.SourceControl
 {
-    public interface ISettingsPresenter : IProviderPresenter
+    public interface ISettingsPresenter : IProviderPresenter, IRefreshable
     {
-        void RefreshView();
     }
 
-    public class SettingsPresenter : ISettingsPresenter
+    public class SettingsPresenter : ProviderPresenterBase, ISettingsPresenter
     {
         private readonly ISettingsView _view;
         private readonly IConfigurationService<SourceControlConfiguration> _configurationService;
         private readonly IFolderBrowserFactory _folderBrowserFactory;
         private SourceControlConfiguration _config;
 
-        public ISourceControlProvider Provider { get; set; }
-
         public SettingsPresenter(ISettingsView view, IConfigurationService<SourceControlConfiguration> configService, IFolderBrowserFactory folderBrowserFactory)
         {
             _configurationService = configService;

RetailCoder.VBE/UI/SourceControl/SettingsPresenter.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Rubberduck.SourceControl;
 
 namespace Rubberduck.UI.SourceControl
@@ -11,12 +7,10 @@ public interface IUnsyncedCommitsPresenter : IProviderPresenter, IRefreshable
     {
     }
 
-    public class UnsyncedCommitsPresenter : IUnsyncedCommitsPresenter
+    public class UnsyncedCommitsPresenter : ProviderPresenterBase, IUnsyncedCommitsPresenter
     {
         private readonly IUnsyncedCommitsView _view;
 
-        public ISourceControlProvider Provider { get; set; }
-
         public UnsyncedCommitsPresenter(IUnsyncedCommitsView view)
         {
             _view = view;
@@ -29,24 +23,53 @@ public UnsyncedCommitsPresenter(IUnsyncedCommitsView view)
 
         void OnPush(object sender, EventArgs e)
         {
-            Provider.Push();
+            try
+            {
+                Provider.Push();
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }
         }
 
         void OnPull(object sender, EventArgs e)
         {
-            Provider.Pull();
+            try
+            {
+                Provider.Pull();
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }
         }
 
         void OnFetch(object sender, EventArgs e)
         {
-            Provider.Fetch();
+            try
+            {
+                Provider.Fetch();
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }
+            
             _view.IncomingCommits = Provider.UnsyncedRemoteCommits;
         }
 
         void OnSync(object sender, EventArgs e)
         {
-            Provider.Pull();
-            Provider.Push();
+            try
+            {
+                Provider.Pull();
+                Provider.Push();
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseActionFailedEvent(ex);
+            }
         }
 
         public void RefreshView()