Skip to content

Use ArgumentOutOfRangeException.ThrowIf* to replace custom error messages #8408

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 7 commits into from
Nov 29, 2023
Merged

Use ArgumentOutOfRangeException.ThrowIf* to replace custom error messages #8408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
57557ca
get rid of SR.ParameterMustBeGreaterThanZero
halgab Nov 8, 2023
02e0b7d
get rid of SR.ParameterCannotBeNegative
halgab Nov 8, 2023
ca7bb66
get rid of SR.ParameterCannotBeGreaterThan
halgab Nov 8, 2023
2e1fdab
get rid of SR.ParameterCannotBeLessThan
halgab Nov 8, 2023
a535cf0
get rid of SR.ParameterValueMustBeGreaterThanZero
halgab Nov 8, 2023
ed7e269
get rid of SR.ParameterValueCannotBeNegative
halgab Nov 8, 2023
fdae6c3
get rid of SR.ShouldBeZero
halgab Nov 8, 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
7 changes: 2 additions & 5 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FullTextLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1498,12 +1498,9 @@ int textLength
throw new ObjectDisposedException(SR.TextLineHasBeenDisposed);
}

if(textLength == 0)
{
throw new ArgumentOutOfRangeException("textLength", SR.ParameterMustBeGreaterThanZero);
}
ArgumentOutOfRangeException.ThrowIfZero(textLength);

if(textLength < 0)
if (textLength < 0)
{
firstTextSourceCharacterIndex += textLength;
textLength = -textLength;
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/SimpleTextLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,10 +807,7 @@ public override IList<TextBounds> GetTextBounds(
int textLength
)
{
if (textLength == 0)
{
throw new ArgumentOutOfRangeException("textLength", SR.ParameterMustBeGreaterThanZero);
}
ArgumentOutOfRangeException.ThrowIfZero(textLength);

if (textLength < 0)
{
Expand Down
12 changes: 3 additions & 9 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 @@ -497,11 +497,8 @@ TextRunCache textRunCache
throw new ArgumentOutOfRangeException("paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize", SR.Format(SR.ParameterMustBeBetween, 0, realMaxFontRenderingEmSize));
}

if (paragraphProperties.Indent > Constants.RealInfiniteWidth)
throw new ArgumentOutOfRangeException("paragraphProperties.Indent", SR.Format(SR.ParameterCannotBeGreaterThan, Constants.RealInfiniteWidth));

if (paragraphProperties.LineHeight > Constants.RealInfiniteWidth)
throw new ArgumentOutOfRangeException("paragraphProperties.LineHeight", SR.Format(SR.ParameterCannotBeGreaterThan, Constants.RealInfiniteWidth));
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.Indent, Constants.RealInfiniteWidth, "paragraphProperties.Indent");
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.LineHeight, Constants.RealInfiniteWidth, "paragraphProperties.LineHeight");

if ( paragraphProperties.DefaultIncrementalTab < 0
|| paragraphProperties.DefaultIncrementalTab > Constants.RealInfiniteWidth)
Expand All @@ -526,10 +523,7 @@ int cchLength
throw new ArgumentOutOfRangeException("cpFirst", SR.Format(SR.ParameterMustBeBetween, cpFirst, cpFirst + cchLength));
}

if (characterHit.TrailingLength < 0)
{
throw new ArgumentOutOfRangeException("cchLength", SR.ParameterCannotBeNegative);
}
ArgumentOutOfRangeException.ThrowIfNegative(characterHit.TrailingLength, nameof(cchLength));
}


Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextRunCacheImp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,7 @@ out int runLength

textRun = settings.TextSource.GetTextRun(cpFetch);

if (textRun.Length < 1)
{
throw new ArgumentOutOfRangeException("textRun.Length", SR.ParameterMustBeGreaterThanZero);
}
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(textRun.Length, "textRun.Length");

Plsrun plsrun = TextRunInfo.GetRunType(textRun);

Expand Down
18 changes: 0 additions & 18 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,33 +1822,15 @@
<data name="PaginatorNegativePageNumber" xml:space="preserve">
<value>Page number cannot be negative.</value>
</data>
<data name="ParameterCannotBeGreaterThan" xml:space="preserve">
<value>The parameter value cannot be greater than '{0}'.</value>
</data>
<data name="ParameterCannotBeLessThan" xml:space="preserve">
<value>The parameter value cannot be less than '{0}'.</value>
</data>
<data name="ParameterCannotBeNegative" xml:space="preserve">
<value>Parameter must be greater than or equal to zero.</value>
</data>
<data name="ParameterMustBeBetween" xml:space="preserve">
<value>The parameter value must be between '{0}' and '{1}'.</value>
</data>
<data name="ParameterMustBeGreaterThanZero" xml:space="preserve">
<value>The parameter value must be greater than zero.</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="ParameterValueCannotBeNegative" xml:space="preserve">
<value>'{0}' parameter value cannot be negative.</value>
</data>
<data name="ParameterValueMustBeGreaterThanZero" xml:space="preserve">
<value>'{0}' parameter value must be greater than zero.</value>
</data>
<data name="Parsers_IllegalToken" xml:space="preserve">
<value>Token is not valid.</value>
</data>
Expand Down
32 changes: 1 addition & 31 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,31 +2522,11 @@
<target state="translated">Číslo stránky nemůže být záporné.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeGreaterThan">
<source>The parameter value cannot be greater than '{0}'.</source>
<target state="translated">Hodnota tohoto parametru nemůže být větší než {0}.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeLessThan">
<source>The parameter value cannot be less than '{0}'.</source>
<target state="translated">Hodnota tohoto parametru nemůže být menší než {0}.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="translated">Hodnota tohoto parametru musí být větší nebo rovna nule.</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="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="translated">Hodnota tohoto parametru musí být větší než nula.</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>
Expand All @@ -2557,16 +2537,6 @@
<target state="translated">Hodnota tohoto parametru musí být číslo.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNegative">
<source>'{0}' parameter value cannot be negative.</source>
<target state="translated">Hodnota parametru {0} nemůže být záporná.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueMustBeGreaterThanZero">
<source>'{0}' parameter value must be greater than zero.</source>
<target state="translated">Hodnota parametru {0} musí být větší než nula.</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 Expand Up @@ -3619,4 +3589,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
32 changes: 1 addition & 31 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,31 +2522,11 @@
<target state="translated">Die Seitenzahl kann nicht negativ sein.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeGreaterThan">
<source>The parameter value cannot be greater than '{0}'.</source>
<target state="translated">Der Parameterwert darf nicht größer sein als "{0}".</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeLessThan">
<source>The parameter value cannot be less than '{0}'.</source>
<target state="translated">Der Parameterwert darf nicht kleiner sein als "{0}".</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="translated">Der Parameter muss größer oder gleich null 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="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="translated">Der Parameterwert muss größer Null sein.</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>
Expand All @@ -2557,16 +2537,6 @@
<target state="translated">Der Parameterwert muss eine Zahl sein.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNegative">
<source>'{0}' parameter value cannot be negative.</source>
<target state="translated">Der Parameterwert "{0}" darf nicht negativ sein.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueMustBeGreaterThanZero">
<source>'{0}' parameter value must be greater than zero.</source>
<target state="translated">Der Parameterwert "{0}" muss größer Null 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 Expand Up @@ -3619,4 +3589,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
32 changes: 1 addition & 31 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,31 +2522,11 @@
<target state="translated">El número de página no puede ser negativo.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeGreaterThan">
<source>The parameter value cannot be greater than '{0}'.</source>
<target state="translated">El valor del parámetro no puede ser mayor que '{0}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeLessThan">
<source>The parameter value cannot be less than '{0}'.</source>
<target state="translated">El valor del parámetro no puede ser menor que '{0}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="translated">El parámetro debe ser mayor que o igual a cero.</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="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="translated">El valor del parámetro debe ser mayor que cero.</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>
Expand All @@ -2557,16 +2537,6 @@
<target state="translated">El valor del parámetro debe ser un número.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNegative">
<source>'{0}' parameter value cannot be negative.</source>
<target state="translated">El valor del parámetro '{0}' no puede ser negativo.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueMustBeGreaterThanZero">
<source>'{0}' parameter value must be greater than zero.</source>
<target state="translated">El valor del parámetro '{0}' debe ser mayor que cero.</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 Expand Up @@ -3619,4 +3589,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
32 changes: 1 addition & 31 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,31 +2522,11 @@
<target state="translated">Le numéro de page ne peut pas être négatif.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeGreaterThan">
<source>The parameter value cannot be greater than '{0}'.</source>
<target state="translated">Le paramètre ne peut pas avoir une valeur supérieure à '{0}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeLessThan">
<source>The parameter value cannot be less than '{0}'.</source>
<target state="translated">Le paramètre ne peut pas avoir une valeur inférieure à '{0}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="translated">Le paramètre doit être supérieur ou égal à zéro.</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="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="translated">La valeur du paramètre doit être supérieure à zéro.</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>
Expand All @@ -2557,16 +2537,6 @@
<target state="translated">La valeur du paramètre doit être numérique.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNegative">
<source>'{0}' parameter value cannot be negative.</source>
<target state="translated">La valeur du paramètre '{0}' ne peut pas être négative.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueMustBeGreaterThanZero">
<source>'{0}' parameter value must be greater than zero.</source>
<target state="translated">La valeur du paramètre '{0}' doit être supérieure à zéro.</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 Expand Up @@ -3619,4 +3589,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
32 changes: 1 addition & 31 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,31 +2522,11 @@
<target state="translated">Il numero di pagina non può essere negativo.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeGreaterThan">
<source>The parameter value cannot be greater than '{0}'.</source>
<target state="translated">Il valore del parametro non può essere maggiore di '{0}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeLessThan">
<source>The parameter value cannot be less than '{0}'.</source>
<target state="translated">Il valore del parametro non può essere minore di '{0}'.</target>
<note />
</trans-unit>
<trans-unit id="ParameterCannotBeNegative">
<source>Parameter must be greater than or equal to zero.</source>
<target state="translated">Il valore del parametro deve essere maggiore o uguale a zero.</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="ParameterMustBeGreaterThanZero">
<source>The parameter value must be greater than zero.</source>
<target state="translated">Il valore del parametro deve essere maggiore di zero.</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>
Expand All @@ -2557,16 +2537,6 @@
<target state="translated">Il valore del parametro deve essere un numero.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueCannotBeNegative">
<source>'{0}' parameter value cannot be negative.</source>
<target state="translated">Il valore del parametro '{0}' non può essere negativo.</target>
<note />
</trans-unit>
<trans-unit id="ParameterValueMustBeGreaterThanZero">
<source>'{0}' parameter value must be greater than zero.</source>
<target state="translated">Il valore del parametro '{0}' deve essere maggiore di zero.</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 Expand Up @@ -3619,4 +3589,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
Loading