Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneccessary Converts

Browse Source
This commit is contained in:
Sean Kaim
2017-01-24 20:28:29 -05:00
parent 9250dde5b0
commit 29dad51ff7
1 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
mRemoteV1/App/Runtime.cs
View File

@@ -173,22 +173,20 @@ namespace mRemoteNG.App
try
{
var tagEnumeration = (IEnumerable)((ToolStripMenuItem)sender).Tag;
if (tagEnumeration != null)
if (tagEnumeration == null) return;
foreach (var obj in tagEnumeration)
{
foreach (var obj in tagEnumeration)
var screen1 = obj as Screen;
if (screen1 != null)
{
var screen1 = obj as Screen;
if (screen1 != null)
{
screen = screen1;
}
else if (obj is DockContent)
{
panel = (DockContent)obj;
}
screen = screen1;
}
else if (obj is DockContent)
{
panel = (DockContent)obj;
}
Screens.SendPanelToScreen(panel, screen);
}
Screens.SendPanelToScreen(panel, screen);
}
catch (Exception ex)
{
@@ -283,7 +281,7 @@ namespace mRemoteNG.App
connectionsLoader.ConnectionFileName = GetStartupConnectionFileName();
}
CreateBackupFile(Convert.ToString(connectionsLoader.ConnectionFileName));
CreateBackupFile(connectionsLoader.ConnectionFileName);
}
connectionsLoader.UseDatabase = Settings.Default.UseSQLServer;
@@ -334,7 +332,7 @@ namespace mRemoteNG.App
if (ex is FileNotFoundException && !withDialog)
{
MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionsLoader.ConnectionFileName), ex, MessageClass.InformationMsg);
NewConnections(Convert.ToString(connectionsLoader.ConnectionFileName));
NewConnections(connectionsLoader.ConnectionFileName);
return;
}
@@ -389,18 +387,12 @@ namespace mRemoteNG.App
var fileName = GetFileName(baseName);
var directoryName = GetDirectoryName(baseName);
if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName))
{
return;
}
if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName)) return;
var searchPattern = string.Format(Settings.Default.BackupFileNameFormat, fileName, "*");
var files = Directory.GetFiles(directoryName, searchPattern);
if (files.Length <= Settings.Default.BackupFileKeepCount)
{
return;
}
if (files.Length <= Settings.Default.BackupFileKeepCount) return;
Array.Sort(files);
Array.Resize(ref files, files.Length - Settings.Default.BackupFileKeepCount);
@@ -416,10 +408,8 @@ namespace mRemoteNG.App
var newPath = ConnectionsFileInfo.DefaultConnectionsPath + "\\" + ConnectionsFileInfo.DefaultConnectionsFile;
#if !PORTABLE
var oldPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\" + Application.ProductName + "\\" + ConnectionsFileInfo.DefaultConnectionsFile;
if (File.Exists(oldPath))
{
return oldPath;
}
// ReSharper disable once ConvertIfStatementToReturnStatement
if (File.Exists(oldPath)) return oldPath;
#endif
return newPath;
}
@@ -465,11 +455,11 @@ namespace mRemoteNG.App
if (Settings.Default.UseSQLServer)
{
connectionsSaver.SaveFormat = ConnectionsSaver.Format.SQL;
connectionsSaver.SQLHost = Convert.ToString(Settings.Default.SQLHost);
connectionsSaver.SQLDatabaseName = Convert.ToString(Settings.Default.SQLDatabaseName);
connectionsSaver.SQLUsername = Convert.ToString(Settings.Default.SQLUser);
connectionsSaver.SQLHost = Settings.Default.SQLHost;
connectionsSaver.SQLDatabaseName = Settings.Default.SQLDatabaseName;
connectionsSaver.SQLUsername = Settings.Default.SQLUser;
var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
connectionsSaver.SQLPassword = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.SQLPass), EncryptionKey);
connectionsSaver.SQLPassword = cryptographyProvider.Decrypt(Settings.Default.SQLPass, EncryptionKey);
}
connectionsSaver.SaveConnections();
@@ -508,8 +498,7 @@ namespace mRemoteNG.App
saveFileDialog.Filter = string.Join("|", fileTypes.ToArray());
if (saveFileDialog.ShowDialog(frmMain.Default) != DialogResult.OK)
return;
if (saveFileDialog.ShowDialog(frmMain.Default) != DialogResult.OK) return;
connectionsSave.SaveFormat = ConnectionsSaver.Format.mRXML;
connectionsSave.ConnectionFileName = saveFileDialog.FileName;
@@ -548,10 +537,7 @@ namespace mRemoteNG.App
try
{
var uri = new Uri("dummyscheme" + Uri.SchemeDelimiter + connectionString);
if (string.IsNullOrEmpty(uri.Host))
{
return null;
}
if (string.IsNullOrEmpty(uri.Host)) return null;
var newConnectionInfo = new ConnectionInfo();
newConnectionInfo.CopyFrom(DefaultConnectionInfo.Instance);