From f4378ae56e6eb4d2895dcc41863b7838d42a241f Mon Sep 17 00:00:00 2001
From: StingRaptor <develop.state@gmail.com>
Date: Sun, 13 Mar 2016 16:25:30 +0100
Subject: [PATCH] Removed unnecessary functions from RegValueData.cs

- Removed GetDataAsString()
- Removed GetKindAsString()
- Added needed conversions to FrmRegistryEditor.cs
---
 Client/Core/Registry/RegValueData.cs | 12 +-----------
 Server/Core/Registry/RegValueData.cs | 12 +-----------
 Server/Forms/FrmRegistryEditor.cs    | 11 ++++++++---
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/Client/Core/Registry/RegValueData.cs b/Client/Core/Registry/RegValueData.cs
index ee97c43f..0d5cd787 100644
--- a/Client/Core/Registry/RegValueData.cs
+++ b/Client/Core/Registry/RegValueData.cs
@@ -21,19 +21,9 @@ namespace xClient.Core.Registry
             Data = data;
         }
 
-        public string GetDataAsString()
-        {
-            return Kind.RegistryTypeToString(Data);
-        }
-
-        public string GetKindAsString()
-        {
-            return Kind.RegistryTypeToString();
-        }
-
         public override string ToString()
         {
-            return string.Format("({0}:{1}:{2})", Name, GetKindAsString(), GetDataAsString());
+            return string.Format("({0}:{1}:{2})", Name, Kind, Data);
         }
     }
 }
diff --git a/Server/Core/Registry/RegValueData.cs b/Server/Core/Registry/RegValueData.cs
index 432db3cb..27084c3d 100644
--- a/Server/Core/Registry/RegValueData.cs
+++ b/Server/Core/Registry/RegValueData.cs
@@ -21,19 +21,9 @@ namespace xServer.Core.Registry
             Data = data;
         }
 
-        public string GetDataAsString()
-        {
-            return Kind.RegistryTypeToString(Data);
-        }
-
-        public string GetKindAsString()
-        {
-            return Kind.RegistryTypeToString();
-        }
-
         public override string ToString()
         {
-            return string.Format("({0}:{1}:{2})", Name, GetKindAsString(), GetDataAsString());
+            return string.Format("({0}:{1}:{2})", Name, Kind, Data);
         }
     }
 }
diff --git a/Server/Forms/FrmRegistryEditor.cs b/Server/Forms/FrmRegistryEditor.cs
index fba7a0e4..74a152de 100644
--- a/Server/Forms/FrmRegistryEditor.cs
+++ b/Server/Forms/FrmRegistryEditor.cs
@@ -10,6 +10,7 @@ using System.Windows.Forms;
 using xServer.Controls;
 using xServer.Core.Networking;
 using xServer.Core.Registry;
+using xServer.Core.Extensions;
 
 namespace xServer.Forms
 {
@@ -288,7 +289,9 @@ namespace xServer.Forms
 
                     if (tvRegistryDirectory.SelectedNode == key)
                     {
-                        RegistryValueLstItem item = new RegistryValueLstItem(value.Name, value.GetKindAsString(), value.GetDataAsString());
+                        string kind = value.Kind.RegistryTypeToString();
+                        string data = value.Kind.RegistryTypeToString(value.Data);
+                        RegistryValueLstItem item = new RegistryValueLstItem(value.Name, kind, data);
                         //unselect all
                         lstRegistryKeys.SelectedIndices.Clear();
                         lstRegistryKeys.Items.Add(item);
@@ -394,7 +397,7 @@ namespace xServer.Forms
                             if (index != -1)
                             {
                                 RegistryValueLstItem valueItem = (RegistryValueLstItem)lstRegistryKeys.Items[index];
-                                valueItem.Data = value.GetDataAsString();
+                                valueItem.Data = value.Kind.RegistryTypeToString(value.Data);;
                             }
                         }
                         else
@@ -428,7 +431,9 @@ namespace xServer.Forms
             {
                 foreach (var value in values)
                 {
-                    RegistryValueLstItem item = new RegistryValueLstItem(value.Name, value.GetKindAsString(), value.GetDataAsString());
+                    string kind = value.Kind.RegistryTypeToString();
+                    string data = value.Kind.RegistryTypeToString(value.Data);
+                    RegistryValueLstItem item = new RegistryValueLstItem(value.Name, kind, data);
                     lstRegistryKeys.Items.Add(item);
                 }
             }