Skip to content

More uses of ArgumentOutOfRangeException.ThrowIf* to replace custom error messages #8489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 10, 2024
Merged

More uses of ArgumentOutOfRangeException.ThrowIf* to replace custom error messages #8489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e23a72
get rid of SR.ParameterValueCannotBeNaN where possible
halgab Nov 29, 2023
4648142
get rid of SR.ParameterMustBeBetween
halgab Nov 28, 2023
230301e
get rid of SR.ParameterValueCannotBeInfinity
halgab Dec 1, 2023
262778a
review feedback
halgab Dec 27, 2023
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
38 changes: 10 additions & 28 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextFormatterImp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,34 +477,19 @@ TextRunCache textRunCache
if (paragraphProperties.DefaultTextRunProperties.Typeface == null)
throw new ArgumentNullException("paragraphProperties.DefaultTextRunProperties.Typeface");

if (double.IsNaN(paragraphWidth))
throw new ArgumentOutOfRangeException("paragraphWidth", SR.ParameterValueCannotBeNaN);

if (double.IsInfinity(paragraphWidth))
throw new ArgumentOutOfRangeException("paragraphWidth", SR.ParameterValueCannotBeInfinity);

if ( paragraphWidth < 0
|| paragraphWidth > Constants.RealInfiniteWidth)
{
throw new ArgumentOutOfRangeException("paragraphWidth", SR.Format(SR.ParameterMustBeBetween, 0, Constants.RealInfiniteWidth));
}
ArgumentOutOfRangeException.ThrowIfEqual(paragraphWidth, double.NaN);
ArgumentOutOfRangeException.ThrowIfNegative(paragraphWidth);
ArgumentOutOfRangeException.ThrowIfEqual(paragraphWidth, double.PositiveInfinity);
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphWidth, Constants.RealInfiniteWidth);

double realMaxFontRenderingEmSize = Constants.RealInfiniteWidth / Constants.GreatestMutiplierOfEm;

if ( paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize < 0
|| paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize > realMaxFontRenderingEmSize)
{
throw new ArgumentOutOfRangeException("paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize", SR.Format(SR.ParameterMustBeBetween, 0, realMaxFontRenderingEmSize));
}

ArgumentOutOfRangeException.ThrowIfNegative(paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize, "paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize");
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize, realMaxFontRenderingEmSize, "paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize");
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.Indent, Constants.RealInfiniteWidth, "paragraphProperties.Indent");
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.LineHeight, Constants.RealInfiniteWidth, "paragraphProperties.LineHeight");

if ( paragraphProperties.DefaultIncrementalTab < 0
|| paragraphProperties.DefaultIncrementalTab > Constants.RealInfiniteWidth)
{
throw new ArgumentOutOfRangeException("paragraphProperties.DefaultIncrementalTab", SR.Format(SR.ParameterMustBeBetween, 0, Constants.RealInfiniteWidth));
}
ArgumentOutOfRangeException.ThrowIfNegative(paragraphProperties.DefaultIncrementalTab, "paragraphProperties.DefaultIncrementalTab");
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.DefaultIncrementalTab, Constants.RealInfiniteWidth, "paragraphProperties.DefaultIncrementalTab");
}


Expand All @@ -517,11 +502,8 @@ internal static void VerifyCaretCharacterHit(
int cchLength
)
{
if ( characterHit.FirstCharacterIndex < cpFirst
|| characterHit.FirstCharacterIndex > cpFirst + cchLength)
{
throw new ArgumentOutOfRangeException("cpFirst", SR.Format(SR.ParameterMustBeBetween, cpFirst, cpFirst + cchLength));
}
ArgumentOutOfRangeException.ThrowIfGreaterThan(cpFirst, characterHit.FirstCharacterIndex);
ArgumentOutOfRangeException.ThrowIfLessThan(cpFirst, characterHit.FirstCharacterIndex - cchLength);

ArgumentOutOfRangeException.ThrowIfNegative(characterHit.TrailingLength, nameof(cchLength));
}
Expand Down
10 changes: 1 addition & 9 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/ExceptionStringTable.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ HwndSourceDisposed=Cannot access a disposed HwndSource.
NullHwnd=Hwnd of zero is not valid.
UsesPerPixelOpacityIsObsolete=UsesPerPixelOpacity is obsolete and should not be set when using UsesPerPixelTransparency

;ParameterValidation
ParameterMustBeGreaterThanZero=The parameter value must be greater than zero.
ParameterCannotBeLessThan=The parameter value cannot be less than '{0}'.
ParameterCannotBeGreaterThan=The parameter value cannot be greater than '{0}'.
ParameterMustBeBetween=The parameter value must be between '{0}' and '{1}'.
Copy link
Contributor Author

@halgab halgab Dec 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I should clean up the other lines corresponding to the resources I removed in my previous PR. Should I do it here?

Copy link
Contributor

@rchauhan18 rchauhan18 Dec 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you can remove the lines here.

Copy link
Contributor Author

@halgab halgab Dec 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

ParameterValueCannotBeInfinity=The parameter value must be finite.
ParameterValueCannotBeNegative='{0}' parameter value cannot be negative.

; General
General_BadType=The object passed to '{0}' is not a valid type.
General_Expected_Type=Expected object of type '{0}'.
Expand Down Expand Up @@ -1031,4 +1023,4 @@ CompatibilityPreferencesSealed=The property '{0}' cannot be changed. The '{1}' c
;Visual Diagnostics
MethodCallNotAllowed=The '{0}' method cannot be called at this time.
ReentrantVisualTreeChangeWarning=WARNING. The visual tree has been changed during a '{0}' event. This is not supported in a production application. Be sure to correct this before shipping the application.
ReentrantVisualTreeChangeError=The visual tree has been changed during a '{0}' event.
ReentrantVisualTreeChangeError=The visual tree has been changed during a '{0}' event.
9 changes: 0 additions & 9 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1822,15 +1822,6 @@
<data name="PaginatorNegativePageNumber" xml:space="preserve">
<value>Page number cannot be negative.</value>
</data>
<data name="ParameterMustBeBetween" xml:space="preserve">
<value>The parameter value must be between '{0}' and '{1}'.</value>
</data>
<data name="ParameterValueCannotBeInfinity" xml:space="preserve">
<value>The parameter value must be finite.</value>
</data>
<data name="ParameterValueCannotBeNaN" xml:space="preserve">
<value>The parameter value must be a number.</value>
</data>
<data name="Parsers_IllegalToken" xml:space="preserve">
<value>Token is not valid.</value>
</data>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">Číslo stránky nemůže být záporné.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">Hodnota tohoto parametru musí být v rozsahu od {0} do {1}.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">Hodnota tohoto parametru nesmí být nekonečno.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">Hodnota tohoto parametru musí být číslo.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Nalezena nesprávná forma {0} při analýze řetězce {1}.</target>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">Die Seitenzahl kann nicht negativ sein.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">Der Parameterwert muss zwischen "{0}" und "{1}" liegen.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">Der Parameterwert muss endlich sein.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">Der Parameterwert muss eine Zahl sein.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Beim Analysieren der Zeichenfolge "{1}" wurde die ungültige Form "{0}" gefunden.</target>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">El número de página no puede ser negativo.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">El valor del parámetro debe estar comprendido entre "{0}" y "{1}".</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">El valor del parámetro debe ser finito.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">El valor del parámetro debe ser un número.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Se encontró un formato incorrecto "{0}" al analizar la cadena "{1}".</target>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">Le numéro de page ne peut pas être négatif.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">La valeur du paramètre doit être comprise entre '{0}' et '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">La valeur du paramètre doit être finie.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">La valeur du paramètre doit être numérique.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Forme '{0}' incorrecte trouvée durant l'analyse de la chaîne '{1}'.</target>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">Il numero di pagina non può essere negativo.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">Il valore del parametro deve essere compreso tra '{0}' e '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">Il valore del parametro deve essere finito.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">Il valore del parametro deve essere un numero.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">È stato trovato un formato non corretto '{0}' durante l'analisi della stringa '{1}'.</target>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">ページ番号は負の数にできません。</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">パラメーター値は、'{0}' と '{1}' の間である必要があります。</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">パラメーター値は、有限である必要があります。</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">パラメーター値は、数値である必要があります。</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">'{1}' 文字列の解析中に無効なフォーム '{0}' が見つかりました。</target>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">페이지 번호는 음수일 수 없습니다.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">매개 변수 값은 '{0}'과(와) '{1}' 사이에 있어야 합니다.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">매개 변수는 유한한 값이어야 합니다.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">매개 변수 값은 숫자여야 합니다.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">'{1}' 문자열을 구문 분석하는 동안 잘못된 '{0}' 형식이 검색되었습니다.</target>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">Numer strony nie może być ujemny.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">Wartość parametru musi należeć do przedziału od „{0}” do „{1}”.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">Wartość parametru musi być skończona.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">Wartość parametru musi być liczbą.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Znaleziono nieprawidłową formę „{0}” podczas analizy ciągu „{1}”.</target>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">O número da página não pode ser negativo.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">O valor do parâmetro precisa estar entre '{0}' e '{1}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">O valor do parâmetro deve ser finito.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">O valor do parâmetro deve ser um número.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">Forma incorreta de '{0}' encontrada na análise da cadeia de caracteres '{1}'.</target>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">Номер страницы не может быть отрицательным.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">Параметр должен принимать значения от "{0}" до "{1}".</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">Значение параметра должно быть конечным.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">Значение параметра должно быть числом.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">При синтаксическом анализе строки "{1}" обнаружена неправильная форма "{0}".</target>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">Sayfa numarası negatif olamaz.</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">Parametre değeri '{0}' ile '{1}' arasında olmalıdır.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">Parametre değeri sonlu olmalıdır.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">Parametre değeri bir sayı olmalıdır.</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">'{1}' dizesi ayrıştırılırken yanlış '{0}' biçimi bulundu.</target>
Expand Down
15 changes: 0 additions & 15 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,21 +2522,6 @@
<target state="translated">页码不能为负数。</target>
<note />
</trans-unit>
<trans-unit id="ParameterMustBeBetween">
<source>The parameter value must be between '{0}' and '{1}'.</source>
<target state="translated">参数值必须介于“{0}”到“{1}”之间。</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeInfinity">
<source>The parameter value must be finite.</source>
<target state="translated">参数值必须有限。</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNaN">
<source>The parameter value must be a number.</source>
<target state="translated">参数值必须是一个数。</target>
<note />
</trans-unit>
<trans-unit id="Parser_BadForm">
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
<target state="translated">解析“{1}”字符串时发现格式“{0}”错误。</target>
Expand Down
Loading