Fixes for issue #109 and #112

GBM/Classes/XML Serialize Classes/ExportData.vb

@@ -1,16 +1,43 @@
-Public Class ExportData
-    Dim oExportInformation As ExportInformation
-    Dim oConfigs As List(Of Game)
+Imports System.Xml.Serialization
 
-    Property Information As ExportInformation
-        Set(value As ExportInformation)
-            oExportInformation = value
+<XmlRoot("gbm")>
+Public Class ExportData
+    Dim oConfigs As List(Of Game)
+    Private dExported As Int64
+    Private iTotalConfigs As Integer
+    Private iAppVer As Integer
+
+    <XmlAttribute("Exported")>
+    Property Exported As Int64
+        Set(value As Int64)
+            dExported = value
         End Set
         Get
-            Return oExportInformation
+            Return dExported
         End Get
     End Property
 
+    <XmlAttribute("TotalConfigurations")>
+    Property TotalConfigurations As Integer
+        Set(value As Integer)
+            iTotalConfigs = value
+        End Set
+        Get
+            Return iTotalConfigs
+        End Get
+    End Property
+
+    <XmlAttribute("AppVer")>
+    Property AppVer As Integer
+        Set(value As Integer)
+            iAppVer = value
+        End Set
+        Get
+            Return iAppVer
+        End Get
+    End Property
+
+    <XmlElement("Game")>
     Property Configurations As List(Of Game)
         Set(value As List(Of Game))
             oConfigs = value
@@ -21,12 +48,16 @@
     End Property
 
     Public Sub New()
-        oExportInformation = New ExportInformation()
+        dExported = 0
+        iTotalConfigs = 0
+        iAppVer = 0
         oConfigs = New List(Of Game)
     End Sub
 
-    Public Sub New(ByVal oInitExportInformation As ExportInformation, ByVal oInitConfigs As List(Of Game))
-        oExportInformation = oInitExportInformation
+    Public Sub New(ByVal dInitExported As Int64, ByVal iInitTotalConfigs As Integer, ByVal iInitAppVer As Integer, ByVal oInitConfigs As List(Of Game))
+        dExported = dInitExported
+        iTotalConfigs = iInitTotalConfigs
+        iAppVer = iInitAppVer
         oConfigs = oInitConfigs
     End Sub
 End Class

GBM/Classes/XML Serialize Classes/ExportInformation.vb

@@ -1,44 +0,0 @@
-Public Class ExportInformation
-    Private dExported As Int64
-    Private iTotalConfigs As Integer
-    Private iAppVer As Integer
-
-    Property Exported As Int64
-        Set(value As Int64)
-            dExported = value
-        End Set
-        Get
-            Return dExported
-        End Get
-    End Property
-
-    Property TotalConfigurations As Integer
-        Set(value As Integer)
-            iTotalConfigs = value
-        End Set
-        Get
-            Return iTotalConfigs
-        End Get
-    End Property
-
-    Property AppVer As Integer
-        Set(value As Integer)
-            iAppVer = value
-        End Set
-        Get
-            Return iAppVer
-        End Get
-    End Property
-
-    Public Sub New()
-        dExported = 0
-        iTotalConfigs = 0
-        iAppVer = 0
-    End Sub
-
-    Public Sub New(ByVal dInitExported As Int64, ByVal iInitTotalConfigs As Integer, ByVal iInitAppVer As Integer)
-        dExported = dInitExported
-        iTotalConfigs = iInitTotalConfigs
-        iAppVer = iInitAppVer
-    End Sub
-End Class