--- trunk/libxmltv/Core/XMLTV_LOADER.cs	2013/03/07 10:04:58	21
+++ trunk/libxmltv/Core/XMLTVLoader.cs	2013/03/08 03:36:44	44
@@ -8,65 +8,49 @@
 using System.Xml.Linq;
 
 namespace libxmltv.Core
-{
-    /// <summary>
-    /// Main class: Creates the XMLTV Loader
-    /// </summary>
-    public static class XMLTV
+{   
+    internal class XMLTVLoader : IDisposable
     {
-        public static object CreateLoader(string xml_file)
-        {
-            XMLTV_LOGGER.Initialize();
-            XMLTV_LOADER loader = new XMLTV_LOADER(xml_file);
-            return loader;
-        }
-        public static void Test(object xmltv)
-        {
-            if (!VerifyInstance<XMLTV_LOADER>(xmltv)) { return; }
-        }
-
-
-        private static bool VerifyInstance<T>(object xmltv) where T : class
+        private string xmlfile = string.Empty;
+        internal static void CreateInstance(string xml_file, XMLTVRuntimeInstance xmltv)
         {
-            try
-            {
-                if (xmltv == null) { return false; }
-                T t = (xmltv as T);
-                if (t == null) { throw new InvalidCastException(string.Format("Unable to cast type: {0} to {1}", xmltv.GetType().Name, typeof(T).Name)); }
-                else { return true; }
-            }
-            catch (Exception ex)
-            {
-                throw new InvalidCastException(string.Format("Unable to cast type: {0} to {1}", xmltv.GetType().Name, typeof(T).Name), ex); 
-            }
+            using (XMLTVLoader g = new XMLTVLoader(xml_file, xmltv)) { }            
         }
-    }
-
-    internal class XMLTV_LOADER : IXMLTV_LOADER
-    {
-        private string xmlfile = string.Empty;
-        public XMLTV_LOADER(string xml_file)
+        private XMLTVRuntimeInstance instance;
+        protected XMLTVLoader(string xml_file, XMLTVRuntimeInstance xmltv)
         {
-            xmlfile = xml_file;
+            XMLTV_LOGGER.Log.Verbose.Debug.WriteLine("Creating Instance of XMLTVLoader");
+            //string _xmltv;
+            //if (!Internals.VerifyInstance<string>(xmltv, out _xmltv)) { return; }
+            //xmlfile = _xmltv;
+            //LoadXml();
+            instance = xmltv;
+            instance.XmlFile = new FileInfo(xml_file);
             LoadXml();
         }
-        #region IXMLTV_LOADER
-        public FileInfo XmlFile { get { return new FileInfo(xmlfile); } }
-        #endregion
+        //#region IXMLTV_LOADER
+        //public FileInfo XmlFile { get { return new FileInfo(xmlfile); } }
+        //public XDocument XmlDoc { get; private set; }
+        //#endregion
 
         private void LoadXml()
         {
-            XMLTV_LOGGER.Log.Info.WriteLine("Loading XMLTV File: {0}", XmlFile.Name);
+            XMLTV_LOGGER.Log.Info.WriteLine("Loading XMLTV File: {0}", instance.XmlFile.Name);
             //XMLTV_LOGGER.Log.Warn.WriteLine("XML File Loading has not been implemented yet!");
             try
             {
-                XDocument doc = XDocument.Load(XmlFile.FullName);
+                instance.XmlDoc = XDocument.Load(instance.XmlFile.FullName);
             }
             catch (Exception ex)
             {
-                XMLTV_LOGGER.Log.Error.WriteLine("Failed to load XMLTV File: {0}", XmlFile.Name);
+                XMLTV_LOGGER.Log.Error.WriteLine("Failed to load XMLTV File: {0}", instance.XmlFile.Name);
                 XMLTV_LOGGER.Log.Error.WriteLine(ex.GetBaseException().ToString());
             }
         }
+
+        public void Dispose()
+        {
+            //throw new NotImplementedException();
+        }
     }
 }