From b52b5b428719251558400f8814473c17070f719c Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Tue, 14 Feb 2017 14:53:20 -0700
Subject: [PATCH] renamed class

---
 .../XmlCredentialDeserializerTests.cs         |  4 +--
 mRemoteV1/Config/CredentialRecordLoader.cs    |  4 +--
 ....cs => XmlCredentialRecordDeserializer.cs} |  2 +-
 .../Repositories/XmlCredentialRepository.cs   |  4 +--
 mRemoteV1/mRemoteV1.csproj                    | 30 +++++++++----------
 5 files changed, 22 insertions(+), 22 deletions(-)
 rename mRemoteV1/Config/Serializers/CredentialSerializer/{XmlCredentialDeserializer.cs => XmlCredentialRecordDeserializer.cs} (98%)

diff --git a/mRemoteNGTests/Config/Serializers/XmlCredentialDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/XmlCredentialDeserializerTests.cs
index 1b8b6fd9..5fa3be19 100644
--- a/mRemoteNGTests/Config/Serializers/XmlCredentialDeserializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/XmlCredentialDeserializerTests.cs
@@ -10,7 +10,7 @@ namespace mRemoteNGTests.Config.Serializers
 {
     public class XmlCredentialDeserializerTests
     {
-        private XmlCredentialDeserializer _deserializer;
+        private XmlCredentialRecordDeserializer _deserializer;
         private ICryptographyProvider _cryptographyProvider;
         private readonly SecureString _key = "myencrptionpass".ConvertToSecureString();
 
@@ -18,7 +18,7 @@ namespace mRemoteNGTests.Config.Serializers
         public void Setup()
         {
             _cryptographyProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
-            _deserializer = new XmlCredentialDeserializer();
+            _deserializer = new XmlCredentialRecordDeserializer();
         }
 
         [Test]
diff --git a/mRemoteV1/Config/CredentialRecordLoader.cs b/mRemoteV1/Config/CredentialRecordLoader.cs
index 7d9aafa8..ca83c266 100644
--- a/mRemoteV1/Config/CredentialRecordLoader.cs
+++ b/mRemoteV1/Config/CredentialRecordLoader.cs
@@ -11,9 +11,9 @@ namespace mRemoteNG.Config
     public class CredentialRecordLoader
     {
         private readonly IDataProvider<string> _dataProvider;
-        private readonly XmlCredentialDeserializer _deserializer;
+        private readonly XmlCredentialRecordDeserializer _deserializer;
 
-        public CredentialRecordLoader(IDataProvider<string> dataProvider, XmlCredentialDeserializer deserializer)
+        public CredentialRecordLoader(IDataProvider<string> dataProvider, XmlCredentialRecordDeserializer deserializer)
         {
             if (dataProvider == null)
                 throw new ArgumentNullException(nameof(dataProvider));
diff --git a/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialDeserializer.cs b/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordDeserializer.cs
similarity index 98%
rename from mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialDeserializer.cs
rename to mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordDeserializer.cs
index 588bcfdd..943d2520 100644
--- a/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialDeserializer.cs
+++ b/mRemoteV1/Config/Serializers/CredentialSerializer/XmlCredentialRecordDeserializer.cs
@@ -10,7 +10,7 @@ using mRemoteNG.Security.Authentication;
 
 namespace mRemoteNG.Config.Serializers
 {
-    public class XmlCredentialDeserializer
+    public class XmlCredentialRecordDeserializer
     {
         public string SchemaVersion { get; } = "1.0";
         public IAuthenticator Authenticator { get; set; }
diff --git a/mRemoteV1/Credential/Repositories/XmlCredentialRepository.cs b/mRemoteV1/Credential/Repositories/XmlCredentialRepository.cs
index 758920f2..7d498b6d 100644
--- a/mRemoteV1/Credential/Repositories/XmlCredentialRepository.cs
+++ b/mRemoteV1/Credential/Repositories/XmlCredentialRepository.cs
@@ -14,7 +14,7 @@ namespace mRemoteNG.Credential.Repositories
     public class XmlCredentialRepository : ICredentialRepository
     {
         private readonly IDataProvider<string> _dataProvider;
-        private readonly XmlCredentialDeserializer _deserializer;
+        private readonly XmlCredentialRecordDeserializer _deserializer;
         private readonly XmlCredentialRecordSerializer _serializer;
 
         public ICredentialRepositoryConfig Config { get; }
@@ -34,7 +34,7 @@ namespace mRemoteNG.Credential.Repositories
             ((FullyObservableCollection<ICredentialRecord>) CredentialRecords).CollectionUpdated += RaiseCredentialsUpdatedEvent;
             Config.PropertyChanged += (sender, args) => RaiseRepositoryConfigUpdatedEvent(args);
             _dataProvider = dataProvider;
-            _deserializer = new XmlCredentialDeserializer();
+            _deserializer = new XmlCredentialRecordDeserializer();
             _serializer = new XmlCredentialRecordSerializer(cryptographyProvider);
         }
 
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index ec6270c2..09e12132 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -142,18 +142,18 @@
     <Compile Include="Config\CredentialRepositoryListSaver.cs" />
     <Compile Include="Config\Serializers\CredentialProviderSerializer\CredentialRepositoryListDeserializer.cs" />
     <Compile Include="Config\CredentialRepositoryListLoader.cs" />
-    <Compile Include="Config\Serializers\ActiveDirectoryDeserializer.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\ActiveDirectoryDeserializer.cs" />
     <Compile Include="Config\Serializers\CredentialProviderSerializer\CredentialRepositoryListSerializer.cs" />
-    <Compile Include="Config\Serializers\CsvConnectionsSerializerMremotengFormat.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\CsvConnectionsSerializerMremotengFormat.cs" />
     <Compile Include="Config\Serializers\DataTableDeserializer.cs" />
     <Compile Include="Config\Serializers\DataTableSerializer.cs" />
     <Compile Include="Config\Serializers\IConnectionSerializer.cs" />
-    <Compile Include="Config\Serializers\PortScanDeserializer.cs" />
-    <Compile Include="Config\Serializers\PuttyConnectionManagerDeserializer.cs" />
-    <Compile Include="Config\Serializers\RemoteDesktopConnectionDeserializer.cs" />
-    <Compile Include="Config\Serializers\RemoteDesktopConnectionManagerDeserializer.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\PortScanDeserializer.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\PuttyConnectionManagerDeserializer.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionDeserializer.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionManagerDeserializer.cs" />
     <Compile Include="Config\DataProviders\FileDataProviderWithBackup.cs" />
-    <Compile Include="Config\Serializers\XmlConnectionNodeSerializer26.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionNodeSerializer26.cs" />
     <Compile Include="Config\Serializers\XmlConnectionsDecryptor.cs" />
     <Compile Include="Config\Connections\ConnectionsLoader.cs" />
     <Compile Include="Config\Connections\ConnectionsSaver.cs" />
@@ -162,18 +162,18 @@
     <Compile Include="Config\Serializers\IDeserializer.cs" />
     <Compile Include="Config\Import\IConnectionImporter.cs" />
     <Compile Include="Config\Serializers\ISerializer.cs" />
-    <Compile Include="Config\Serializers\XmlConnectionNodeSerializer27.cs" />
-    <Compile Include="Config\Serializers\XmlConnectionsDocumentCompiler.cs" />
-    <Compile Include="Config\Serializers\XmlConnectionsDocumentEncryptor.cs" />
-    <Compile Include="Config\Serializers\XmlConnectionsSerializer.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionNodeSerializer27.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDocumentCompiler.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDocumentEncryptor.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsSerializer.cs" />
     <Compile Include="Config\DataProviders\FileDataProvider.cs" />
     <Compile Include="Config\DataProviders\IDataProvider.cs" />
     <Compile Include="Config\Connections\Multiuser\SqlConnectionsUpdateChecker.cs" />
-    <Compile Include="Config\Serializers\XmlConnectionsDeserializer.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDeserializer.cs" />
     <Compile Include="Config\Putty\PuttySessionChangedEventArgs.cs" />
-    <Compile Include="Config\Serializers\XmlCredentialDeserializer.cs" />
-    <Compile Include="Config\Serializers\XmlCredentialRecordSerializer.cs" />
-    <Compile Include="Config\Serializers\XmlRootNodeSerializer.cs" />
+    <Compile Include="Config\Serializers\CredentialSerializer\XmlCredentialRecordDeserializer.cs" />
+    <Compile Include="Config\Serializers\CredentialSerializer\XmlCredentialRecordSerializer.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlRootNodeSerializer.cs" />
     <Compile Include="Config\Serializers\ConfConsEnsureConnectionsHaveIds.cs" />
     <Compile Include="Config\Settings\ExternalAppsLoader.cs" />
     <Compile Include="Config\Settings\LayoutSettingsLoader.cs" />