/[xmltv_parser]/trunk/libxmltv/Core/XMLTVProgram.cs
ViewVC logotype

Diff of /trunk/libxmltv/Core/XMLTVProgram.cs

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/libxmltv/Core/XMLTVProgram.cs	2013/03/09 14:58:09	89
+++ trunk/libxmltv/Core/XMLTVProgram.cs	2013/03/09 17:42:34	90
@@ -43,79 +43,30 @@
 
         private void InternalDictionaryAddKnownProperties()
         {
-            Properties = new Dictionary<string, object>();
-            Properties.Add("Id", 0);
-            Properties.Add(XMLTVConstants.Programs.ProgramStart, new DateTime());
-            Properties.Add(XMLTVConstants.Programs.ProgramStop, new DateTime());
-            Properties.Add(XMLTVConstants.Programs.ProgramChannelId, string.Empty);
-            Properties.Add(XMLTVConstants.Programs.ProgramTitle, string.Empty);
-            Properties.Add(XMLTVConstants.Programs.ProgramSubTitle, string.Empty);
-            Properties.Add(XMLTVConstants.Programs.ProgramDescription, string.Empty);
+            Properties = new PropertyDictionary();
+            Properties.AddProperty("Id", 0);
+            Properties.AddProperty(XMLTVConstants.Programs.ProgramStart, new DateTime());
+            Properties.AddProperty(XMLTVConstants.Programs.ProgramStop, new DateTime());
+            Properties.AddProperty(XMLTVConstants.Programs.ProgramChannelId, string.Empty);
+            Properties.AddProperty(XMLTVConstants.Programs.ProgramTitle, string.Empty);
+            Properties.AddProperty(XMLTVConstants.Programs.ProgramSubTitle, string.Empty);
+            Properties.AddProperty(XMLTVConstants.Programs.ProgramDescription, string.Empty);
         }
 
-        public Dictionary<string, object> Properties { get; private set; }
-
-        private void InternalDictionaryTestOrThrow()
-        {
-            if (Properties == null) { throw new NullReferenceException("Properties collection has not been initialized."); }
-            //if (Properties.Count == 0) { throw new IndexOutOfRangeException("Properties collection has 0 elements."); }
-        }
-        private void InternalProperyExistsOrThrow(string propertyname)
-        {
-            InternalDictionaryTestOrThrow();
-            //if (!ContainsProperty(propertyname)) { throw new KeyNotFoundException(string.Format("Property '{0}' does not exist.", propertyname)); }
-        }
-
-        public void RemoveProperty(string propertyname)
-        {
-            if (ContainsProperty(propertyname))
-            {
-                Properties.Remove(propertyname);
-            }
-            else
-            {
-                throw new ArgumentException(string.Format("Property '{0}' deos not exist", propertyname), propertyname);
-            }
-        }
+        #region Property Dictionary Support
+        public PropertyDictionary Properties { get; private set; }
+        #endregion
 
-        public void AddProperty(string propertyname) { AddProperty(propertyname, new object()); }
-        public void AddProperty(string propertyname, object propertyvalue)
-        {
-            if (!ContainsProperty(propertyname))
-            {
-                Properties.Add(propertyname, propertyvalue);
-            }
-            else
-            {
-                SetProperty(propertyname, propertyvalue);
-            }
-        }
-        public bool ContainsProperty(string propertyname)
-        {
-            return Properties.ContainsKey(propertyname);
-        }
-        public object GetProperty(string propertyname)
-        {
-            InternalProperyExistsOrThrow(propertyname);
-            if (!ContainsProperty(propertyname)) { throw new KeyNotFoundException(string.Format("Property '{0}' does not exist.", propertyname)); }
-            return Properties[propertyname];            
-        }
-        public void SetProperty(string propertyname, object propertyvalue)
-        {
-            InternalProperyExistsOrThrow(propertyname);
-            if (!ContainsProperty(propertyname)) { throw new KeyNotFoundException(string.Format("Property '{0}' does not exist.", propertyname)); }
-            Properties[propertyname] = propertyvalue;
-        }
         #endregion
         public override string ToString()
         {
             return string.Format("{0}: {1} - {2} ({3}) ['{4}' <==> '{5}']",
-                GetProperty("Id").ToString(),
-                GetProperty(XMLTVConstants.Programs.ProgramTitle).ToString(),
-                GetProperty(XMLTVConstants.Programs.ProgramSubTitle).ToString(),
-                GetProperty(XMLTVConstants.Programs.ProgramChannelId).ToString(),
-                ((DateTime)GetProperty(XMLTVConstants.Programs.ProgramStart)).ToString("yyyy/MM/dd hh:mm tt"),
-                ((DateTime)GetProperty(XMLTVConstants.Programs.ProgramStop)).ToString("yyyy/MM/dd hh:mm tt"));
+                Properties["Id"].ToString(),
+                 Properties[(XMLTVConstants.Programs.ProgramTitle)].ToString(),
+                 Properties[(XMLTVConstants.Programs.ProgramSubTitle)].ToString(),
+                 Properties[(XMLTVConstants.Programs.ProgramChannelId)].ToString(),
+                ((DateTime) Properties[XMLTVConstants.Programs.ProgramStart]).ToString("yyyy/MM/dd hh:mm tt"),
+                ((DateTime) Properties[XMLTVConstants.Programs.ProgramStop]).ToString("yyyy/MM/dd hh:mm tt"));
         }
 
 
@@ -135,7 +86,7 @@
                     {
                         
                         var list = (List<IXMLTVProgram>)field.GetValue(this.GetInstance());
-                        this.SetProperty("Id", list.Count + 1);
+                        Properties["Id"] = list.Count + 1;
                         list.Add(this);
                         xmltv_logger.Verbose.Debug.WriteLine("Updating instance with program information: {0}", this.ToString());
                         field.SetValue(this.GetInstance(), list);
@@ -291,7 +242,7 @@
                 if(node == null){throw new NullReferenceException("The node instance was null");}                
                 if (node.Value != null)
                 {
-                    instance.AddProperty(XMLTVConstants.Programs.ProgramTitle, node.Value);
+                    instance.Properties.AddProperty(XMLTVConstants.Programs.ProgramTitle, node.Value);
                     xmltv_logger.Verbose.Debug.WriteLine("\tprogram_title: {0}", node.Value);
                 }                
             }
@@ -310,18 +261,18 @@
                     var start = node.Attribute(XMLTVConstants.Programs.ProgramStart);
                     var t_start = start == null ? new DateTime() : ParseDate(start.Value);
                     if (!t_start.Equals(new DateTime())) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_start: {0}", start); }
-                    instance.AddProperty(XMLTVConstants.Programs.ProgramStart, t_start);
+                    instance.Properties.AddProperty(XMLTVConstants.Programs.ProgramStart, t_start);
 
                     var stop = node.Attribute(XMLTVConstants.Programs.ProgramStop);
                     var t_stop = stop == null ? new DateTime() : ParseDate(stop.Value);
                     if (!t_stop.Equals(new DateTime())) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_stop: {0}", stop); }
-                    instance.AddProperty(XMLTVConstants.Programs.ProgramStop, t_stop);
+                    instance.Properties.AddProperty(XMLTVConstants.Programs.ProgramStop, t_stop);
 
                     var channelid = node.Attribute(XMLTVConstants.Programs.ProgramChannelId);
                     if (channelid != null)
                     {
                         if (!string.IsNullOrEmpty(channelid.Value)) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_channelid: {0}", channelid.Value); }
-                        instance.AddProperty(XMLTVConstants.Programs.ProgramChannelId, channelid.Value);
+                        instance.Properties.AddProperty(XMLTVConstants.Programs.ProgramChannelId, channelid.Value);
                     }
                     
                 }
@@ -339,7 +290,7 @@
                 if (node == null) { throw new NullReferenceException("The node instance was null"); }
                 if (node.Value != null)
                 {
-                    instance.AddProperty(XMLTVConstants.Programs.ProgramSubTitle, node.Value);
+                    instance.Properties.AddProperty(XMLTVConstants.Programs.ProgramSubTitle, node.Value);
                     xmltv_logger.Verbose.Debug.WriteLine("\tprogram_subtitle: {0}", node.Value);
                 }
             }
@@ -355,7 +306,7 @@
                 if (node == null) { throw new NullReferenceException("The node instance was null"); }
                 if (node.Value != null)
                 {
-                    instance.AddProperty(XMLTVConstants.Programs.ProgramDescription, node.Value);
+                    instance.Properties.AddProperty(XMLTVConstants.Programs.ProgramDescription, node.Value);
                     xmltv_logger.Verbose.Debug.WriteLine("\tprogram_description: {0}", node.Value);
                 }
             }

 

  ViewVC Help
Powered by ViewVC 1.1.22