Skip to content

Commit 946b25b

Browse files
committed
Rename IGetOccurrences.GetOccurrences(dt) overload for getting the occurrences of a single day to GetOccurrencesOfDay() to avoid ambiguities with the other overloads.
1 parent 31d0434 commit 946b25b

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

Ical.Net.Tests/GetOccurrenceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void EnumerationChangedException()
145145

146146
var calendar = GetCalendars(ical);
147147
var date = new DateTime(2016, 10, 11);
148-
var occurrences = calendar.GetOccurrences(date).ToList();
148+
var occurrences = calendar.GetOccurrencesOfDay(date).ToList();
149149

150150
//We really want to make sure this doesn't explode
151151
Assert.That(occurrences, Has.Count.EqualTo(1));

Ical.Net.Tests/RecurrenceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3806,7 +3806,7 @@ public void GetOccurrenceShouldExcludeDtEndFloating()
38063806

38073807
var calendar = Calendar.Load(ical);
38083808
// Set start date for occurrences to search to the end date of the event
3809-
var occurrences = calendar.GetOccurrences(new CalDateTime(2024, 12, 2));
3809+
var occurrences = calendar.GetOccurrencesOfDay(new CalDateTime(2024, 12, 2));
38103810

38113811
Assert.That(occurrences, Is.Empty);
38123812
}

Ical.Net/Calendar.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,13 @@ public VTimeZone AddTimeZone(VTimeZone tz)
204204
/// </summary>
205205
/// <param name="dt">The date for which to return occurrences. Time is ignored on this parameter.</param>
206206
/// <returns>A list of occurrences that occur on the given date (<paramref name="dt"/>).</returns>
207-
public virtual IEnumerable<Occurrence> GetOccurrences(IDateTime dt)
207+
public virtual IEnumerable<Occurrence> GetOccurrencesOfDay(IDateTime dt)
208208
{
209209
return GetOccurrences<IRecurringComponent>(new CalDateTime(dt.Date), new CalDateTime(dt.Date.AddDays(1)));
210210
}
211211

212-
/// <inheritdoc cref="GetOccurrences(IDateTime)"/>
213-
public virtual IEnumerable<Occurrence> GetOccurrences(DateTime dt)
212+
/// <inheritdoc cref="GetOccurrencesOfDay(IDateTime)"/>
213+
public virtual IEnumerable<Occurrence> GetOccurrencesOfDay(DateTime dt)
214214
{
215215
return GetOccurrences<IRecurringComponent>(new CalDateTime(DateOnly.FromDateTime(dt)), new CalDateTime(DateOnly.FromDateTime(dt.Date.AddDays(1))));
216216
}
@@ -246,7 +246,7 @@ public virtual IEnumerable<Occurrence> GetOccurrences<T>(IDateTime dt) where T :
246246
return GetOccurrences<T>(new CalDateTime(dt.Date), new CalDateTime(dt.Date.AddDays(1)));
247247
}
248248

249-
/// <inheritdoc cref="GetOccurrences(IDateTime)"/>
249+
/// <inheritdoc cref="GetOccurrencesOfDay(IDateTime)"/>
250250
public virtual IEnumerable<Occurrence> GetOccurrences<T>(DateTime dt) where T : IRecurringComponent
251251
{
252252
return GetOccurrences<T>(new CalDateTime(DateOnly.FromDateTime(dt)), new CalDateTime(DateOnly.FromDateTime(dt.Date.AddDays(1))));

Ical.Net/CalendarCollection.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ public static CalendarCollection Load(TextReader tr)
3939
return collection;
4040
}
4141

42-
public HashSet<Occurrence> GetOccurrences(IDateTime dt)
42+
public HashSet<Occurrence> GetOccurrencesOfDay(IDateTime dt)
4343
{
4444
var occurrences = new HashSet<Occurrence>();
4545
foreach (var iCal in this)
4646
{
47-
occurrences.UnionWith(iCal.GetOccurrences(dt));
47+
occurrences.UnionWith(iCal.GetOccurrencesOfDay(dt));
4848
}
4949
return occurrences;
5050
}
5151

52-
public IEnumerable<Occurrence> GetOccurrences(DateTime dt)
52+
public IEnumerable<Occurrence> GetOccurrencesOfDay(DateTime dt)
5353
=> this
54-
.Select(iCal => iCal.GetOccurrences(dt))
54+
.Select(iCal => iCal.GetOccurrencesOfDay(dt))
5555
.ToArray()
5656
.OrderedMergeMany();
5757

@@ -69,7 +69,7 @@ public IEnumerable<Occurrence> GetOccurrences(DateTime? startTime, DateTime? end
6969

7070
public IEnumerable<Occurrence> GetOccurrences<T>(IDateTime dt) where T : IRecurringComponent
7171
=> this
72-
.Select(iCal => iCal.GetOccurrences(dt))
72+
.Select(iCal => iCal.GetOccurrencesOfDay(dt))
7373
.ToArray()
7474
.OrderedMergeMany();
7575

Ical.Net/CalendarComponents/RecurringComponent.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ protected override void OnDeserializing(StreamingContext context)
178178
Initialize();
179179
}
180180

181-
public virtual IEnumerable<Occurrence> GetOccurrences(IDateTime dt) => RecurrenceUtil.GetOccurrences(this, dt, EvaluationIncludesReferenceDate);
181+
public virtual IEnumerable<Occurrence> GetOccurrencesOfDay(IDateTime dt) => RecurrenceUtil.GetOccurrences(this, dt, EvaluationIncludesReferenceDate);
182182

183-
public virtual IEnumerable<Occurrence> GetOccurrences(DateTime dt)
183+
public virtual IEnumerable<Occurrence> GetOccurrencesOfDay(DateTime dt)
184184
=> RecurrenceUtil.GetOccurrences(this, new CalDateTime(dt), EvaluationIncludesReferenceDate);
185185

186186
public virtual IEnumerable<Occurrence> GetOccurrences(IDateTime startTime, IDateTime endTime)

Ical.Net/IGetOccurrences.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public interface IGetOccurrences
2424
/// </summary>
2525
/// <param name="dt">The date for which to return occurrences.</param>
2626
/// <returns>An IEnumerable that calculates and returns Periods representing the occurrences of this object in ascending order.</returns>
27-
IEnumerable<Occurrence> GetOccurrences(IDateTime dt);
27+
IEnumerable<Occurrence> GetOccurrencesOfDay(IDateTime dt);
2828

29-
IEnumerable<Occurrence> GetOccurrences(DateTime dt);
29+
IEnumerable<Occurrence> GetOccurrencesOfDay(DateTime dt);
3030

3131
/// <summary>
3232
/// Returns all occurrences of this component that overlap with the date range provided.

Ical.Net/VTimeZoneInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ public virtual IDateTime RecurrenceId
160160
set => Properties.Set("RECURRENCE-ID", value);
161161
}
162162

163-
public virtual IEnumerable<Occurrence> GetOccurrences(IDateTime dt)
163+
public virtual IEnumerable<Occurrence> GetOccurrencesOfDay(IDateTime dt)
164164
=> RecurrenceUtil.GetOccurrences(this, dt, true);
165165

166-
public virtual IEnumerable<Occurrence> GetOccurrences(DateTime dt)
166+
public virtual IEnumerable<Occurrence> GetOccurrencesOfDay(DateTime dt)
167167
=> RecurrenceUtil.GetOccurrences(this, new CalDateTime(dt), true);
168168

169169
public virtual IEnumerable<Occurrence> GetOccurrences(IDateTime startTime, IDateTime endTime)

0 commit comments

Comments
 (0)