From 2cf5a4317d0cbd61c2135aa8f7ab608db2d88629 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Sun, 27 Sep 2020 15:11:29 +0200 Subject: [PATCH] fixed syntax style inconsistencies --- .../MSSqlDatabaseConnector.cs | 5 +-- .../MySqlDatabaseConnector.cs | 5 +-- .../Putty/AbstractPuttySessionsProvider.cs | 5 +-- .../Config/Putty/PuttySessionsManager.cs | 10 +---- .../Connection/AbstractConnectionRecord.cs | 4 +- mRemoteNG/Connection/Protocol/ProtocolList.cs | 5 +-- mRemoteNG/Connection/Protocol/PuttyBase.cs | 5 +-- .../Connection/Protocol/RDP/RdpProtocol6.cs | 10 +---- .../Protocol/VNC/Connection.Protocol.VNC.cs | 6 +-- mRemoteNG/Container/ContainerInfo.cs | 2 +- mRemoteNG/Credential/CredentialRecord.cs | 8 ++-- .../CredentialRepositoryConfig.cs | 10 ++--- .../LogMessageTypeFilteringOptions.cs | 16 ++++---- ...otificationPanelMessageFilteringOptions.cs | 16 ++++---- ...ionPanelSwitchOnMessageFilteringOptions.cs | 14 +++---- .../PopupMessageFilteringOptions.cs | 16 ++++---- .../Tools/Cmdline/CmdArgumentsInterpreter.cs | 5 +-- .../FullyObservableCollection.cs | 4 +- mRemoteNG/Tools/ExternalTool.cs | 38 ++++++++----------- mRemoteNG/Tools/PropertyGridCommandSite.cs | 19 +++------- mRemoteNG/Tools/ScanHost.cs | 35 ++++------------- mRemoteNG/Tools/Tools.LocalizedAttributes.cs | 5 +-- mRemoteNG/Tools/Tools.WindowPlacement.cs | 4 +- .../Tree/Root/RootPuttySessionsNodeInfo.cs | 11 ++---- .../UI/Controls/CredentialRecordListView.cs | 2 +- .../Controls/CredentialRepositoryListView.cs | 2 +- .../Controls/NewPasswordWithVerification.cs | 4 +- mRemoteNG/UI/Controls/QuickConnectComboBox.cs | 14 ++----- .../UI/Controls/mrngToolStripSplitButton.cs | 2 +- mRemoteNG/UI/TaskDialog/CommandButton.cs | 4 +- mRemoteNGTests/ListViewTester.cs | 32 ++-------------- 31 files changed, 108 insertions(+), 210 deletions(-) diff --git a/mRemoteNG/Config/DatabaseConnectors/MSSqlDatabaseConnector.cs b/mRemoteNG/Config/DatabaseConnectors/MSSqlDatabaseConnector.cs index 19019357..f35e78ee 100644 --- a/mRemoteNG/Config/DatabaseConnectors/MSSqlDatabaseConnector.cs +++ b/mRemoteNG/Config/DatabaseConnectors/MSSqlDatabaseConnector.cs @@ -26,10 +26,7 @@ namespace mRemoteNG.Config.DatabaseConnectors return new SqlCommand(dbCommand, (SqlConnection) _dbConnection); } - public bool IsConnected - { - get { return (_dbConnection.State == ConnectionState.Open); } - } + public bool IsConnected => (_dbConnection.State == ConnectionState.Open); public MSSqlDatabaseConnector(string sqlServer, string catalog, string username, string password) { diff --git a/mRemoteNG/Config/DatabaseConnectors/MySqlDatabaseConnector.cs b/mRemoteNG/Config/DatabaseConnectors/MySqlDatabaseConnector.cs index 9275dc3e..a4a29a77 100644 --- a/mRemoteNG/Config/DatabaseConnectors/MySqlDatabaseConnector.cs +++ b/mRemoteNG/Config/DatabaseConnectors/MySqlDatabaseConnector.cs @@ -27,10 +27,7 @@ namespace mRemoteNG.Config.DatabaseConnectors return new MySqlCommand(dbCommand, (MySqlConnection) _dbConnection); } - public bool IsConnected - { - get { return (_dbConnection.State == ConnectionState.Open); } - } + public bool IsConnected => (_dbConnection.State == ConnectionState.Open); public MySqlDatabaseConnector(string host, string database, string username, string password) { diff --git a/mRemoteNG/Config/Putty/AbstractPuttySessionsProvider.cs b/mRemoteNG/Config/Putty/AbstractPuttySessionsProvider.cs index 88c634a1..c6efb46d 100644 --- a/mRemoteNG/Config/Putty/AbstractPuttySessionsProvider.cs +++ b/mRemoteNG/Config/Putty/AbstractPuttySessionsProvider.cs @@ -13,10 +13,7 @@ namespace mRemoteNG.Config.Putty { public virtual RootPuttySessionsNodeInfo RootInfo { get; } = new RootPuttySessionsNodeInfo(); - protected virtual List Sessions - { - get { return RootInfo.Children.OfType().ToList(); } - } + protected virtual List Sessions => RootInfo.Children.OfType().ToList(); #region Public Methods diff --git a/mRemoteNG/Config/Putty/PuttySessionsManager.cs b/mRemoteNG/Config/Putty/PuttySessionsManager.cs index 739c8590..e937e412 100644 --- a/mRemoteNG/Config/Putty/PuttySessionsManager.cs +++ b/mRemoteNG/Config/Putty/PuttySessionsManager.cs @@ -14,10 +14,7 @@ namespace mRemoteNG.Config.Putty private readonly List _providers = new List(); - public IEnumerable Providers - { - get { return _providers; } - } + public IEnumerable Providers => _providers; public List RootPuttySessionsNodes { get; } = new List(); @@ -134,10 +131,7 @@ namespace mRemoteNG.Config.Putty public class SessionList : StringConverter { - public static string[] Names - { - get { return Instance.GetSessionNames(); } - } + public static string[] Names => Instance.GetSessionNames(); public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context) { diff --git a/mRemoteNG/Connection/AbstractConnectionRecord.cs b/mRemoteNG/Connection/AbstractConnectionRecord.cs index 15d9fb6f..02af6fff 100644 --- a/mRemoteNG/Connection/AbstractConnectionRecord.cs +++ b/mRemoteNG/Connection/AbstractConnectionRecord.cs @@ -616,8 +616,8 @@ namespace mRemoteNG.Connection AttributeUsedInProtocol(ProtocolType.RDP)] public bool RedirectClipboard { - get { return GetPropertyValue("RedirectClipboard", _redirectClipboard); } - set { SetField(ref _redirectClipboard, value, "RedirectClipboard"); } + get => GetPropertyValue("RedirectClipboard", _redirectClipboard); + set => SetField(ref _redirectClipboard, value, "RedirectClipboard"); } diff --git a/mRemoteNG/Connection/Protocol/ProtocolList.cs b/mRemoteNG/Connection/Protocol/ProtocolList.cs index 0edbe325..27d8b214 100644 --- a/mRemoteNG/Connection/Protocol/ProtocolList.cs +++ b/mRemoteNG/Connection/Protocol/ProtocolList.cs @@ -21,10 +21,7 @@ namespace mRemoteNG.Connection.Protocol } } - public new int Count - { - get { return List.Count; } - } + public new int Count => List.Count; public void Add(ProtocolBase cProt) diff --git a/mRemoteNG/Connection/Protocol/PuttyBase.cs b/mRemoteNG/Connection/Protocol/PuttyBase.cs index cec7971f..45afdeac 100644 --- a/mRemoteNG/Connection/Protocol/PuttyBase.cs +++ b/mRemoteNG/Connection/Protocol/PuttyBase.cs @@ -34,10 +34,7 @@ namespace mRemoteNG.Connection.Protocol public static string PuttyPath { get; set; } - public bool Focused - { - get { return NativeMethods.GetForegroundWindow() == PuttyHandle; } - } + public bool Focused => NativeMethods.GetForegroundWindow() == PuttyHandle; #endregion diff --git a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs index e86be714..8836c0c4 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs @@ -43,19 +43,13 @@ namespace mRemoteNG.Connection.Protocol.RDP public virtual bool SmartSize { get => _rdpClient.AdvancedSettings2.SmartSizing; - protected set - { - _rdpClient.AdvancedSettings2.SmartSizing = value; - } + protected set => _rdpClient.AdvancedSettings2.SmartSizing = value; } public virtual bool Fullscreen { get => _rdpClient.FullScreen; - protected set - { - _rdpClient.FullScreen = value; - } + protected set => _rdpClient.FullScreen = value; } private bool RedirectKeys diff --git a/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs b/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs index 5efd07cc..024c2628 100644 --- a/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs +++ b/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs @@ -18,13 +18,13 @@ namespace mRemoteNG.Connection.Protocol.VNC public bool SmartSize { - get { return _vnc.Scaled; } - set { _vnc.Scaled = value; } + get => _vnc.Scaled; + set => _vnc.Scaled = value; } public bool ViewOnly { - get { return _vnc.ViewOnly; } + get => _vnc.ViewOnly; set => _vnc.ViewOnly = value; } diff --git a/mRemoteNG/Container/ContainerInfo.cs b/mRemoteNG/Container/ContainerInfo.cs index fa2e901c..b5b36127 100644 --- a/mRemoteNG/Container/ContainerInfo.cs +++ b/mRemoteNG/Container/ContainerInfo.cs @@ -26,7 +26,7 @@ namespace mRemoteNG.Container [Browsable(false)] public override bool IsContainer { - get { return true; } + get => true; set { } } diff --git a/mRemoteNG/Credential/CredentialRecord.cs b/mRemoteNG/Credential/CredentialRecord.cs index decf5327..e0e77edb 100644 --- a/mRemoteNG/Credential/CredentialRecord.cs +++ b/mRemoteNG/Credential/CredentialRecord.cs @@ -16,7 +16,7 @@ namespace mRemoteNG.Credential public string Title { - get { return _title; } + get => _title; set { _title = value; @@ -26,7 +26,7 @@ namespace mRemoteNG.Credential public string Username { - get { return _username; } + get => _username; set { _username = value; @@ -36,7 +36,7 @@ namespace mRemoteNG.Credential public SecureString Password { - get { return _password; } + get => _password; set { _password = value; @@ -46,7 +46,7 @@ namespace mRemoteNG.Credential public string Domain { - get { return _domain; } + get => _domain; set { _domain = value; diff --git a/mRemoteNG/Credential/Repositories/CredentialRepositoryConfig.cs b/mRemoteNG/Credential/Repositories/CredentialRepositoryConfig.cs index 1b3575e8..a2e6703d 100644 --- a/mRemoteNG/Credential/Repositories/CredentialRepositoryConfig.cs +++ b/mRemoteNG/Credential/Repositories/CredentialRepositoryConfig.cs @@ -16,7 +16,7 @@ namespace mRemoteNG.Credential.Repositories public string Title { - get { return _title; } + get => _title; set { _title = value; @@ -26,7 +26,7 @@ namespace mRemoteNG.Credential.Repositories public string TypeName { - get { return _typeName; } + get => _typeName; set { _typeName = value; @@ -36,7 +36,7 @@ namespace mRemoteNG.Credential.Repositories public string Source { - get { return _source; } + get => _source; set { _source = value; @@ -46,7 +46,7 @@ namespace mRemoteNG.Credential.Repositories public SecureString Key { - get { return _key; } + get => _key; set { _key = value; @@ -56,7 +56,7 @@ namespace mRemoteNG.Credential.Repositories public bool Loaded { - get { return _loaded; } + get => _loaded; set { _loaded = value; diff --git a/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs index 8a45e3c2..915568ec 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs @@ -6,26 +6,26 @@ namespace mRemoteNG.Messages.MessageFilteringOptions { public bool AllowDebugMessages { - get { return Settings.Default.TextLogMessageWriterWriteDebugMsgs; } - set { Settings.Default.TextLogMessageWriterWriteDebugMsgs = value; } + get => Settings.Default.TextLogMessageWriterWriteDebugMsgs; + set => Settings.Default.TextLogMessageWriterWriteDebugMsgs = value; } public bool AllowInfoMessages { - get { return Settings.Default.TextLogMessageWriterWriteInfoMsgs; } - set { Settings.Default.TextLogMessageWriterWriteInfoMsgs = value; } + get => Settings.Default.TextLogMessageWriterWriteInfoMsgs; + set => Settings.Default.TextLogMessageWriterWriteInfoMsgs = value; } public bool AllowWarningMessages { - get { return Settings.Default.TextLogMessageWriterWriteWarningMsgs; } - set { Settings.Default.TextLogMessageWriterWriteWarningMsgs = value; } + get => Settings.Default.TextLogMessageWriterWriteWarningMsgs; + set => Settings.Default.TextLogMessageWriterWriteWarningMsgs = value; } public bool AllowErrorMessages { - get { return Settings.Default.TextLogMessageWriterWriteErrorMsgs; } - set { Settings.Default.TextLogMessageWriterWriteErrorMsgs = value; } + get => Settings.Default.TextLogMessageWriterWriteErrorMsgs; + set => Settings.Default.TextLogMessageWriterWriteErrorMsgs = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs index 6996b951..21c22bc1 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs @@ -6,26 +6,26 @@ namespace mRemoteNG.Messages.MessageFilteringOptions { public bool AllowDebugMessages { - get { return Settings.Default.NotificationPanelWriterWriteDebugMsgs; } - set { Settings.Default.NotificationPanelWriterWriteDebugMsgs = value; } + get => Settings.Default.NotificationPanelWriterWriteDebugMsgs; + set => Settings.Default.NotificationPanelWriterWriteDebugMsgs = value; } public bool AllowInfoMessages { - get { return Settings.Default.NotificationPanelWriterWriteInfoMsgs; } - set { Settings.Default.NotificationPanelWriterWriteInfoMsgs = value; } + get => Settings.Default.NotificationPanelWriterWriteInfoMsgs; + set => Settings.Default.NotificationPanelWriterWriteInfoMsgs = value; } public bool AllowWarningMessages { - get { return Settings.Default.NotificationPanelWriterWriteWarningMsgs; } - set { Settings.Default.NotificationPanelWriterWriteWarningMsgs = value; } + get => Settings.Default.NotificationPanelWriterWriteWarningMsgs; + set => Settings.Default.NotificationPanelWriterWriteWarningMsgs = value; } public bool AllowErrorMessages { - get { return Settings.Default.NotificationPanelWriterWriteErrorMsgs; } - set { Settings.Default.NotificationPanelWriterWriteErrorMsgs = value; } + get => Settings.Default.NotificationPanelWriterWriteErrorMsgs; + set => Settings.Default.NotificationPanelWriterWriteErrorMsgs = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs index 9c3a4393..debbbee6 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs @@ -6,26 +6,26 @@ namespace mRemoteNG.Messages.MessageFilteringOptions { public bool AllowDebugMessages { - get { return false; } + get => false; set { } } public bool AllowInfoMessages { - get { return Settings.Default.SwitchToMCOnInformation; } - set { Settings.Default.SwitchToMCOnInformation = value; } + get => Settings.Default.SwitchToMCOnInformation; + set => Settings.Default.SwitchToMCOnInformation = value; } public bool AllowWarningMessages { - get { return Settings.Default.SwitchToMCOnWarning; } - set { Settings.Default.SwitchToMCOnWarning = value; } + get => Settings.Default.SwitchToMCOnWarning; + set => Settings.Default.SwitchToMCOnWarning = value; } public bool AllowErrorMessages { - get { return Settings.Default.SwitchToMCOnError; } - set { Settings.Default.SwitchToMCOnError = value; } + get => Settings.Default.SwitchToMCOnError; + set => Settings.Default.SwitchToMCOnError = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs index 3f7240cc..55786a68 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs @@ -6,26 +6,26 @@ namespace mRemoteNG.Messages.MessageFilteringOptions { public bool AllowDebugMessages { - get { return Settings.Default.PopupMessageWriterWriteDebugMsgs; } - set { Settings.Default.PopupMessageWriterWriteDebugMsgs = value; } + get => Settings.Default.PopupMessageWriterWriteDebugMsgs; + set => Settings.Default.PopupMessageWriterWriteDebugMsgs = value; } public bool AllowInfoMessages { - get { return Settings.Default.PopupMessageWriterWriteInfoMsgs; } - set { Settings.Default.PopupMessageWriterWriteInfoMsgs = value; } + get => Settings.Default.PopupMessageWriterWriteInfoMsgs; + set => Settings.Default.PopupMessageWriterWriteInfoMsgs = value; } public bool AllowWarningMessages { - get { return Settings.Default.PopupMessageWriterWriteWarningMsgs; } - set { Settings.Default.PopupMessageWriterWriteWarningMsgs = value; } + get => Settings.Default.PopupMessageWriterWriteWarningMsgs; + set => Settings.Default.PopupMessageWriterWriteWarningMsgs = value; } public bool AllowErrorMessages { - get { return Settings.Default.PopupMessageWriterWriteErrorMsgs; } - set { Settings.Default.PopupMessageWriterWriteErrorMsgs = value; } + get => Settings.Default.PopupMessageWriterWriteErrorMsgs; + set => Settings.Default.PopupMessageWriterWriteErrorMsgs = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Tools/Cmdline/CmdArgumentsInterpreter.cs b/mRemoteNG/Tools/Cmdline/CmdArgumentsInterpreter.cs index c66e47f5..da69f37b 100644 --- a/mRemoteNG/Tools/Cmdline/CmdArgumentsInterpreter.cs +++ b/mRemoteNG/Tools/Cmdline/CmdArgumentsInterpreter.cs @@ -23,10 +23,7 @@ namespace mRemoteNG.Tools.Cmdline private readonly StringDictionary _parameters; // Retrieve a parameter value if it exists - public string this[string param] - { - get { return (_parameters[param]); } - } + public string this[string param] => (_parameters[param]); public CmdArgumentsInterpreter(IEnumerable args) { diff --git a/mRemoteNG/Tools/CustomCollections/FullyObservableCollection.cs b/mRemoteNG/Tools/CustomCollections/FullyObservableCollection.cs index 3094e6aa..c1b44ce4 100644 --- a/mRemoteNG/Tools/CustomCollections/FullyObservableCollection.cs +++ b/mRemoteNG/Tools/CustomCollections/FullyObservableCollection.cs @@ -17,8 +17,8 @@ namespace mRemoteNG.Tools.CustomCollections public T this[int index] { - get { return _list[index]; } - set { _list[index] = value; } + get => _list[index]; + set => _list[index] = value; } public FullyObservableCollection() diff --git a/mRemoteNG/Tools/ExternalTool.cs b/mRemoteNG/Tools/ExternalTool.cs index 6998c663..a574e52d 100644 --- a/mRemoteNG/Tools/ExternalTool.cs +++ b/mRemoteNG/Tools/ExternalTool.cs @@ -31,19 +31,19 @@ namespace mRemoteNG.Tools public string DisplayName { - get { return _displayName; } - set { SetField(ref _displayName, value, nameof(DisplayName)); } + get => _displayName; + set => SetField(ref _displayName, value, nameof(DisplayName)); } public string FileName { - get { return _fileName; } - set { SetField(ref _fileName, value, nameof(FileName)); } + get => _fileName; + set => SetField(ref _fileName, value, nameof(FileName)); } public bool WaitForExit { - get { return _waitForExit; } + get => _waitForExit; set { // WaitForExit cannot be turned on when TryIntegrate is true @@ -55,19 +55,19 @@ namespace mRemoteNG.Tools public string Arguments { - get { return _arguments; } - set { SetField(ref _arguments, value, nameof(Arguments)); } + get => _arguments; + set => SetField(ref _arguments, value, nameof(Arguments)); } public string WorkingDir { - get { return _workingDir; } - set { SetField(ref _workingDir, value, nameof(WorkingDir)); } + get => _workingDir; + set => SetField(ref _workingDir, value, nameof(WorkingDir)); } public bool TryIntegrate { - get { return _tryIntegrate; } + get => _tryIntegrate; set { // WaitForExit cannot be turned on when TryIntegrate is true @@ -79,27 +79,21 @@ namespace mRemoteNG.Tools public bool ShowOnToolbar { - get { return _showOnToolbar; } - set { SetField(ref _showOnToolbar, value, nameof(ShowOnToolbar)); } + get => _showOnToolbar; + set => SetField(ref _showOnToolbar, value, nameof(ShowOnToolbar)); } public bool RunElevated { - get { return _runElevated; } - set { SetField(ref _runElevated, value, nameof(RunElevated)); } + get => _runElevated; + set => SetField(ref _runElevated, value, nameof(RunElevated)); } public ConnectionInfo ConnectionInfo { get; set; } - public Icon Icon - { - get { return File.Exists(FileName) ? MiscTools.GetIconFromFile(FileName) : Properties.Resources.mRemoteNG_Icon; } - } + public Icon Icon => File.Exists(FileName) ? MiscTools.GetIconFromFile(FileName) : Properties.Resources.mRemoteNG_Icon; - public Image Image - { - get { return Icon?.ToBitmap() ?? Properties.Resources.mRemoteNG_Icon.ToBitmap(); } - } + public Image Image => Icon?.ToBitmap() ?? Properties.Resources.mRemoteNG_Icon.ToBitmap(); #endregion diff --git a/mRemoteNG/Tools/PropertyGridCommandSite.cs b/mRemoteNG/Tools/PropertyGridCommandSite.cs index 046253a7..8dfb7043 100644 --- a/mRemoteNG/Tools/PropertyGridCommandSite.cs +++ b/mRemoteNG/Tools/PropertyGridCommandSite.cs @@ -103,25 +103,16 @@ namespace mRemoteNG.Tools return serviceType == typeof(IMenuCommandService) ? this : null; } - public IComponent Component - { - get { throw new NotSupportedException(); } - } + public IComponent Component => throw new NotSupportedException(); - public IContainer Container - { - get { return null; } - } + public IContainer Container => null; - public bool DesignMode - { - get { return true; } - } + public bool DesignMode => true; public string Name { - get { throw new NotSupportedException(); } - set { throw new NotSupportedException(); } + get => throw new NotSupportedException(); + set => throw new NotSupportedException(); } public void AddCommand(MenuCommand command) diff --git a/mRemoteNG/Tools/ScanHost.cs b/mRemoteNG/Tools/ScanHost.cs index 26c673be..ad347ae8 100644 --- a/mRemoteNG/Tools/ScanHost.cs +++ b/mRemoteNG/Tools/ScanHost.cs @@ -87,40 +87,19 @@ namespace mRemoteNG.Tools } } - public string RdpName - { - get { return BoolToYesNo(Rdp); } - } + public string RdpName => BoolToYesNo(Rdp); - public string VncName - { - get { return BoolToYesNo(Vnc); } - } + public string VncName => BoolToYesNo(Vnc); - public string SshName - { - get { return BoolToYesNo(Rdp); } - } + public string SshName => BoolToYesNo(Rdp); - public string TelnetName - { - get { return BoolToYesNo(Telnet); } - } + public string TelnetName => BoolToYesNo(Telnet); - public string RloginName - { - get { return BoolToYesNo(Rlogin); } - } + public string RloginName => BoolToYesNo(Rlogin); - public string HttpName - { - get { return BoolToYesNo(Http); } - } + public string HttpName => BoolToYesNo(Http); - public string HttpsName - { - get { return BoolToYesNo(Https); } - } + public string HttpsName => BoolToYesNo(Https); public string OpenPortsName { diff --git a/mRemoteNG/Tools/Tools.LocalizedAttributes.cs b/mRemoteNG/Tools/Tools.LocalizedAttributes.cs index 0f7c00aa..44e07eee 100644 --- a/mRemoteNG/Tools/Tools.LocalizedAttributes.cs +++ b/mRemoteNG/Tools/Tools.LocalizedAttributes.cs @@ -90,10 +90,7 @@ namespace mRemoteNG.Tools // This allows localized attributes in a derived class to override a matching // non-localized attribute inherited from its base class - public override object TypeId - { - get { return typeof(DefaultValueAttribute); } - } + public override object TypeId => typeof(DefaultValueAttribute); } #region Special localization - with String.Format diff --git a/mRemoteNG/Tools/Tools.WindowPlacement.cs b/mRemoteNG/Tools/Tools.WindowPlacement.cs index b6a34d55..11171286 100644 --- a/mRemoteNG/Tools/Tools.WindowPlacement.cs +++ b/mRemoteNG/Tools/Tools.WindowPlacement.cs @@ -20,8 +20,8 @@ namespace mRemoteNG.Tools public Form Form { - get { return _form; } - set { _form = value; } + get => _form; + set => _form = value; } public bool RestoreToMaximized diff --git a/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs b/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs index c0f926ff..cb39a702 100644 --- a/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs +++ b/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs @@ -24,12 +24,9 @@ namespace mRemoteNG.Tree.Root [LocalizedAttributes.LocalizedDefaultValue("strPuttySavedSessionsRootName")] public override string Name { - get { return _name; } - set - { - _name = value; - //Settings.Default.PuttySavedSessionsName = value; - } + get => _name; + set => _name = value; + //Settings.Default.PuttySavedSessionsName = value; } [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)), @@ -37,7 +34,7 @@ namespace mRemoteNG.Tree.Root LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPanel))] public override string Panel { - get { return _panel; } + get => _panel; set { _panel = value; diff --git a/mRemoteNG/UI/Controls/CredentialRecordListView.cs b/mRemoteNG/UI/Controls/CredentialRecordListView.cs index 58397ca6..e3ff77a2 100644 --- a/mRemoteNG/UI/Controls/CredentialRecordListView.cs +++ b/mRemoteNG/UI/Controls/CredentialRecordListView.cs @@ -16,7 +16,7 @@ namespace mRemoteNG.UI.Controls public ICredentialRepositoryList CredentialRepositoryList { - get { return _credentialRepositoryList; } + get => _credentialRepositoryList; set { _credentialRepositoryList.RepositoriesUpdated -= CredentialRepositoryListOnRepositoriesUpdated; diff --git a/mRemoteNG/UI/Controls/CredentialRepositoryListView.cs b/mRemoteNG/UI/Controls/CredentialRepositoryListView.cs index 74805d0b..5225eb8b 100644 --- a/mRemoteNG/UI/Controls/CredentialRepositoryListView.cs +++ b/mRemoteNG/UI/Controls/CredentialRepositoryListView.cs @@ -15,7 +15,7 @@ namespace mRemoteNG.UI.Controls public ICredentialRepositoryList CredentialRepositoryList { - get { return _credentialRepositoryList; } + get => _credentialRepositoryList; set { _credentialRepositoryList.RepositoriesUpdated -= OnRepositoriesUpdated; diff --git a/mRemoteNG/UI/Controls/NewPasswordWithVerification.cs b/mRemoteNG/UI/Controls/NewPasswordWithVerification.cs index 419481b1..2a4ae999 100644 --- a/mRemoteNG/UI/Controls/NewPasswordWithVerification.cs +++ b/mRemoteNG/UI/Controls/NewPasswordWithVerification.cs @@ -20,7 +20,7 @@ namespace mRemoteNG.UI.Controls [Browsable(true)] public char PasswordChar { - get { return _passwordChar; } + get => _passwordChar; set { _passwordChar = value; @@ -32,7 +32,7 @@ namespace mRemoteNG.UI.Controls [Browsable(true)] public bool UseSystemPasswordChar { - get { return _useSystemPasswordChar; } + get => _useSystemPasswordChar; set { _useSystemPasswordChar = value; diff --git a/mRemoteNG/UI/Controls/QuickConnectComboBox.cs b/mRemoteNG/UI/Controls/QuickConnectComboBox.cs index 43c9b329..1a1a4038 100644 --- a/mRemoteNG/UI/Controls/QuickConnectComboBox.cs +++ b/mRemoteNG/UI/Controls/QuickConnectComboBox.cs @@ -199,14 +199,8 @@ namespace mRemoteNG.UI.Controls public event ConnectRequestedEventHandler ConnectRequested { - add - { - ConnectRequestedEvent = (ConnectRequestedEventHandler)Delegate.Combine(ConnectRequestedEvent, value); - } - remove - { - ConnectRequestedEvent = (ConnectRequestedEventHandler)Delegate.Remove(ConnectRequestedEvent, value); - } + add => ConnectRequestedEvent = (ConnectRequestedEventHandler)Delegate.Combine(ConnectRequestedEvent, value); + remove => ConnectRequestedEvent = (ConnectRequestedEventHandler)Delegate.Remove(ConnectRequestedEvent, value); } @@ -232,8 +226,8 @@ namespace mRemoteNG.UI.Controls public event ProtocolChangedEventHandler ProtocolChanged { - add { ProtocolChangedEvent = (ProtocolChangedEventHandler)Delegate.Combine(ProtocolChangedEvent, value); } - remove { ProtocolChangedEvent = (ProtocolChangedEventHandler)Delegate.Remove(ProtocolChangedEvent, value); } + add => ProtocolChangedEvent = (ProtocolChangedEventHandler)Delegate.Combine(ProtocolChangedEvent, value); + remove => ProtocolChangedEvent = (ProtocolChangedEventHandler)Delegate.Remove(ProtocolChangedEvent, value); } diff --git a/mRemoteNG/UI/Controls/mrngToolStripSplitButton.cs b/mRemoteNG/UI/Controls/mrngToolStripSplitButton.cs index 6b395a44..d211255f 100644 --- a/mRemoteNG/UI/Controls/mrngToolStripSplitButton.cs +++ b/mRemoteNG/UI/Controls/mrngToolStripSplitButton.cs @@ -7,7 +7,7 @@ namespace mRemoteNG.UI.Controls { public new ToolStripDropDown DropDown { - get { return base.DropDown; } + get => base.DropDown; set { if (base.DropDown != value) diff --git a/mRemoteNG/UI/TaskDialog/CommandButton.cs b/mRemoteNG/UI/TaskDialog/CommandButton.cs index db2700a0..48125285 100644 --- a/mRemoteNG/UI/TaskDialog/CommandButton.cs +++ b/mRemoteNG/UI/TaskDialog/CommandButton.cs @@ -40,7 +40,7 @@ namespace mRemoteNG.UI.TaskDialog // Override this to make sure the control is invalidated (repainted) when 'Text' is changed public override string Text { - get { return base.Text; } + get => base.Text; set { base.Text = value; @@ -61,7 +61,7 @@ namespace mRemoteNG.UI.TaskDialog [DefaultValue(true)] public bool AutoHeight { - get { return m_autoHeight; } + get => m_autoHeight; set { m_autoHeight = value; diff --git a/mRemoteNGTests/ListViewTester.cs b/mRemoteNGTests/ListViewTester.cs index 5160fa97..dfe01873 100644 --- a/mRemoteNGTests/ListViewTester.cs +++ b/mRemoteNGTests/ListViewTester.cs @@ -110,13 +110,7 @@ namespace mRemoteNGTests /// /// The ControlTester at the specified index. /// The index of the ListViewTester. - public new ListViewTester this[int index] - { - get - { - return new ListViewTester(this, index); - } - } + public new ListViewTester this[int index] => new ListViewTester(this, index); /// /// Provides access to all of the Properties of the ListBox. @@ -125,35 +119,17 @@ namespace mRemoteNGTests /// Allows typed access to all of the properties of the underlying control. /// /// The underlying control. - public ListView Properties - { - get - { - return (ListView)Control; - } - } + public ListView Properties => (ListView)Control; /// /// Helper method to return the List View's Items property /// - public ListView.ListViewItemCollection Items - { - get - { - return Properties.Items; - } - } + public ListView.ListViewItemCollection Items => Properties.Items; /// /// Helper method to return the columns of the list view /// - public ListView.ColumnHeaderCollection Columns - { - get - { - return Properties.Columns; - } - } + public ListView.ColumnHeaderCollection Columns => Properties.Columns; /// /// Clears the selections from the list box.