[ros-diffs] [gedmurphy] 32000: better class placement

Author: gedmurphy
Date: Fri Jan 25 20:21:25 2008
New Revision: 32000

URL: http://svn.reactos.org/svn/reactos?rev=32000&view=rev
Log:
better class placement

Modified:
    trunk/tools/RosTE/GUI/ConfigHandler.cs
    trunk/tools/RosTE/GUI/MainForm.cs
    trunk/tools/RosTE/GUI/VirtualMachine.cs

Modified: trunk/tools/RosTE/GUI/ConfigHandler.cs
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConfigHandler.cs?r…
==============================================================================
--- trunk/tools/RosTE/GUI/ConfigHandler.cs (original)
+++ trunk/tools/RosTE/GUI/ConfigHandler.cs Fri Jan 25 20:21:25 2008
@@ -7,12 +7,12 @@
 
 namespace RosTEGUI
 {
-    public struct VirtMach
+    public struct MainVmInfo
     {
         public int id;
         public string path;
 
-        public VirtMach(int idIn, string pathIn)
+        public MainVmInfo(int idIn, string pathIn)
         {
             id = idIn;
             path = pathIn;
@@ -29,7 +29,7 @@
         private int updateSched;
         private bool appDebug;
 
-        List<VirtMach> virtMachs = null;
+        List<MainVmInfo> virtMachs = null;
 
         #region properties
         public string QemuPath
@@ -64,9 +64,9 @@
         #endregion
 
         #region virtmach element
-        public string GetExistingImage(int index)
-        {
-            foreach (VirtMach vm in virtMachs)
+        public string GetImagePath(int index)
+        {
+            foreach (MainVmInfo vm in virtMachs)
             {
                 if (vm.id == index)
                     return vm.path;
@@ -83,14 +83,14 @@
             {
                 if (virtMachs == null)
                 {
-                    virtMachs = new List<VirtMach>();
+                    virtMachs = new List<MainVmInfo>();
                 }
 
                 try
                 {
                     foreach (DataRow dr in dataSet.Tables["VirtMach"].Rows)
                     {
-                        virtMachs.Add(new VirtMach((int)dr["VMConfigID"],
(string)dr["Path"]));
+                        virtMachs.Add(new MainVmInfo((int)dr["VMConfigID"],
(string)dr["Path"]));
                     }
 
                     bRet = true;
@@ -113,7 +113,7 @@
                     DataTable virtMachTable = dataSet.Tables["VirtMach"];
                     virtMachTable.Clear();
 
-                    foreach (VirtMach vm in virtMachs)
+                    foreach (MainVmInfo vm in virtMachs)
                     {
                         DataRow dr = virtMachTable.NewRow();
                         dr["VMConfigID"] = vm.id;
@@ -134,7 +134,7 @@
             if (dataSet != null && virtMachs != null)
             {
                 int id = virtMachs.Count;
-                virtMachs.Add(new VirtMach(id, pathIn));
+                virtMachs.Add(new MainVmInfo(id, pathIn));
             }
 
             return virtMachs.Count;
@@ -144,7 +144,7 @@
         {
             bool bRet = false;
 
-            foreach (VirtMach vm in virtMachs)
+            foreach (MainVmInfo vm in virtMachs)
             {
                 if (vm.id == index)
                 {
@@ -341,4 +341,215 @@
         }
         #endregion
     }
+
+
+    public struct VirtMachInfo
+    {
+        public int virtMachID;
+        public string name;
+        public string machType;
+        public string defDir;
+        public int memSize;
+        public bool setClockToHost;
+        public bool cdRomEnable;
+        public bool cdRomUsePhys;
+        public string cdRomPhysDrv;
+        public bool cdRomUseIso;
+        public string cdRomIsoImg;
+        public bool floppyEnable;
+        public bool floppyUsePhys;
+        public string floppyPhysDrv;
+        public bool floppyUseImg;
+        public string floppyIsoImg;
+    }
+
+    public class VirtMachConfig
+    {
+        private DataSet dataSet = null;
+        private List<VirtMachInfo> virtMachInfo = null;
+
+        public List<VirtMachInfo> VMInfo
+        {
+            get { return virtMachInfo; }
+        }
+
+        public bool LoadVmSettings()
+        {
+            bool bRet = false;
+
+            if (dataSet != null)
+            {
+                if (virtMachInfo == null)
+                {
+                    virtMachInfo = new List<VirtMachInfo>();
+                }
+
+                try
+                {
+                    foreach (DataRow vmRow in dataSet.Tables["VMConfig"].Rows)
+                    {
+                        VirtMachInfo vmi = new VirtMachInfo();
+                        vmi.virtMachID = (int)vmRow["VirtMachID"];
+                        vmi.name = (string)vmRow["Name"];
+                        vmi.machType = (string)vmRow["MachType"];
+                        vmi.defDir = (string)vmRow["DefDir"];
+                        vmi.memSize = (int)vmRow["MemSize"];
+                        vmi.setClockToHost = (bool)vmRow["SetClockToHost"];
+                        vmi.cdRomEnable = (bool)vmRow["CdRomEnable"];
+                        vmi.cdRomUsePhys = (bool)vmRow["CdRomUsePhys"];
+                        vmi.cdRomPhysDrv = (string)vmRow["CdRomPhysDrv"];
+                        vmi.cdRomUseIso = (bool)vmRow["CdRomUseIso"];
+                        vmi.cdRomIsoImg = (string)vmRow["CdRomIsoImg"];
+                        vmi.floppyEnable = (bool)vmRow["FloppyEnable"];
+                        vmi.floppyUsePhys = (bool)vmRow["FloppyUsePhys"];
+                        vmi.floppyPhysDrv = (string)vmRow["FloppyPhysDrv"];
+                        vmi.floppyUseImg = (bool)vmRow["FloppyUseImg"];
+                        vmi.floppyIsoImg = (string)vmRow["FloppyIsoImg"];
+
+                        virtMachInfo.Add(vmi);
+                    }
+
+                    bRet = true;
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogMessage("error loading VM config", ex.Message,
ex.StackTrace, true);
+                }
+            }
+
+            return bRet;
+        }
+
+        public void SaveVmSettings()
+        {
+            if (dataSet != null)
+            {
+                dataSet.Tables["VirtMach"].Rows.Clear();
+
+                try
+                {
+                    foreach (VirtMachInfo vmi in virtMachInfo)
+                    {
+                        DataRow vmRow = dataSet.Tables["VirtMach"].NewRow();
+
+                        vmRow["VirtMachID"] = vmi.virtMachID;
+                        vmRow["Name"] = vmi.name;
+                        vmRow["MachType"] = vmi.machType;
+                        vmRow["DefDir"] = vmi.defDir;
+                        vmRow["MemSize"] = vmi.memSize;
+                        vmRow["SetClockToHost"] = vmi.setClockToHost;
+                        vmRow["CdRomEnable"] = vmi.cdRomEnable;
+                        vmRow["CdRomUsePhys"] = vmi.cdRomUsePhys;
+                        vmRow["CdRomPhysDrv"] = vmi.cdRomPhysDrv;
+                        vmRow["CdRomUseIso"] = vmi.cdRomUseIso;
+                        vmRow["CdRomIsoImg"] = vmi.cdRomIsoImg;
+                        vmRow["FloppyEnable"] = vmi.floppyEnable;
+                        vmRow["FloppyUsePhys"] = vmi.floppyUsePhys;
+                        vmRow["FloppyPhysDrv"] = vmi.floppyPhysDrv;
+                        vmRow["FloppyUseImg"] = vmi.floppyUseImg;
+                        vmRow["FloppyIsoImg"] = vmi.floppyIsoImg;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogMessage("error loading VM config", ex.Message,
ex.StackTrace, true);
+                }
+            }
+        }
+
+
+        public bool LoadVMConfig(string path)
+        {
+            XmlTextReader xtr = null;
+            string fileName = path + "\\Config.xml";
+            bool ret = false;
+
+            if (LoadVirtMachSchema())
+            {
+                if (File.Exists(fileName))
+                {
+                    try
+                    {
+                        FileStream fs = new FileStream(fileName, FileMode.Open,
FileAccess.Read);
+                        xtr = new XmlTextReader(fs);
+                        dataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema);
+                        xtr.Close();
+                        ret = true;
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.LogMessage("error loading VM config", ex.Message,
ex.StackTrace, true);
+                    }
+                    finally
+                    {
+                        if (xtr != null)
+                            xtr.Close();
+                    }
+                }
+            }
+
+            return ret;
+        }
+
+        public void SaveVMConfig(string path)
+        {
+            XmlTextWriter xtw = null;
+            string fileName = path + "\\Config.xml";
+
+            if (!Directory.Exists(fileName))
+                Directory.CreateDirectory(fileName);
+
+            if (dataSet == null)
+            {
+                if (!LoadVirtMachSchema())
+                    return;
+            }
+
+            try
+            {
+                FileStream fs = new FileStream(fileName, FileMode.Create,
FileAccess.Write);
+                xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode);
+                dataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogMessage("error saving VM config", ex.Message,
ex.StackTrace, true);
+            }
+            finally
+            {
+                if (xtw != null)
+                    xtw.Close();
+            }
+        }
+
+        private bool LoadVirtMachSchema()
+        {
+            XmlTextReader xtr = null;
+            string filename = "VMConfig.xsd";
+            bool ret = false;
+
+            dataSet = new DataSet();
+            if (File.Exists(filename))
+            {
+                try
+                {
+                    FileStream fs = new FileStream(filename, FileMode.Open,
FileAccess.Read);
+                    xtr = new XmlTextReader(fs);
+                    dataSet.ReadXmlSchema(xtr);
+                    ret = true;
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogMessage("error loading VM config schema",
ex.Message, ex.StackTrace, true);
+                }
+                finally
+                {
+                    if (xtr != null)
+                        xtr.Close();
+                }
+            }
+
+            return ret;
+        }
+    }
 }

Modified: trunk/tools/RosTE/GUI/MainForm.cs
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=32…
==============================================================================
--- trunk/tools/RosTE/GUI/MainForm.cs (original)
+++ trunk/tools/RosTE/GUI/MainForm.cs Fri Jan 25 20:21:25 2008
@@ -7,7 +7,7 @@
 using System.IO;
 using System.Xml.Serialization;
 using Microsoft.Win32;
-
+using System.Collections.Generic;
 
 namespace RosTEGUI
 {
@@ -39,15 +39,21 @@
             int num = mainConf.GetNumberOfVms();
             for (int i = 0; i < num; i++)
             {
-                string image = mainConf.GetExistingImage(i);
-                VirtualMachine vm = new VirtualMachine();
-                if (vm.LoadVMConfig(image))
-                {
-                    vm.LoadVmSettings();
-
-                    ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0);
-                    lvi.SubItems.Add(vm.MemSize.ToString() + " MB");
-                    lvi.Tag = vm;
+                string path = mainConf.GetImagePath(i);
+                VirtMachConfig vmConfig = new VirtMachConfig();
+                if (vmConfig.LoadVMConfig(path))
+                {
+                    if (vmConfig.LoadVmSettings())
+                    {
+                        foreach (VirtMachInfo vmInfo in vmConfig.VMInfo)
+                        {
+                            VirtualMachine vm = new VirtualMachine();
+
+                            ListViewItem lvi =
VirtMachListView.Items.Add(vmConfig.ToString(), 0);
+                            lvi.SubItems.Add(vm.MemSize.ToString() + " MB");
+                            lvi.Tag = vm;
+                        }
+                    }
                 }
             }
         }
@@ -178,8 +184,8 @@
         {
             foreach(ListViewItem lvi in VirtMachListView.Items)
             {
-                VirtualMachine vm = (VirtualMachine)lvi.Tag;
-                vm.SaveVMConfig();
+                VirtMachConfig vm = (VirtMachConfig)lvi.Tag;
+                vm.SaveVMConfig("err");
             }
 
             mainConf.SaveSettings();

Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?…
==============================================================================
--- trunk/tools/RosTE/GUI/VirtualMachine.cs (original)
+++ trunk/tools/RosTE/GUI/VirtualMachine.cs Fri Jan 25 20:21:25 2008
@@ -9,27 +9,6 @@
 
 namespace RosTEGUI
 {
-    public struct VirtMachInfo
-    {
-        public int virtMachID;
-        public string name;
-        public string machType;
-        public string defDir;
-        public int memSize;
-        public bool setClockToHost;
-        public bool cdRomEnable;
-        public bool cdRomUsePhys;
-        public string cdRomPhysDrv;
-        public bool cdRomUseIso;
-        public string cdRomIsoImg;
-        public bool floppyEnable;
-        public bool floppyUsePhys;
-        public string floppyPhysDrv;
-        public bool floppyUseImg;
-        public string floppyIsoImg;
-    }
-
-
     public class VMHardDrive
     {
         private DataRow hdDataRow;
@@ -133,15 +112,9 @@
     public class VirtualMachine
     {
         private DataRow vmDataRow;
-        private List<VirtMachInfo> virtMachInfo = null;
+        
         private ArrayList hardDrives;
         private ArrayList netCards;
-        private DataSet dataSet = null;
-
-        public DataSet DataSet
-        {
-            get { return dataSet; }
-        }
 
         #region Virtual machine properties
 
@@ -335,54 +308,7 @@
                                         string existImg,
                                         int memSize)
         {
-            DataRow netDataRow;
             bool ret = false;
-
-            try
-            {
-                DataTable vmdt = dataSet.Tables["VMConfig"];
-                vmDataRow = vmdt.NewRow();
-                vmDataRow["VirtMachID"] = vmdt.Rows.Count + 1;
-                vmDataRow["Name"] = name;
-                vmDataRow["MachType"] = "pc";
-                vmDataRow["DefDir"] = dir;
-                vmDataRow["MemSize"] = memSize;
-                vmDataRow["SetClockToHost"] = true;
-                vmDataRow["CdRomEnable"] = true;
-                vmDataRow["CdRomUsePhys"] = true;
-                vmDataRow["CdRomPhysDrv"] = string.Empty;
-                vmDataRow["CdRomUseIso"] = false;
-                vmDataRow["CdRomIsoImg"] = string.Empty;
-                vmDataRow["FloppyEnable"] = true;
-                vmDataRow["FloppyUsePhys"] = true;
-                vmDataRow["FloppyPhysDrv"] = string.Empty;
-                vmDataRow["FloppyUseImg"] = false;
-                vmDataRow["FloppyIsoImg"] = string.Empty;
-                vmdt.Rows.Add(vmDataRow);
-
-                VMHardDrive vmhd = new VMHardDrive();
-                vmhd.CreateHardDrive("Main Drive", "hda", dir, 768,
true);
-                hardDrives.Add(vmhd);
-
-                DataTable netdt = dataSet.Tables["NetCards"];
-                netDataRow = netdt.NewRow();
-                netDataRow["CardID"] = netdt.Rows.Count + 1;
-                netDataRow["VirtMachID"] = vmDataRow["VirtMachID"];
-                netDataRow["Option"] = "user";
-                netDataRow["Vlan"] = 0;
-                netDataRow["MacAddr"] = string.Empty;
-                netDataRow["Model"] = string.Empty;
-                netDataRow["Hostname"] = string.Empty;
-                netdt.Rows.Add(netDataRow);
-                netCards.Add(netDataRow);
-
-                ret = true;
-            }
-            catch (Exception e)
-            {
-                string message = "Failed to populate database";
-                Debug.LogMessage(message, e.Message, e.StackTrace, true);
-            }
 
             return ret;
         }
@@ -476,185 +402,5 @@
         {
             return hardDrives;
         }
-
-
-        public bool LoadVmSettings()
-        {
-            bool bRet = false;
-
-            if (dataSet != null)
-            {
-                if (virtMachInfo == null)
-                {
-                    virtMachInfo = new List<VirtMachInfo>();
-                }
-
-                try
-                {
-                    foreach (DataRow vmRow in dataSet.Tables["VMConfig"].Rows)
-                    {
-                        VirtMachInfo vmi = new VirtMachInfo();
-                        vmi.virtMachID = (int)vmRow["VirtMachID"];
-                        vmi.name = (string)vmRow["Name"];
-                        vmi.machType = (string)vmRow["MachType"];
-                        vmi.defDir = (string)vmRow["DefDir"];
-                        vmi.memSize = (int)vmRow["MemSize"];
-                        vmi.setClockToHost = (bool)vmRow["SetClockToHost"];
-                        vmi.cdRomEnable = (bool)vmRow["CdRomEnable"];
-                        vmi.cdRomUsePhys = (bool)vmRow["CdRomUsePhys"];
-                        vmi.cdRomPhysDrv = (string)vmRow["CdRomPhysDrv"];
-                        vmi.cdRomUseIso = (bool)vmRow["CdRomUseIso"];
-                        vmi.cdRomIsoImg = (string)vmRow["CdRomIsoImg"];
-                        vmi.floppyEnable = (bool)vmRow["FloppyEnable"];
-                        vmi.floppyUsePhys = (bool)vmRow["FloppyUsePhys"];
-                        vmi.floppyPhysDrv = (string)vmRow["FloppyPhysDrv"];
-                        vmi.floppyUseImg = (bool)vmRow["FloppyUseImg"];
-                        vmi.floppyIsoImg = (string)vmRow["FloppyIsoImg"];
-
-                        virtMachInfo.Add(vmi);
-                    }
-
-                    bRet = true;
-                }
-                catch (Exception ex)
-                {
-                    Debug.LogMessage("error loading VM config", ex.Message,
ex.StackTrace, true);
-                }
-            }
-
-            return bRet;
-        }
-
-        public void SaveVmSettings()
-        {
-            if (dataSet != null)
-            {
-                dataSet.Tables["VirtMach"].Rows.Clear();
-
-                try
-                {
-                    foreach (VirtMachInfo vmi in virtMachInfo)
-                    {
-                        DataRow vmRow = dataSet.Tables["VirtMach"].NewRow();
-
-                        vmRow["VirtMachID"] = vmi.virtMachID;
-                        vmRow["Name"] = vmi.name;
-                        vmRow["MachType"] = vmi.machType;
-                        vmRow["DefDir"] = vmi.defDir;
-                        vmRow["MemSize"] = vmi.memSize;
-                        vmRow["SetClockToHost"] = vmi.setClockToHost;
-                        vmRow["CdRomEnable"] = vmi.cdRomEnable;
-                        vmRow["CdRomUsePhys"] = vmi.cdRomUsePhys;
-                        vmRow["CdRomPhysDrv"] = vmi.cdRomPhysDrv;
-                        vmRow["CdRomUseIso"] = vmi.cdRomUseIso;
-                        vmRow["CdRomIsoImg"] = vmi.cdRomIsoImg;
-                        vmRow["FloppyEnable"] = vmi.floppyEnable;
-                        vmRow["FloppyUsePhys"] = vmi.floppyUsePhys;
-                        vmRow["FloppyPhysDrv"] = vmi.floppyPhysDrv;
-                        vmRow["FloppyUseImg"] = vmi.floppyUseImg;
-                        vmRow["FloppyIsoImg"] = vmi.floppyIsoImg;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Debug.LogMessage("error loading VM config", ex.Message,
ex.StackTrace, true);
-                }
-            }
-        }
-
-
-        public bool LoadVMConfig(string path)
-        {
-            XmlTextReader xtr = null;
-            string fileName = path + "\\Config.xml";
-            bool ret = false;
-
-            if (LoadVirtMachSchema())
-            {
-                if (File.Exists(fileName))
-                {
-                    try
-                    {
-                        FileStream fs = new FileStream(fileName, FileMode.Open,
FileAccess.Read);
-                        xtr = new XmlTextReader(fs);
-                        dataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema);
-                        xtr.Close();
-                        ret = true;
-                    }
-                    catch (Exception ex)
-                    {
-                        Debug.LogMessage("error loading VM config", ex.Message,
ex.StackTrace, true);
-                    }
-                    finally
-                    {
-                        if (xtr != null)
-                            xtr.Close();
-                    }
-                }
-            }
-
-            return ret;
-        }
-
-        public void SaveVMConfig()
-        {
-            XmlTextWriter xtw = null;
-            string fileName = DefDir + "\\Config.xml";
-
-            if (!Directory.Exists(DefDir))
-                Directory.CreateDirectory(DefDir);
-
-            if (dataSet == null)
-            {
-                if (!LoadVirtMachSchema())
-                    return;
-            }
-
-            try
-            {
-                FileStream fs = new FileStream(fileName, FileMode.Create,
FileAccess.Write);
-                xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode);
-                dataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema);
-            }
-            catch (Exception ex)
-            {
-                Debug.LogMessage("error saving VM config", ex.Message,
ex.StackTrace, true);
-            }
-            finally
-            {
-                if (xtw != null)
-                    xtw.Close();
-            }
-        }
-
-        private bool LoadVirtMachSchema()
-        {
-            XmlTextReader xtr = null;
-            string filename = "VMConfig.xsd";
-            bool ret = false;
-
-            dataSet = new DataSet();
-            if (File.Exists(filename))
-            {
-                try
-                {
-                    FileStream fs = new FileStream(filename, FileMode.Open,
FileAccess.Read);
-                    xtr = new XmlTextReader(fs);
-                    dataSet.ReadXmlSchema(xtr);
-                    ret = true;
-                }
-                catch (Exception ex)
-                {
-                    Debug.LogMessage("error loading VM config schema",
ex.Message, ex.StackTrace, true);
-                }
-                finally
-                {
-                    if (xtr != null)
-                        xtr.Close();
-                }
-            }
-
-            return ret;
-        }
     }
 }