From 6d1a206cc949a48b07fa4b92a545883f17c70bca Mon Sep 17 00:00:00 2001 From: BlueBlock Date: Fri, 24 Mar 2023 11:51:33 -0400 Subject: [PATCH] code formatting --- .../Initialization/MessageCollectorSetup.cs | 47 +++++++++---------- .../MessageWriters/TextLogMessageWriter.cs | 5 +- mRemoteNG/UI/Menu/msMain/ViewMenu.cs | 2 +- mRemoteNG/UI/Window/ConnectionWindow.cs | 37 +++++---------- 4 files changed, 38 insertions(+), 53 deletions(-) diff --git a/mRemoteNG/App/Initialization/MessageCollectorSetup.cs b/mRemoteNG/App/Initialization/MessageCollectorSetup.cs index 1b8430f76..00602649a 100644 --- a/mRemoteNG/App/Initialization/MessageCollectorSetup.cs +++ b/mRemoteNG/App/Initialization/MessageCollectorSetup.cs @@ -11,15 +11,21 @@ namespace mRemoteNG.App.Initialization [SupportedOSPlatform("windows")] public class MessageCollectorSetup { - public static void SetupMessageCollector(MessageCollector messageCollector, - IList messageWriterList) + public static void SetupMessageCollector(MessageCollector messageCollector, IList messageWriterList) { messageCollector.CollectionChanged += (o, args) => { - var messages = args.NewItems.Cast().ToArray(); + if (args.NewItems == null) return; + + IMessage[] messages = args.NewItems.Cast().ToArray(); + foreach (var printer in messageWriterList) + { foreach (var message in messages) + { printer.Write(message); + } + } }; } @@ -41,37 +47,30 @@ namespace mRemoteNG.App.Initialization private static IMessageWriter BuildTextLogMessageWriter() { return new MessageTypeFilterDecorator( - new LogMessageTypeFilteringOptions(), - new TextLogMessageWriter(Logger.Instance) - ); + new LogMessageTypeFilteringOptions(), + new TextLogMessageWriter(Logger.Instance) + ); } private static IMessageWriter BuildNotificationPanelMessageWriter() { return new OnlyLogMessageFilter( - new MessageTypeFilterDecorator( - new - NotificationPanelMessageFilteringOptions(), - new MessageFocusDecorator( - Windows.ErrorsForm, - new - NotificationPanelSwitchOnMessageFilteringOptions(), - new - NotificationPanelMessageWriter(Windows - .ErrorsForm) - ) - ) - ); + new MessageTypeFilterDecorator( + new NotificationPanelMessageFilteringOptions(), + new MessageFocusDecorator(Windows.ErrorsForm, + new NotificationPanelSwitchOnMessageFilteringOptions(), + new NotificationPanelMessageWriter(Windows.ErrorsForm)) + ) + ); } private static IMessageWriter BuildPopupMessageWriter() { return new OnlyLogMessageFilter( - new MessageTypeFilterDecorator( - new PopupMessageFilteringOptions(), - new PopupMessageWriter() - ) - ); + new MessageTypeFilterDecorator( + new PopupMessageFilteringOptions(), + new PopupMessageWriter()) + ); } } } \ No newline at end of file diff --git a/mRemoteNG/Messages/MessageWriters/TextLogMessageWriter.cs b/mRemoteNG/Messages/MessageWriters/TextLogMessageWriter.cs index da1b89e31..a676b81e7 100644 --- a/mRemoteNG/Messages/MessageWriters/TextLogMessageWriter.cs +++ b/mRemoteNG/Messages/MessageWriters/TextLogMessageWriter.cs @@ -11,10 +11,7 @@ namespace mRemoteNG.Messages.MessageWriters public TextLogMessageWriter(Logger logger) { - if (logger == null) - throw new ArgumentNullException(nameof(logger)); - - _logger = logger; + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); } public void Write(IMessage message) diff --git a/mRemoteNG/UI/Menu/msMain/ViewMenu.cs b/mRemoteNG/UI/Menu/msMain/ViewMenu.cs index 5a0a0be1c..6f1cd3ac0 100644 --- a/mRemoteNG/UI/Menu/msMain/ViewMenu.cs +++ b/mRemoteNG/UI/Menu/msMain/ViewMenu.cs @@ -339,7 +339,7 @@ namespace mRemoteNG.UI.Menu if (!(window is ConnectionWindow connectionWindow)) return; - connectionWindow.reconnectAll(Runtime.ConnectionInitiator); + connectionWindow.ReconnectAll(Runtime.ConnectionInitiator); } } diff --git a/mRemoteNG/UI/Window/ConnectionWindow.cs b/mRemoteNG/UI/Window/ConnectionWindow.cs index 68ec2dfa4..b9d529163 100644 --- a/mRemoteNG/UI/Window/ConnectionWindow.cs +++ b/mRemoteNG/UI/Window/ConnectionWindow.cs @@ -26,7 +26,7 @@ namespace mRemoteNG.UI.Window [SupportedOSPlatform("windows")] public partial class ConnectionWindow : BaseWindow { - private VisualStudioToolStripExtender vsToolStripExtender; + private VisualStudioToolStripExtender _vsToolStripExtender; private readonly ToolStripRenderer _toolStripProfessionalRenderer = new ToolStripProfessionalRenderer(); #region Public Methods @@ -81,8 +81,7 @@ namespace mRemoteNG.UI.Window cmenTabStartChat.Click += (sender, args) => StartChat(); cmenTabTransferFile.Click += (sender, args) => TransferFile(); cmenTabRefreshScreen.Click += (sender, args) => RefreshScreen(); - cmenTabSendSpecialKeysCtrlAltDel.Click += - (sender, args) => SendSpecialKeys(ProtocolVNC.SpecialKeys.CtrlAltDel); + cmenTabSendSpecialKeysCtrlAltDel.Click += (sender, args) => SendSpecialKeys(ProtocolVNC.SpecialKeys.CtrlAltDel); cmenTabSendSpecialKeysCtrlEsc.Click += (sender, args) => SendSpecialKeys(ProtocolVNC.SpecialKeys.CtrlEsc); cmenTabRenameTab.Click += (sender, args) => RenameTab(); cmenTabDuplicateTab.Click += (sender, args) => DuplicateTab(); @@ -151,8 +150,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddExceptionMessage("AddConnectionTab (UI.Window.ConnectionWindow) failed", - ex); + Runtime.MessageCollector.AddExceptionMessage("AddConnectionTab (UI.Window.ConnectionWindow) failed", ex); } return null; @@ -160,7 +158,7 @@ namespace mRemoteNG.UI.Window #endregion - public void reconnectAll(IConnectionInitiator initiator) + public void ReconnectAll(IConnectionInitiator initiator) { var controlList = new List(); try @@ -213,16 +211,14 @@ namespace mRemoteNG.UI.Window Runtime.MessageCollector.AddExceptionMessage("UI.Window.ConnectionWindow.ApplyTheme() failed", ex); } - vsToolStripExtender = new VisualStudioToolStripExtender(components) + _vsToolStripExtender = new VisualStudioToolStripExtender(components) { DefaultRenderer = _toolStripProfessionalRenderer }; - vsToolStripExtender.SetStyle(cmenTab, ThemeManager.getInstance().ActiveTheme.Version, - ThemeManager.getInstance().ActiveTheme.Theme); + _vsToolStripExtender.SetStyle(cmenTab, ThemeManager.getInstance().ActiveTheme.Version, ThemeManager.getInstance().ActiveTheme.Theme); if (!ThemeManager.getInstance().ActiveAndExtended) return; - connDock.DockBackColor = - ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Tab_Item_Background"); + connDock.DockBackColor = ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Tab_Item_Background"); } private bool _documentHandlersAdded; @@ -322,8 +318,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddExceptionMessage("UI.Window.Connection.Connection_FormClosing() failed", - ex); + Runtime.MessageCollector.AddExceptionMessage("UI.Window.Connection.Connection_FormClosing() failed", ex); } } @@ -416,8 +411,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddExceptionMessage("ShowHideMenuButtons (UI.Window.ConnectionWindow) failed", - ex); + Runtime.MessageCollector.AddExceptionMessage("ShowHideMenuButtons (UI.Window.ConnectionWindow) failed", ex); } } @@ -613,15 +607,13 @@ namespace mRemoteNG.UI.Window Image = externalTool.Image ?? Properties.Resources.mRemoteNG_Icon.ToBitmap() }; - nItem.Click += (sender, args) => StartExternalApp(((ToolStripMenuItem)sender).Tag as ExternalTool); + nItem.Click += (sender, args) => StartExternalApp(((ToolStripMenuItem)sender)?.Tag as ExternalTool); cmenTabExternalApps.DropDownItems.Add(nItem); } } catch (Exception ex) { - Runtime.MessageCollector.AddExceptionStackTrace( - "cMenTreeTools_DropDownOpening failed (UI.Window.ConnectionWindow)", - ex); + Runtime.MessageCollector.AddExceptionStackTrace("cMenTreeTools_DropDownOpening failed (UI.Window.ConnectionWindow)", ex); } } @@ -634,9 +626,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddExceptionMessage( - "cmenTabExternalAppsEntry_Click failed (UI.Window.ConnectionWindow)", - ex); + Runtime.MessageCollector.AddExceptionMessage("cmenTabExternalAppsEntry_Click failed (UI.Window.ConnectionWindow)", ex); } } @@ -741,8 +731,7 @@ namespace mRemoteNG.UI.Window var interfaceControl = GetInterfaceControl(); if (interfaceControl == null) { - Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, - "Reconnect (UI.Window.ConnectionWindow) failed. Could not find InterfaceControl."); + Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, "Reconnect (UI.Window.ConnectionWindow) failed. Could not find InterfaceControl."); return; }