Replace EnumValidator on some class

wreuel · RussKie · commit 0cf6b9404971 · 2021-06-04T12:34:32.000+10:00
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ButtonBase.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ButtonBase.cs
@@ -382,10 +382,7 @@ public ContentAlignment ImageAlign
             }
             set
             {
-                if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))
-                {
-                    throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));
-                }
+                SourceGenerated.EnumValidator.Validate(value);
 
                 if (value != _imageAlign)
                 {
@@ -671,10 +668,7 @@ public virtual ContentAlignment TextAlign
             }
             set
             {
-                if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))
-                {
-                    throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));
-                }
+                SourceGenerated.EnumValidator.Validate(value);
 
                 if (value == TextAlign)
                 {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/CheckBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/CheckBox.cs
@@ -139,10 +139,7 @@ public ContentAlignment CheckAlign
             }
             set
             {
-                if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))
-                {
-                    throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));
-                }
+                SourceGenerated.EnumValidator.Validate(value);
 
                 if (_checkAlign != value)
                 {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Label.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Label.cs
@@ -565,10 +565,7 @@ public ContentAlignment ImageAlign
             }
             set
             {
-                if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))
-                {
-                    throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));
-                }
+                SourceGenerated.EnumValidator.Validate(value);
 
                 if (value != ImageAlign)
                 {
@@ -724,10 +721,7 @@ public virtual ContentAlignment TextAlign
             }
             set
             {
-                if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))
-                {
-                    throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));
-                }
+                SourceGenerated.EnumValidator.Validate(value);
 
                 if (TextAlign != value)
                 {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/RadioButton.cs b/src/System.Windows.Forms/src/System/Windows/Forms/RadioButton.cs
@@ -156,10 +156,7 @@ public ContentAlignment CheckAlign
             }
             set
             {
-                if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))
-                {
-                    throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));
-                }
+                SourceGenerated.EnumValidator.Validate(value);
 
                 checkAlign = value;
                 if (OwnerDraw)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.cs
@@ -115,10 +115,7 @@ public ContentAlignment ControlAlign
             get => _controlAlign;
             set
             {
-                if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))
-                {
-                    throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));
-                }
+                SourceGenerated.EnumValidator.Validate(value);
 
                 if (_controlAlign != value)
                 {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.cs
@@ -982,10 +982,7 @@ public ContentAlignment ImageAlign
             get => _imageAlign;
             set
             {
-                if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))
-                {
-                    throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));
-                }
+                SourceGenerated.EnumValidator.Validate(value);
 
                 if (_imageAlign != value)
                 {
@@ -1875,10 +1872,7 @@ public virtual ContentAlignment TextAlign
             get => _textAlign;
             set
             {
-                if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))
-                {
-                    throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));
-                }
+                SourceGenerated.EnumValidator.Validate(value);
 
                 if (_textAlign != value)
                 {
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/WinFormsUtils.cs b/src/System.Windows.Forms/src/System/Windows/Forms/WinFormsUtils.cs
@@ -340,25 +340,6 @@ public static string GetComponentName(IComponent component, string defaultNameVa
 
         public static class EnumValidator
         {
-            /// <summary>
-            ///  Valid values are 0x001,0x002,0x004, 0x010,0x020,0x040, 0x100, 0x200,0x400
-            ///  Method for verifying
-            ///  Verify that the number passed in has only one bit on
-            ///  Verify that the bit that is on is a valid bit by bitwise anding it to a mask.
-            /// </summary>
-            public static bool IsValidContentAlignment(ContentAlignment contentAlign)
-            {
-                if (BitOperations.PopCount((uint)contentAlign) != 1)
-                {
-                    return false;
-                }
-
-                // to calculate:
-                // foreach (int val in Enum.GetValues(typeof(ContentAlignment))) { mask |= val; }
-                int contentAlignmentMask = 0x777;
-                return ((contentAlignmentMask & (int)contentAlign) != 0);
-            }
-
             /// <summary>
             ///  shifts off the number of bits specified by numBitsToShift
             ///  -  makes sure the bits we've shifted off are just zeros

Original file line number	Diff line number	Diff line change
`@@ -382,10 +382,7 @@ public ContentAlignment ImageAlign`
`382`	`382`	`}`
`383`	`383`	`set`
`384`	`384`	`{`
`385`		`- if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))`
`386`		`- {`
`387`		`- throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));`
`388`		`- }`
	`385`	`+ SourceGenerated.EnumValidator.Validate(value);`
`389`	`386`
`390`	`387`	`if (value != _imageAlign)`
`391`	`388`	`{`
`@@ -671,10 +668,7 @@ public virtual ContentAlignment TextAlign`
`671`	`668`	`}`
`672`	`669`	`set`
`673`	`670`	`{`
`674`		`- if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))`
`675`		`- {`
`676`		`- throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));`
`677`		`- }`
	`671`	`+ SourceGenerated.EnumValidator.Validate(value);`
`678`	`672`
`679`	`673`	`if (value == TextAlign)`
`680`	`674`	`{`
Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,7 @@ public ContentAlignment CheckAlign`
`139`	`139`	`}`
`140`	`140`	`set`
`141`	`141`	`{`
`142`		`- if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))`
`143`		`- {`
`144`		`- throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));`
`145`		`- }`
	`142`	`+ SourceGenerated.EnumValidator.Validate(value);`
`146`	`143`
`147`	`144`	`if (_checkAlign != value)`
`148`	`145`	`{`
Original file line number	Diff line number	Diff line change
`@@ -565,10 +565,7 @@ public ContentAlignment ImageAlign`
`565`	`565`	`}`
`566`	`566`	`set`
`567`	`567`	`{`
`568`		`- if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))`
`569`		`- {`
`570`		`- throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));`
`571`		`- }`
	`568`	`+ SourceGenerated.EnumValidator.Validate(value);`
`572`	`569`
`573`	`570`	`if (value != ImageAlign)`
`574`	`571`	`{`
`@@ -724,10 +721,7 @@ public virtual ContentAlignment TextAlign`
`724`	`721`	`}`
`725`	`722`	`set`
`726`	`723`	`{`
`727`		`- if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))`
`728`		`- {`
`729`		`- throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));`
`730`		`- }`
	`724`	`+ SourceGenerated.EnumValidator.Validate(value);`
`731`	`725`
`732`	`726`	`if (TextAlign != value)`
`733`	`727`	`{`
Original file line number	Diff line number	Diff line change
`@@ -156,10 +156,7 @@ public ContentAlignment CheckAlign`
`156`	`156`	`}`
`157`	`157`	`set`
`158`	`158`	`{`
`159`		`- if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))`
`160`		`- {`
`161`		`- throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));`
`162`		`- }`
	`159`	`+ SourceGenerated.EnumValidator.Validate(value);`
`163`	`160`
`164`	`161`	`checkAlign = value;`
`165`	`162`	`if (OwnerDraw)`
Original file line number	Diff line number	Diff line change
`@@ -115,10 +115,7 @@ public ContentAlignment ControlAlign`
`115`	`115`	`get => _controlAlign;`
`116`	`116`	`set`
`117`	`117`	`{`
`118`		`- if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))`
`119`		`- {`
`120`		`- throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));`
`121`		`- }`
	`118`	`+ SourceGenerated.EnumValidator.Validate(value);`
`122`	`119`
`123`	`120`	`if (_controlAlign != value)`
`124`	`121`	`{`
Original file line number	Diff line number	Diff line change
`@@ -982,10 +982,7 @@ public ContentAlignment ImageAlign`
`982`	`982`	`get => _imageAlign;`
`983`	`983`	`set`
`984`	`984`	`{`
`985`		`- if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))`
`986`		`- {`
`987`		`- throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));`
`988`		`- }`
	`985`	`+ SourceGenerated.EnumValidator.Validate(value);`
`989`	`986`
`990`	`987`	`if (_imageAlign != value)`
`991`	`988`	`{`
`@@ -1875,10 +1872,7 @@ public virtual ContentAlignment TextAlign`
`1875`	`1872`	`get => _textAlign;`
`1876`	`1873`	`set`
`1877`	`1874`	`{`
`1878`		`- if (!WindowsFormsUtils.EnumValidator.IsValidContentAlignment(value))`
`1879`		`- {`
`1880`		`- throw new InvalidEnumArgumentException(nameof(value), (int)value, typeof(ContentAlignment));`
`1881`		`- }`
	`1875`	`+ SourceGenerated.EnumValidator.Validate(value);`
`1882`	`1876`
`1883`	`1877`	`if (_textAlign != value)`
`1884`	`1878`	`{`