Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Make TimeZoneInfo.AdjustmentRule fields readonly #8528

Merged
merged 1 commit into from
Dec 9, 2016
Merged

Make TimeZoneInfo.AdjustmentRule fields readonly #8528

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 43 additions & 37 deletions src/mscorlib/src/System/TimeZoneInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4498,13 +4498,13 @@ sealed public class AdjustmentRule : IEquatable<AdjustmentRule>, ISerializable,
{

// ---- SECTION: members supporting exposed properties -------------*
private DateTime m_dateStart;
private DateTime m_dateEnd;
private TimeSpan m_daylightDelta;
private TransitionTime m_daylightTransitionStart;
private TransitionTime m_daylightTransitionEnd;
private TimeSpan m_baseUtcOffsetDelta; // delta from the default Utc offset (utcOffset = defaultUtcOffset + m_baseUtcOffsetDelta)
private bool m_noDaylightTransitions;
private readonly DateTime m_dateStart;
private readonly DateTime m_dateEnd;
private readonly TimeSpan m_daylightDelta;
private readonly TransitionTime m_daylightTransitionStart;
private readonly TransitionTime m_daylightTransitionEnd;
private readonly TimeSpan m_baseUtcOffsetDelta; // delta from the default Utc offset (utcOffset = defaultUtcOffset + m_baseUtcOffsetDelta)
private readonly bool m_noDaylightTransitions;

// ---- SECTION: public properties --------------*
public DateTime DateStart {
Expand Down Expand Up @@ -4592,33 +4592,29 @@ public override int GetHashCode() {

// -------- SECTION: constructors -----------------*

private AdjustmentRule() { }


// -------- SECTION: factory methods -----------------*

static internal AdjustmentRule CreateAdjustmentRule(
DateTime dateStart,
DateTime dateEnd,
TimeSpan daylightDelta,
TransitionTime daylightTransitionStart,
TransitionTime daylightTransitionEnd,
bool noDaylightTransitions) {
private AdjustmentRule(
DateTime dateStart,
DateTime dateEnd,
TimeSpan daylightDelta,
TransitionTime daylightTransitionStart,
TransitionTime daylightTransitionEnd,
TimeSpan baseUtcOffsetDelta,
bool noDaylightTransitions)
{
ValidateAdjustmentRule(dateStart, dateEnd, daylightDelta,
daylightTransitionStart, daylightTransitionEnd, noDaylightTransitions);

AdjustmentRule rule = new AdjustmentRule();
m_dateStart = dateStart;
m_dateEnd = dateEnd;
m_daylightDelta = daylightDelta;
m_daylightTransitionStart = daylightTransitionStart;
m_daylightTransitionEnd = daylightTransitionEnd;
m_baseUtcOffsetDelta = baseUtcOffsetDelta;
m_noDaylightTransitions = noDaylightTransitions;
}

rule.m_dateStart = dateStart;
rule.m_dateEnd = dateEnd;
rule.m_daylightDelta = daylightDelta;
rule.m_daylightTransitionStart = daylightTransitionStart;
rule.m_daylightTransitionEnd = daylightTransitionEnd;
rule.m_baseUtcOffsetDelta = TimeSpan.Zero;
rule.m_noDaylightTransitions = noDaylightTransitions;

return rule;
}
// -------- SECTION: factory methods -----------------*

static public AdjustmentRule CreateAdjustmentRule(
DateTime dateStart,
Expand All @@ -4627,8 +4623,14 @@ static public AdjustmentRule CreateAdjustmentRule(
TransitionTime daylightTransitionStart,
TransitionTime daylightTransitionEnd)
{
return CreateAdjustmentRule(dateStart, dateEnd, daylightDelta,
daylightTransitionStart, daylightTransitionEnd, noDaylightTransitions: false);
return new AdjustmentRule(
dateStart,
dateEnd,
daylightDelta,
daylightTransitionStart,
daylightTransitionEnd,
baseUtcOffsetDelta: TimeSpan.Zero,
noDaylightTransitions: false);
}

static internal AdjustmentRule CreateAdjustmentRule(
Expand All @@ -4638,12 +4640,16 @@ static internal AdjustmentRule CreateAdjustmentRule(
TransitionTime daylightTransitionStart,
TransitionTime daylightTransitionEnd,
TimeSpan baseUtcOffsetDelta,
bool noDaylightTransitions) {
AdjustmentRule rule = CreateAdjustmentRule(dateStart, dateEnd, daylightDelta,
daylightTransitionStart, daylightTransitionEnd, noDaylightTransitions);

rule.m_baseUtcOffsetDelta = baseUtcOffsetDelta;
return rule;
bool noDaylightTransitions)
{
return new AdjustmentRule(
dateStart,
dateEnd,
daylightDelta,
daylightTransitionStart,
daylightTransitionEnd,
baseUtcOffsetDelta,
noDaylightTransitions);
}

// ----- SECTION: internal utility methods ----------------*
Expand Down