From 2f0edcd18630a1c9571aa5cc692579900ba783f5 Mon Sep 17 00:00:00 2001 From: Mark Michaelis Date: Thu, 31 Aug 2023 16:55:05 +0100 Subject: [PATCH 1/4] Minor edit --- src/Chapter05/Listing05.30.RethrowingAnException.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Chapter05/Listing05.30.RethrowingAnException.cs b/src/Chapter05/Listing05.30.RethrowingAnException.cs index c8555a349..65bf53add 100644 --- a/src/Chapter05/Listing05.30.RethrowingAnException.cs +++ b/src/Chapter05/Listing05.30.RethrowingAnException.cs @@ -17,7 +17,7 @@ public static void Main() catch (FormatException exception) { Console.WriteLine( - "A FormateException was thrown"); + "A FormatException was thrown"); } #region INCLUDE // ... From d2d2008fd81854a1dbe539fd1fac96d9ed7161d4 Mon Sep 17 00:00:00 2001 From: Mark Michaelis Date: Fri, 1 Sep 2023 07:19:32 +0100 Subject: [PATCH 2/4] Minor edits 1. Remove Trim() 2. Use string interpolation --- src/Chapter06/Listing06.06.AccessingFields.cs | 8 ++++---- .../Listing06.39.DisablingRequiredObjectInitialization.cs | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Chapter06/Listing06.06.AccessingFields.cs b/src/Chapter06/Listing06.06.AccessingFields.cs index 7bc5c8a6d..ecf72ac02 100644 --- a/src/Chapter06/Listing06.06.AccessingFields.cs +++ b/src/Chapter06/Listing06.06.AccessingFields.cs @@ -18,10 +18,10 @@ public static void Main() employee1.Salary = "Too Little"; IncreaseSalary(employee1); Console.WriteLine( - "{0} {1}: {2}", - employee1.FirstName, - employee1.LastName, - employee1.Salary); + $"{ + employee1.FirstName } { + employee1.LastName }: { + employee1.Salary }"); #endregion HIGHLIGHT // ... } diff --git a/src/Chapter06/Listing06.39.DisablingRequiredObjectInitialization.cs b/src/Chapter06/Listing06.39.DisablingRequiredObjectInitialization.cs index 883411e6e..6dd35fca7 100644 --- a/src/Chapter06/Listing06.39.DisablingRequiredObjectInitialization.cs +++ b/src/Chapter06/Listing06.39.DisablingRequiredObjectInitialization.cs @@ -41,8 +41,7 @@ public required string Title } set { - ArgumentException.ThrowIfNullOrEmpty( - value = value?.Trim()!); + ArgumentException.ThrowIfNullOrEmpty(value); _Title = value; } } @@ -56,8 +55,7 @@ public required string Isbn } set { - ArgumentException.ThrowIfNullOrEmpty( - value = value?.Trim()!); + ArgumentException.ThrowIfNullOrEmpty(value); _Isbn = value; } } From 94822d692727e5faf480bfba51ce39a45a404253 Mon Sep 17 00:00:00 2001 From: Mark Michaelis Date: Thu, 31 Aug 2023 16:55:05 +0100 Subject: [PATCH 3/4] Minor edit --- src/Chapter05/Listing05.30.RethrowingAnException.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Chapter05/Listing05.30.RethrowingAnException.cs b/src/Chapter05/Listing05.30.RethrowingAnException.cs index c8555a349..65bf53add 100644 --- a/src/Chapter05/Listing05.30.RethrowingAnException.cs +++ b/src/Chapter05/Listing05.30.RethrowingAnException.cs @@ -17,7 +17,7 @@ public static void Main() catch (FormatException exception) { Console.WriteLine( - "A FormateException was thrown"); + "A FormatException was thrown"); } #region INCLUDE // ... From 3a6b56641501292c3c8c76b787a47674a56f3a7e Mon Sep 17 00:00:00 2001 From: Mark Michaelis Date: Fri, 1 Sep 2023 07:19:32 +0100 Subject: [PATCH 4/4] Minor edits 1. Remove Trim() 2. Use string interpolation --- src/Chapter06/Listing06.06.AccessingFields.cs | 8 ++++---- .../Listing06.39.DisablingRequiredObjectInitialization.cs | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Chapter06/Listing06.06.AccessingFields.cs b/src/Chapter06/Listing06.06.AccessingFields.cs index 7bc5c8a6d..ecf72ac02 100644 --- a/src/Chapter06/Listing06.06.AccessingFields.cs +++ b/src/Chapter06/Listing06.06.AccessingFields.cs @@ -18,10 +18,10 @@ public static void Main() employee1.Salary = "Too Little"; IncreaseSalary(employee1); Console.WriteLine( - "{0} {1}: {2}", - employee1.FirstName, - employee1.LastName, - employee1.Salary); + $"{ + employee1.FirstName } { + employee1.LastName }: { + employee1.Salary }"); #endregion HIGHLIGHT // ... } diff --git a/src/Chapter06/Listing06.39.DisablingRequiredObjectInitialization.cs b/src/Chapter06/Listing06.39.DisablingRequiredObjectInitialization.cs index 883411e6e..6dd35fca7 100644 --- a/src/Chapter06/Listing06.39.DisablingRequiredObjectInitialization.cs +++ b/src/Chapter06/Listing06.39.DisablingRequiredObjectInitialization.cs @@ -41,8 +41,7 @@ public required string Title } set { - ArgumentException.ThrowIfNullOrEmpty( - value = value?.Trim()!); + ArgumentException.ThrowIfNullOrEmpty(value); _Title = value; } } @@ -56,8 +55,7 @@ public required string Isbn } set { - ArgumentException.ThrowIfNullOrEmpty( - value = value?.Trim()!); + ArgumentException.ThrowIfNullOrEmpty(value); _Isbn = value; } }