Skip to content

Commit 2fea034

Browse files
Mark interfaces that utilize the NZ4Net OlsonTimezone class as obsolete.
1 parent 4b2b2fb commit 2fea034

File tree

6 files changed

+19
-4
lines changed

6 files changed

+19
-4
lines changed

dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public interface IGxContext
7070
void DisableSpaRequest();
7171
String AjaxCmpContent { get; set; }
7272
bool isCloseCommand { get; }
73+
[Obsolete("GetOlsonTimeZone is deprecated. Use GetTimeZone() instead", false)]
7374
OlsonTimeZone GetOlsonTimeZone();
7475
String GetTimeZone();
7576
Boolean SetTimeZone(String sTZ);
@@ -3507,7 +3508,7 @@ public string GetLanguageProperty(String propName)
35073508
}
35083509

35093510
internal static string GX_REQUEST_TIMEZONE = "GxTZOffset";
3510-
3511+
[Obsolete("ClientTimeZone is deprecated. Use GxContext.GetTimeZone() instead", false)]
35113512
public OlsonTimeZone ClientTimeZone
35123513
{
35133514
get
@@ -3575,6 +3576,7 @@ internal string ClientTimeZoneId
35753576
return _currentTimeZoneId;
35763577
}
35773578
}
3579+
[Obsolete("GetOlsonTimeZone is deprecated. Use GetTimeZone() instead", false)]
35783580
public OlsonTimeZone GetOlsonTimeZone()
35793581
{
35803582
return TimeZoneUtil.GetInstanceFromOlsonName(GetTimeZone());

dotnet/src/dotnetframework/GxClasses/Core/GXUtils.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public static bool Val(string valString)
8282

8383
public class TimeZoneUtil
8484
{
85+
[Obsolete("GetInstanceFromWin32Id is deprecated.", false)]
8586
public static OlsonTimeZone GetInstanceFromWin32Id(string sTZ)
8687
{
8788
lock (OlsonTimeZone.SyncRoot)
@@ -96,7 +97,7 @@ public static OlsonTimeZone GetInstanceFromWin32Id(string sTZ)
9697
}
9798
}
9899
}
99-
100+
[Obsolete("GetInstanceFromOlsonName is deprecated.", false)]
100101
public static OlsonTimeZone GetInstanceFromOlsonName(string sTZ)
101102
{
102103
lock (OlsonTimeZone.SyncRoot)

dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3191,7 +3191,7 @@ private static DateTime ConvertDateTime(DateTime dt, OlsonTimeZone FromTimezone,
31913191
}
31923192
return dtconverted.AddMilliseconds(milliSeconds);
31933193
}
3194-
3194+
[Obsolete("Local2DBserver is deprecated. Use Local2DBserver(DateTime dt, string clientTimezone) instead.", false)]
31953195
public static DateTime Local2DBserver(DateTime dt, OlsonTimeZone ClientTimezone)
31963196
{
31973197
try
@@ -3209,6 +3209,7 @@ public static DateTime Local2DBserver(DateTime dt, OlsonTimeZone ClientTimezone)
32093209
throw ex;
32103210
}
32113211
}
3212+
[Obsolete("DBserver2local is deprecated. Use DBserver2local(DateTime dt, string clientTimezone) instead.", false)]
32123213
public static DateTime DBserver2local(DateTime dt, OlsonTimeZone ClientTimezone)
32133214
{
32143215
try

dotnet/src/dotnetframework/GxClasses/Data/GXDataADO.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ public class GxConnection: IGxConnection
387387
private string lastSQLStatement;
388388
private string lastObject;
389389
private bool lastSqlStatementEnded;
390-
390+
[Obsolete("ClientTimeZone is deprecated. Use GxContext.GetTimeZone() instead.", false)]
391391
public OlsonTimeZone ClientTimeZone
392392
{
393393
get { return dataStore.ClientTimeZone; }
@@ -2425,6 +2425,7 @@ public GxDataStore( string id) : this( null, id, null, "")
24252425
public GxDataStore( IGxDataRecord db, string id) : this( db, id, null, "")
24262426
{
24272427
}
2428+
[Obsolete("ClientTimeZone is deprecated. Use GxContext.GetTimeZone() instead.", false)]
24282429
public OlsonTimeZone ClientTimeZone
24292430
{
24302431
get {

dotnet/src/dotnetframework/GxClasses/Data/GXDataCommon.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ public interface IGxDataStore
175175
string ErrDescription {get;}
176176
[Obsolete("IGxDataStore.SmartCacheProvider is deprecated, use IDataStoreProvider.SmartCacheProvider instead", false)]
177177
GxSmartCacheProvider SmartCacheProvider {get;}
178+
[Obsolete("ClientTimeZone is deprecated. Use GxContext.GetTimeZone() instead.", false)]
178179
OlsonTimeZone ClientTimeZone { get; }
179180
void CloseConnections();
180181
void Release();
@@ -211,6 +212,7 @@ public interface IGxConnection: IDbConnection
211212
short Method { get;}
212213
new string Database { get; set; }
213214
string DatabaseName { get;}
215+
[Obsolete("ClientTimeZone is deprecated. Use GxContext.GetTimeZone() instead.", false)]
214216
OlsonTimeZone ClientTimeZone { get;}
215217
string DataSourceName {get ;set ;}
216218
string DriverName {get ;set ;}

dotnet/test/DotNetUnitTest/Domain/TimeZoneTest.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ public void TimeZoneConversion()
2323
#endregion
2424

2525
#region TZ4Net
26+
#pragma warning disable CS0618 // Type or member is obsolete
2627
OlsonTimeZone mdeoTimezone = TimeZoneUtil.GetInstanceFromOlsonName(MONTEVIDEO_IANA_TIMEZONE_ID);
2728
result = DateTimeUtil.DBserver2local(dt, mdeoTimezone);
29+
#pragma warning restore CS0618 // Type or member is obsolete
2830
Assert.Equal(expected, result);
2931
#endregion
3032

@@ -37,7 +39,9 @@ public void TimeZoneConversion()
3739
#endregion
3840

3941
#region TZ4Net
42+
#pragma warning disable CS0618 // Type or member is obsolete
4043
result = DateTimeUtil.DBserver2local(dt, mdeoTimezone);
44+
#pragma warning restore CS0618 // Type or member is obsolete
4145
Assert.Equal(expected, result);
4246
#endregion
4347

@@ -54,8 +58,10 @@ public void MexicoTimeZoneConversion()
5458
#endregion
5559

5660
#region T4ZNet
61+
#pragma warning disable CS0618 // Type or member is obsolete
5762
OlsonTimeZone timezone = TimeZoneUtil.GetInstanceFromOlsonName(GUADALAJARA_IANA_TIMEZONE_ID);
5863
result = DateTimeUtil.DBserver2local(dt, timezone);
64+
#pragma warning restore CS0618 // Type or member is obsolete
5965
Assert.Equal(expected.AddHours(1), result); //Olson has a mistake with this timezone
6066
#endregion
6167
}
@@ -81,10 +87,12 @@ public void EuropeTimeZone()
8187
#endregion
8288

8389
#region T4ZNet
90+
#pragma warning disable CS0618 // Type or member is obsolete
8491
OlsonTimeZone parisTimezone = TimeZoneUtil.GetInstanceFromOlsonName(PARIS_IANA_TIMEZONE_ID);
8592
result1 = DateTimeUtil.DBserver2local(dt1, parisTimezone);
8693
result2 = DateTimeUtil.DBserver2local(dt2, parisTimezone);
8794
result3 = DateTimeUtil.DBserver2local(dt3, parisTimezone);
95+
#pragma warning restore CS0618 // Type or member is obsolete
8896
Assert.Equal(expected1, result1);
8997
Assert.Equal(expected2, result2);
9098
Assert.Equal(expected3, result3);

0 commit comments

Comments
 (0)