Merge pull request #281 from rianjs/AddRangeExtensions

PeriodList now implements IList<IPeriod> #280
ical-org · May 2, 2017 · 0883dd1 · 0883dd1
2 parents 895eeff + 7ba8fa0
commit 0883dd1
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 55 deletions.
diff --git a/net-core/Ical.Net/Ical.Net/DataTypes/PeriodList.cs b/net-core/Ical.Net/Ical.Net/DataTypes/PeriodList.cs
@@ -49,19 +49,7 @@ public override void CopyFrom(ICopyable obj)
 
         public override string ToString() => new PeriodListSerializer().SerializeToString(this);
 
-        public virtual void Add(IDateTime dt) => Periods.Add(new Period(dt));
-
-        public Period this[int index]
-        {
-            get { return Periods[index]; }
-            set { Periods[index] = value; }
-        }
-
-        public virtual void Add(Period item) => Periods.Add(item);
-
-        public IEnumerator<Period> GetEnumerator() => Periods.GetEnumerator();
-
-        IEnumerator IEnumerable.GetEnumerator() => Periods.GetEnumerator();
+        public void Add(IDateTime dt) => Periods.Add(new Period(dt));
 
         public static Dictionary<string, List<Period>> GetGroupedPeriods(IList<PeriodList> periodLists)
         {
@@ -118,32 +106,21 @@ public override int GetHashCode()
             }
         }
 
-        public void Clear()
-        {
-            Periods.Clear();
-        }
-
-        public bool Contains(Period item) => Periods.Contains(item);
-
-        public void CopyTo(Period[] array, int arrayIndex)
+        public Period this[int index]
         {
-            Periods.CopyTo(array, arrayIndex);
+            get => Periods[index];
+            set => Periods[index] = value;
         }
 
         public bool Remove(Period item) => Periods.Remove(item);
-
-        public bool IsReadOnly => Periods.IsReadOnly;
-
         public int IndexOf(Period item) => Periods.IndexOf(item);
-
-        public void Insert(int index, Period item)
-        {
-            Periods.Insert(index, item);
-        }
-
-        public void RemoveAt(int index)
-        {
-            Periods.RemoveAt(index);
-        }
+        public void Insert(int index, Period item) => Periods.Insert(index, item);
+        public void RemoveAt(int index) => Periods.RemoveAt(index);
+        public void Add(Period item) => Periods.Add(item);
+        public void Clear() => Periods.Clear();
+        public bool Contains(Period item) => Periods.Contains(item);
+        public void CopyTo(Period[] array, int arrayIndex) => Periods.CopyTo(array, arrayIndex);
+        public IEnumerator<Period> GetEnumerator() => Periods.GetEnumerator();
+        IEnumerator IEnumerable.GetEnumerator() => Periods.GetEnumerator();
     }
 }
diff --git a/release-notes.md b/release-notes.md
@@ -14,6 +14,7 @@ A listing of what each [Nuget package](https://www.nuget.org/packages/Ical.Net)
 
 ### v2
 
+* 2.3.0: PeriodList now implements `IList` [#280](https://github.com/rianjs/ical.net/issues/280)
 * 2.2.39: Bugfix: Better CalDateTime equality and hashing, because time zones matter. [#275](https://github.com/rianjs/ical.net/issues/275)
 * 2.2.38: Bugfix: Fixed a small ordering bug when evaluating `EXDATE`s and `RDATE`s [#275](https://github.com/rianjs/ical.net/issues/275)
 * 2.2.37: Bugfix: `Event`'s `Equals()` and `GetHashCode()` were buggy in that they did not consider `RecurrenceDates` and `ExceptionDates` properly. Both methods treated these properties as if they were a single collection. Now they are normalized by time zone when before determining whether complete set of `RDATE`s or `EXDATE`s are the same. [#275](https://github.com/rianjs/ical.net/issues/275)

diff --git a/v2/Ical.Net.nuspec b/v2/Ical.Net.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Ical.Net</id>
-        <version>2.2.39</version>
+        <version>2.3.0</version>
         <title>Ical.Net</title>
         <authors>Rian Stockbower, Douglas Day, M. David Peterson</authors>
         <owners>Rian Stockbower</owners>

diff --git a/v2/ical.NET/DataTypes/PeriodList.cs b/v2/ical.NET/DataTypes/PeriodList.cs
@@ -14,10 +14,12 @@ namespace Ical.Net.DataTypes
     /// <summary>
     /// An iCalendar list of recurring dates (or date exclusions)
     /// </summary>
-    public class PeriodList : EncodableDataType, IPeriodList
+    public class PeriodList : EncodableDataType, IPeriodList, IList<IPeriod>
     {
         public string TzId { get; set; }
+
         public int Count => Periods.Count;
+        public bool IsReadOnly => Periods.IsReadOnly;
 
         protected IList<IPeriod> Periods { get; set; } = new List<IPeriod>();
 
@@ -49,19 +51,7 @@ public override void CopyFrom(ICopyable obj)
 
         public override string ToString() => new PeriodListSerializer().SerializeToString(this);
 
-        public virtual void Add(IDateTime dt) => Periods.Add(new Period(dt));
-
-        public IPeriod this[int index]
-        {
-            get { return Periods[index]; }
-            set { Periods[index] = value; }
-        }
-
-        public virtual void Add(IPeriod item) => Periods.Add(item);
-
-        public IEnumerator<IPeriod> GetEnumerator() => Periods.GetEnumerator();
-
-        IEnumerator IEnumerable.GetEnumerator() => Periods.GetEnumerator();
+        public void Add(IDateTime dt) => Periods.Add(new Period(dt));
 
         public static Dictionary<string, List<Period>> GetGroupedPeriods(IList<IPeriodList> periodLists)
         {
@@ -98,7 +88,7 @@ public static Dictionary<string, List<Period>> GetGroupedPeriods(IList<IPeriodLi
         protected bool Equals(PeriodList other)
         {
             return string.Equals(TzId, other.TzId, StringComparison.OrdinalIgnoreCase)
-                && CollectionHelpers.Equals(Periods, other.Periods);
+                   && CollectionHelpers.Equals(Periods, other.Periods);
         }
 
         public override bool Equals(object obj)
@@ -117,5 +107,22 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
+
+        public IPeriod this[int index]
+        {
+            get => Periods[index];
+            set => Periods[index] = value;
+        }
+
+        public bool Remove(IPeriod item) => Periods.Remove(item);
+        public int IndexOf(IPeriod item) => Periods.IndexOf(item);
+        public void Insert(int index, IPeriod item) => Periods.Insert(index, item);
+        public void RemoveAt(int index) => Periods.RemoveAt(index);
+        public void Add(IPeriod item) => Periods.Add(item);
+        public void Clear() => Periods.Clear();
+        public bool Contains(IPeriod item) => Periods.Contains(item);
+        public void CopyTo(IPeriod[] array, int arrayIndex) => Periods.CopyTo(array, arrayIndex);
+        public IEnumerator<IPeriod> GetEnumerator() => Periods.GetEnumerator();
+        IEnumerator IEnumerable.GetEnumerator() => Periods.GetEnumerator();
     }
 }
diff --git a/v2/ical.NET/Interfaces/DataTypes/IPeriodList.cs b/v2/ical.NET/Interfaces/DataTypes/IPeriodList.cs
@@ -2,12 +2,9 @@
 
 namespace Ical.Net.Interfaces.DataTypes
 {
-    public interface IPeriodList : IEncodableDataType, IEnumerable<IPeriod>
+    public interface IPeriodList : IEncodableDataType, IList<IPeriod>
     {
         string TzId { get; }
-        IPeriod this[int index] { get; }
         void Add(IDateTime dt);
-        void Add(IPeriod item);
-        int Count { get; }
     }
 }