Remove unneeded logging

Author: Hosch250

RetailCoder.VBE/App.cs

@@ -38,7 +38,7 @@ public sealed class App : IDisposable
         private readonly BranchesViewViewModel _branchesVM;
         private readonly SourceControlViewViewModel _sourceControlPanelVM;
 
-        private readonly Logger _logger;
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         private VBProjectsEventsSink _sink;
         private Configuration _config;
@@ -67,7 +67,6 @@ public App(VBE vbe, IMessageBox messageBox,
             _appMenus = appMenus;
             _stateBar = stateBar;
             _hooks = hooks;
-            _logger = LogManager.GetCurrentClassLogger();
 
             var sourceControlPanel = (SourceControlPanel) sourceControlPresenter.Window();
             _sourceControlPanelVM = (SourceControlViewViewModel) sourceControlPanel.ViewModel;
@@ -221,7 +220,7 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
 
             if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
             {
-                _logger.Debug("Locked project '{0}' was removed.", e.Item.Name);
+                Logger.Debug("Locked project '{0}' was removed.", e.Item.Name);
                 return;
             }
 
@@ -235,7 +234,7 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
             _parser.State.RemoveProject(e.Item);
             _parser.State.OnParseRequested(this);
 
-            _logger.Debug("Project '{0}' was removed.", e.Item.Name);
+            Logger.Debug("Project '{0}' was removed.", e.Item.Name);
             Tuple<IConnectionPoint, int> componentsTuple;
             if (_componentsEventsConnectionPoints.TryGetValue(projectId, out componentsTuple))
             {
@@ -261,10 +260,10 @@ async void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
         {
             if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
 
-            _logger.Debug("Project '{0}' was added.", e.Item.Name);
+            Logger.Debug("Project '{0}' was added.", e.Item.Name);
             if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
             {
-                _logger.Debug("Project is protected and will not be added to parser state.");
+                Logger.Debug("Project is protected and will not be added to parser state.");
                 return;
             }
 
@@ -288,7 +287,7 @@ private void RegisterComponentsEventSink(VBComponents components, string project
             if (_componentsEventsSinks.ContainsKey(projectId))
             {
                 // already registered - this is caused by the initial load+rename of a project in the VBE
-                _logger.Debug("Components sink already registered.");
+                Logger.Debug("Components sink already registered.");
                 return;
             }
 
@@ -311,7 +310,7 @@ private void RegisterComponentsEventSink(VBComponents components, string project
             connectionPoint.Advise(componentsSink, out cookie);
 
             _componentsEventsConnectionPoints.Add(projectId, Tuple.Create(connectionPoint, cookie));
-            _logger.Debug("Components sink registered and advising.");
+            Logger.Debug("Components sink registered and advising.");
         }
 
         async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent> e)
@@ -322,9 +321,8 @@ async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent
             {
                 return;
             }
-
-            _logger.Debug("Component '{0}' was selected.", e.Item.Name);
-            // do something?
+            
+            // todo: keep Code Explorer in sync with Project Explorer
         }
 
         async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBComponent> e)
@@ -340,7 +338,7 @@ async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBCom
 
             _sourceControlPanelVM.HandleRenamedComponent(e.Item, e.OldName);
 
-            _logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
+            Logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
 
             var projectId = e.Item.Collection.Parent.HelpFile;
             var componentDeclaration = _parser.State.AllDeclarations.FirstOrDefault(f =>
@@ -359,7 +357,7 @@ async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBCom
                 _referencesEventsSinks.Remove(projectId);
                 _parser.State.RemoveProject(projectId);
 
-                _logger.Debug("Project '{0}' was removed.", e.Item.Name);
+                Logger.Debug("Project '{0}' was removed.", e.Item.Name);
                 Tuple<IConnectionPoint, int> componentsTuple;
                 if (_componentsEventsConnectionPoints.TryGetValue(projectId, out componentsTuple))
                 {
@@ -397,7 +395,7 @@ async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent>
 
             _sourceControlPanelVM.HandleRemovedComponent(e.Item);
 
-            _logger.Debug("Component '{0}' was removed.", e.Item.Name);
+            Logger.Debug("Component '{0}' was removed.", e.Item.Name);
             _parser.State.ClearStateCache(e.Item, true);
         }
 
@@ -411,8 +409,7 @@ async void sink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent
             }
 
             _parser.Cancel(e.Item);
-
-            _logger.Debug("Component '{0}' was reloaded.", e.Item.Name);
+            
             _parser.State.OnParseRequested(sender, e.Item);
         }
 
@@ -427,7 +424,7 @@ async void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e
 
             _sourceControlPanelVM.HandleAddedComponent(e.Item);
 
-            _logger.Debug("Component '{0}' was added.", e.Item.Name);
+            Logger.Debug("Component '{0}' was added.", e.Item.Name);
             _parser.State.OnParseRequested(sender, e.Item);
         }
 
@@ -439,8 +436,7 @@ async void sink_ComponentActivated(object sender, DispatcherEventArgs<VBComponen
             {
                 return;
             }
-
-            _logger.Debug("Component '{0}' was activated.", e.Item.Name);
+            
             // do something?
         }
 
@@ -455,7 +451,7 @@ async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProje
 
             _parser.Cancel();
 
-            _logger.Debug("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);
+            Logger.Debug("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);
 
             _parser.State.RemoveProject(e.Item.HelpFile);
             _parser.State.AddProject(e.Item);
@@ -471,9 +467,8 @@ async void sink_ProjectActivated(object sender, DispatcherEventArgs<VBProject> e
             {
                 return;
             }
-
-            _logger.Debug("Project '{0}' was activated.", e.Item.Name);
-            // do something?
+            
+            // todo: keep Code Explorer in sync with Project Explorer
         }
         #endregion
 
@@ -485,13 +480,12 @@ private void _stateBar_Refresh(object sender, EventArgs e)
 
         private void Parser_StateChanged(object sender, EventArgs e)
         {
-            _logger.Debug("App handles StateChanged ({0}), evaluating menu states...", _parser.State.Status);
+            Logger.Debug("App handles StateChanged ({0}), evaluating menu states...", _parser.State.Status);
             _appMenus.EvaluateCanExecute(_parser.State);
         }
 
         private void LoadConfig()
         {
-            _logger.Debug("Loading configuration");
             _config = _configService.LoadConfiguration();
 
             var currentCulture = RubberduckUI.Culture;
@@ -502,7 +496,7 @@ private void LoadConfig()
             }
             catch (CultureNotFoundException exception)
             {
-                _logger.Error(exception, "Error Setting Culture for Rubberduck");
+                Logger.Error(exception, "Error Setting Culture for Rubberduck");
                 _messageBox.Show(exception.Message, "Rubberduck", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 _config.UserSettings.GeneralSettings.Language.Code = currentCulture.Name;
                 _configService.SaveConfiguration(_config);

RetailCoder.VBE/Common/Hotkeys/Hotkey.cs

@@ -4,6 +4,7 @@
 using System.Windows.Input;
 using Rubberduck.Common.WinAPI;
 using NLog;
+using Rubberduck.UI;
 using Rubberduck.UI.Command;
 
 namespace Rubberduck.Common.Hotkeys
@@ -13,7 +14,7 @@ public class Hotkey : IHotkey
         private readonly string _key;
         private readonly ICommand _command;
         private readonly IntPtr _hWndVbe;
-        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public Hotkey(IntPtr hWndVbe, string key, ICommand command, Keys secondKey = Keys.None)
         {
@@ -86,14 +87,11 @@ private void HookKey(Keys key, uint shift)
             var success = User32.RegisterHotKey(_hWndVbe, hookId, shift, (uint)key);
             if (!success)
             {
-                _logger.Debug(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered, key);
-                //throw new Win32Exception(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered, key);
+                Logger.Debug(RubberduckUI.CommonHotkey_KeyNotRegistered, key);
             }
 
             HotkeyInfo = new HotkeyInfo(hookId, Combo);
             IsAttached = true;
-
-            _logger.Debug("Hotkey '{0}' hooked successfully to command '{1}'", Key, Command.GetType());  //no translation needed for Debug.Writeline
         }
 
         private void SetCommandShortcutText()

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -29,7 +29,7 @@ public class RubberduckHooks : IRubberduckHooks
         private readonly IEnumerable<ICommand> _commands;
         private readonly IList<IAttachable> _hooks = new List<IAttachable>();
         private readonly IDictionary<RubberduckHotkey, ICommand> _mappings;
-        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public RubberduckHooks(VBE vbe, IGeneralConfigService config, IEnumerable<ICommand> commands)
         {
@@ -160,7 +160,7 @@ public void Attach()
             }
             catch (Win32Exception exception)
             {
-                _logger.Error(exception);
+                Logger.Error(exception);
             }
         }
 
@@ -181,7 +181,7 @@ public void Detach()
             }
             catch (Win32Exception exception)
             {
-                _logger.Error(exception);
+                Logger.Error(exception);
             }
             IsAttached = false;
         }
@@ -197,12 +197,10 @@ private void hook_MessageReceived(object sender, HookEventArgs e)
             var hotkey = sender as IHotkey;
             if (hotkey != null)
             {
-                _logger.Debug("Hotkey message received");
                 hotkey.Command.Execute(null);
                 return;
             }
-
-            _logger.Debug("Unknown message received");
+            
             OnMessageReceived(sender, e);
         }
 
@@ -227,7 +225,7 @@ private IntPtr WindowProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam)
             }
             catch (Exception exception)
             {
-                _logger.Error(exception);
+                Logger.Error(exception);
             }
 
             return IntPtr.Zero;
@@ -250,7 +248,7 @@ private bool HandleHotkeyMessage(IntPtr wParam)
             }
             catch (Exception exception)
             {
-                _logger.Error(exception);
+                Logger.Error(exception);
             }
             return processed;
         }

RetailCoder.VBE/Common/WinAPI/RawInput.cs

@@ -11,7 +11,7 @@ public class RawInput : NativeWindow
     {
         static readonly Guid DeviceInterfaceHid = new Guid("4D1E55B2-F16F-11CF-88CB-001111000030");
         private readonly List<IRawDevice> _devices;
-        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public RawInput(IntPtr parentHandle)
         {
@@ -47,7 +47,7 @@ protected override void WndProc(ref Message message)
                         if (dwSize != res)
                         {
                             var ex = new Win32Exception(Marshal.GetLastWin32Error());
-                            _logger.Error(ex, "Error getting the rawinput buffer: {0}", ex.Message);
+                            Logger.Error(ex, "Error getting the rawinput buffer: {0}", ex.Message);
                             return;
                         }
                         foreach (var device in _devices)

RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs

@@ -19,7 +19,7 @@ public class ExtractInterfaceRefactoring : IRefactoring
         private readonly IMessageBox _messageBox;
         private readonly IRefactoringPresenterFactory<ExtractInterfacePresenter> _factory;
         private ExtractInterfaceModel _model;
-        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public ExtractInterfaceRefactoring(VBE vbe, RubberduckParserState state, IMessageBox messageBox, IRefactoringPresenterFactory<ExtractInterfacePresenter> factory)
         {
@@ -81,13 +81,11 @@ private void AddInterface()
         private int _insertionLine;
         private void _state_StateChanged(object sender, EventArgs e)
         {
-            _logger.Debug("ExtractInterfaceRefactoring handles StateChanged...");
             if (_state.Status != ParserState.Ready)
             {
                 return;
             }
-
-            _logger.Debug("Implementing extracted interface...");
+            
             var qualifiedSelection = new QualifiedSelection(_model.TargetDeclaration.QualifiedSelection.QualifiedName, new Selection(_insertionLine, 1, _insertionLine, 1));
             _vbe.ActiveCodePane.CodeModule.SetSelection(qualifiedSelection);
 

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -49,8 +49,6 @@ public class RubberduckModule : NinjectModule
         private const int MsForms = 17;
         private const int MsFormsControl = 18;
 
-        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
-
         public RubberduckModule(VBE vbe, AddIn addin)
         {
             _vbe = vbe;
@@ -59,8 +57,6 @@ public RubberduckModule(VBE vbe, AddIn addin)
 
         public override void Load()
         {
-            _logger.Debug("in RubberduckModule.Load()");
-
             // bind VBE and AddIn dependencies to host-provided instances.
             Bind<VBE>().ToConstant(_vbe);
             Bind<AddIn>().ToConstant(_addin);
@@ -149,7 +145,6 @@ public override void Load()
             ConfigureProjectExplorerContextMenu();
 
             BindWindowsHooks();
-            _logger.Debug("completed RubberduckModule.Load()");
         }
 
         private void BindWindowsHooks()

RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

@@ -17,7 +17,7 @@ public abstract class ParentMenuItemBase : IParentMenuItem
         private readonly string _key;
         private readonly int? _beforeIndex;
         private readonly IDictionary<IMenuItem, CommandBarControl> _items;
-        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         protected ParentMenuItemBase(string key, IEnumerable<IMenuItem> items, int? beforeIndex = null)
         {
@@ -78,8 +78,6 @@ public void Initialize()
                 _items[item] = InitializeChildControl(item as ICommandMenuItem)
                             ?? InitializeChildControl(item as IParentMenuItem);
             }
-
-            _logger.Debug("'{0}' ({1}) parent menu initialized, hash code {2}.", _key, GetHashCode(), Item.GetHashCode());
         }
 
         public void RemoveChildren()
@@ -144,9 +142,7 @@ private CommandBarControl InitializeChildControl(ICommandMenuItem item)
             var command = item.Command as CommandBase; // todo: add 'ShortcutText' to a new 'interface ICommand : System.Windows.Input.ICommand'
             child.ShortcutText = command != null
                 ? command.ShortcutText
-                : string.Empty; 
-
-            _logger.Debug("Menu item '{0}' created; hash code: {1} (command hash code {2})", child.Caption, child.GetHashCode(), item.Command.GetHashCode());
+                : string.Empty;
 
             child.Click += child_Click;
             return child;
@@ -167,7 +163,7 @@ private void child_Click(CommandBarButton Ctrl, ref bool CancelDefault)
             // hash code is different on every frakkin' click. go figure. I've had it, this is the fix.
             _lastHashCode = Ctrl.GetHashCode();
 
-            _logger.Debug("({0}) Executing click handler for menu item '{1}', hash code {2}", GetHashCode(), Ctrl.Caption, Ctrl.GetHashCode());
+            Logger.Debug("({0}) Executing click handler for menu item '{1}', hash code {2}", GetHashCode(), Ctrl.Caption, Ctrl.GetHashCode());
             item.Command.Execute(null);
         }
 
@@ -189,7 +185,7 @@ public static void SetButtonImage(CommandBarButton button, Image image, Image ma
             }
             catch (COMException exception)
             {
-                _logger.Debug("Button image could not be set for button [" + button.Caption + "]\n" + exception);
+                Logger.Debug("Button image could not be set for button [" + button.Caption + "]\n" + exception);
             }
         }