Skip to content

Commit 07f34ba

Browse files
halgabhalgab
authored
Use ArgumentOutOfRangeException.ThrowIf* to replace custom error messages (#8408)
* get rid of SR.ParameterMustBeGreaterThanZero * get rid of SR.ParameterCannotBeNegative * get rid of SR.ParameterCannotBeGreaterThan * get rid of SR.ParameterCannotBeLessThan * get rid of SR.ParameterValueMustBeGreaterThanZero * get rid of SR.ParameterValueCannotBeNegative * get rid of SR.ShouldBeZero
1 parent ce5e671 commit 07f34ba

File tree

115 files changed

+157
-1070
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+157
-1070
lines changed

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FullTextLine.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,12 +1498,9 @@ int textLength
14981498
throw new ObjectDisposedException(SR.TextLineHasBeenDisposed);
14991499
}
15001500

1501-
if(textLength == 0)
1502-
{
1503-
throw new ArgumentOutOfRangeException("textLength", SR.ParameterMustBeGreaterThanZero);
1504-
}
1501+
ArgumentOutOfRangeException.ThrowIfZero(textLength);
15051502

1506-
if(textLength < 0)
1503+
if (textLength < 0)
15071504
{
15081505
firstTextSourceCharacterIndex += textLength;
15091506
textLength = -textLength;

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/SimpleTextLine.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -807,10 +807,7 @@ public override IList<TextBounds> GetTextBounds(
807807
int textLength
808808
)
809809
{
810-
if (textLength == 0)
811-
{
812-
throw new ArgumentOutOfRangeException("textLength", SR.ParameterMustBeGreaterThanZero);
813-
}
810+
ArgumentOutOfRangeException.ThrowIfZero(textLength);
814811

815812
if (textLength < 0)
816813
{

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextFormatterImp.cs‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -497,11 +497,8 @@ TextRunCache textRunCache
497497
throw new ArgumentOutOfRangeException("paragraphProperties.DefaultTextRunProperties.FontRenderingEmSize", SR.Format(SR.ParameterMustBeBetween, 0, realMaxFontRenderingEmSize));
498498
}
499499

500-
if (paragraphProperties.Indent > Constants.RealInfiniteWidth)
501-
throw new ArgumentOutOfRangeException("paragraphProperties.Indent", SR.Format(SR.ParameterCannotBeGreaterThan, Constants.RealInfiniteWidth));
502-
503-
if (paragraphProperties.LineHeight > Constants.RealInfiniteWidth)
504-
throw new ArgumentOutOfRangeException("paragraphProperties.LineHeight", SR.Format(SR.ParameterCannotBeGreaterThan, Constants.RealInfiniteWidth));
500+
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.Indent, Constants.RealInfiniteWidth, "paragraphProperties.Indent");
501+
ArgumentOutOfRangeException.ThrowIfGreaterThan(paragraphProperties.LineHeight, Constants.RealInfiniteWidth, "paragraphProperties.LineHeight");
505502

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

529-
if (characterHit.TrailingLength < 0)
530-
{
531-
throw new ArgumentOutOfRangeException("cchLength", SR.ParameterCannotBeNegative);
532-
}
526+
ArgumentOutOfRangeException.ThrowIfNegative(characterHit.TrailingLength, nameof(cchLength));
533527
}
534528

535529

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextRunCacheImp.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,7 @@ out int runLength
118118

119119
textRun = settings.TextSource.GetTextRun(cpFetch);
120120

121-
if (textRun.Length < 1)
122-
{
123-
throw new ArgumentOutOfRangeException("textRun.Length", SR.ParameterMustBeGreaterThanZero);
124-
}
121+
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(textRun.Length, "textRun.Length");
125122

126123
Plsrun plsrun = TextRunInfo.GetRunType(textRun);
127124

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/Strings.resx‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,33 +1822,15 @@
18221822
<data name="PaginatorNegativePageNumber" xml:space="preserve">
18231823
<value>Page number cannot be negative.</value>
18241824
</data>
1825-
<data name="ParameterCannotBeGreaterThan" xml:space="preserve">
1826-
<value>The parameter value cannot be greater than '{0}'.</value>
1827-
</data>
1828-
<data name="ParameterCannotBeLessThan" xml:space="preserve">
1829-
<value>The parameter value cannot be less than '{0}'.</value>
1830-
</data>
1831-
<data name="ParameterCannotBeNegative" xml:space="preserve">
1832-
<value>Parameter must be greater than or equal to zero.</value>
1833-
</data>
18341825
<data name="ParameterMustBeBetween" xml:space="preserve">
18351826
<value>The parameter value must be between '{0}' and '{1}'.</value>
18361827
</data>
1837-
<data name="ParameterMustBeGreaterThanZero" xml:space="preserve">
1838-
<value>The parameter value must be greater than zero.</value>
1839-
</data>
18401828
<data name="ParameterValueCannotBeInfinity" xml:space="preserve">
18411829
<value>The parameter value must be finite.</value>
18421830
</data>
18431831
<data name="ParameterValueCannotBeNaN" xml:space="preserve">
18441832
<value>The parameter value must be a number.</value>
18451833
</data>
1846-
<data name="ParameterValueCannotBeNegative" xml:space="preserve">
1847-
<value>'{0}' parameter value cannot be negative.</value>
1848-
</data>
1849-
<data name="ParameterValueMustBeGreaterThanZero" xml:space="preserve">
1850-
<value>'{0}' parameter value must be greater than zero.</value>
1851-
</data>
18521834
<data name="Parsers_IllegalToken" xml:space="preserve">
18531835
<value>Token is not valid.</value>
18541836
</data>

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.cs.xlf‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2522,31 +2522,11 @@
25222522
<target state="translated">Číslo stránky nemůže být záporné.</target>
25232523
<note />
25242524
</trans-unit>
2525-
<trans-unit id="ParameterCannotBeGreaterThan">
2526-
<source>The parameter value cannot be greater than '{0}'.</source>
2527-
<target state="translated">Hodnota tohoto parametru nemůže být větší než {0}.</target>
2528-
<note />
2529-
</trans-unit>
2530-
<trans-unit id="ParameterCannotBeLessThan">
2531-
<source>The parameter value cannot be less than '{0}'.</source>
2532-
<target state="translated">Hodnota tohoto parametru nemůže být menší než {0}.</target>
2533-
<note />
2534-
</trans-unit>
2535-
<trans-unit id="ParameterCannotBeNegative">
2536-
<source>Parameter must be greater than or equal to zero.</source>
2537-
<target state="translated">Hodnota tohoto parametru musí být větší nebo rovna nule.</target>
2538-
<note />
2539-
</trans-unit>
25402525
<trans-unit id="ParameterMustBeBetween">
25412526
<source>The parameter value must be between '{0}' and '{1}'.</source>
25422527
<target state="translated">Hodnota tohoto parametru musí být v rozsahu od {0} do {1}.</target>
25432528
<note />
25442529
</trans-unit>
2545-
<trans-unit id="ParameterMustBeGreaterThanZero">
2546-
<source>The parameter value must be greater than zero.</source>
2547-
<target state="translated">Hodnota tohoto parametru musí být větší než nula.</target>
2548-
<note />
2549-
</trans-unit>
25502530
<trans-unit id="ParameterValueCannotBeInfinity">
25512531
<source>The parameter value must be finite.</source>
25522532
<target state="translated">Hodnota tohoto parametru nesmí být nekonečno.</target>
@@ -2557,16 +2537,6 @@
25572537
<target state="translated">Hodnota tohoto parametru musí být číslo.</target>
25582538
<note />
25592539
</trans-unit>
2560-
<trans-unit id="ParameterValueCannotBeNegative">
2561-
<source>'{0}' parameter value cannot be negative.</source>
2562-
<target state="translated">Hodnota parametru {0} nemůže být záporná.</target>
2563-
<note />
2564-
</trans-unit>
2565-
<trans-unit id="ParameterValueMustBeGreaterThanZero">
2566-
<source>'{0}' parameter value must be greater than zero.</source>
2567-
<target state="translated">Hodnota parametru {0} musí být větší než nula.</target>
2568-
<note />
2569-
</trans-unit>
25702540
<trans-unit id="Parser_BadForm">
25712541
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
25722542
<target state="translated">Nalezena nesprávná forma {0} při analýze řetězce {1}.</target>
@@ -3619,4 +3589,4 @@
36193589
</trans-unit>
36203590
</body>
36213591
</file>
3622-
</xliff>
3592+
</xliff>

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.de.xlf‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2522,31 +2522,11 @@
25222522
<target state="translated">Die Seitenzahl kann nicht negativ sein.</target>
25232523
<note />
25242524
</trans-unit>
2525-
<trans-unit id="ParameterCannotBeGreaterThan">
2526-
<source>The parameter value cannot be greater than '{0}'.</source>
2527-
<target state="translated">Der Parameterwert darf nicht größer sein als "{0}".</target>
2528-
<note />
2529-
</trans-unit>
2530-
<trans-unit id="ParameterCannotBeLessThan">
2531-
<source>The parameter value cannot be less than '{0}'.</source>
2532-
<target state="translated">Der Parameterwert darf nicht kleiner sein als "{0}".</target>
2533-
<note />
2534-
</trans-unit>
2535-
<trans-unit id="ParameterCannotBeNegative">
2536-
<source>Parameter must be greater than or equal to zero.</source>
2537-
<target state="translated">Der Parameter muss größer oder gleich null sein.</target>
2538-
<note />
2539-
</trans-unit>
25402525
<trans-unit id="ParameterMustBeBetween">
25412526
<source>The parameter value must be between '{0}' and '{1}'.</source>
25422527
<target state="translated">Der Parameterwert muss zwischen "{0}" und "{1}" liegen.</target>
25432528
<note />
25442529
</trans-unit>
2545-
<trans-unit id="ParameterMustBeGreaterThanZero">
2546-
<source>The parameter value must be greater than zero.</source>
2547-
<target state="translated">Der Parameterwert muss größer Null sein.</target>
2548-
<note />
2549-
</trans-unit>
25502530
<trans-unit id="ParameterValueCannotBeInfinity">
25512531
<source>The parameter value must be finite.</source>
25522532
<target state="translated">Der Parameterwert muss endlich sein.</target>
@@ -2557,16 +2537,6 @@
25572537
<target state="translated">Der Parameterwert muss eine Zahl sein.</target>
25582538
<note />
25592539
</trans-unit>
2560-
<trans-unit id="ParameterValueCannotBeNegative">
2561-
<source>'{0}' parameter value cannot be negative.</source>
2562-
<target state="translated">Der Parameterwert "{0}" darf nicht negativ sein.</target>
2563-
<note />
2564-
</trans-unit>
2565-
<trans-unit id="ParameterValueMustBeGreaterThanZero">
2566-
<source>'{0}' parameter value must be greater than zero.</source>
2567-
<target state="translated">Der Parameterwert "{0}" muss größer Null sein.</target>
2568-
<note />
2569-
</trans-unit>
25702540
<trans-unit id="Parser_BadForm">
25712541
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
25722542
<target state="translated">Beim Analysieren der Zeichenfolge "{1}" wurde die ungültige Form "{0}" gefunden.</target>
@@ -3619,4 +3589,4 @@
36193589
</trans-unit>
36203590
</body>
36213591
</file>
3622-
</xliff>
3592+
</xliff>

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.es.xlf‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2522,31 +2522,11 @@
25222522
<target state="translated">El número de página no puede ser negativo.</target>
25232523
<note />
25242524
</trans-unit>
2525-
<trans-unit id="ParameterCannotBeGreaterThan">
2526-
<source>The parameter value cannot be greater than '{0}'.</source>
2527-
<target state="translated">El valor del parámetro no puede ser mayor que '{0}'.</target>
2528-
<note />
2529-
</trans-unit>
2530-
<trans-unit id="ParameterCannotBeLessThan">
2531-
<source>The parameter value cannot be less than '{0}'.</source>
2532-
<target state="translated">El valor del parámetro no puede ser menor que '{0}'.</target>
2533-
<note />
2534-
</trans-unit>
2535-
<trans-unit id="ParameterCannotBeNegative">
2536-
<source>Parameter must be greater than or equal to zero.</source>
2537-
<target state="translated">El parámetro debe ser mayor que o igual a cero.</target>
2538-
<note />
2539-
</trans-unit>
25402525
<trans-unit id="ParameterMustBeBetween">
25412526
<source>The parameter value must be between '{0}' and '{1}'.</source>
25422527
<target state="translated">El valor del parámetro debe estar comprendido entre "{0}" y "{1}".</target>
25432528
<note />
25442529
</trans-unit>
2545-
<trans-unit id="ParameterMustBeGreaterThanZero">
2546-
<source>The parameter value must be greater than zero.</source>
2547-
<target state="translated">El valor del parámetro debe ser mayor que cero.</target>
2548-
<note />
2549-
</trans-unit>
25502530
<trans-unit id="ParameterValueCannotBeInfinity">
25512531
<source>The parameter value must be finite.</source>
25522532
<target state="translated">El valor del parámetro debe ser finito.</target>
@@ -2557,16 +2537,6 @@
25572537
<target state="translated">El valor del parámetro debe ser un número.</target>
25582538
<note />
25592539
</trans-unit>
2560-
<trans-unit id="ParameterValueCannotBeNegative">
2561-
<source>'{0}' parameter value cannot be negative.</source>
2562-
<target state="translated">El valor del parámetro '{0}' no puede ser negativo.</target>
2563-
<note />
2564-
</trans-unit>
2565-
<trans-unit id="ParameterValueMustBeGreaterThanZero">
2566-
<source>'{0}' parameter value must be greater than zero.</source>
2567-
<target state="translated">El valor del parámetro '{0}' debe ser mayor que cero.</target>
2568-
<note />
2569-
</trans-unit>
25702540
<trans-unit id="Parser_BadForm">
25712541
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
25722542
<target state="translated">Se encontró un formato incorrecto "{0}" al analizar la cadena "{1}".</target>
@@ -3619,4 +3589,4 @@
36193589
</trans-unit>
36203590
</body>
36213591
</file>
3622-
</xliff>
3592+
</xliff>

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.fr.xlf‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2522,31 +2522,11 @@
25222522
<target state="translated">Le numéro de page ne peut pas être négatif.</target>
25232523
<note />
25242524
</trans-unit>
2525-
<trans-unit id="ParameterCannotBeGreaterThan">
2526-
<source>The parameter value cannot be greater than '{0}'.</source>
2527-
<target state="translated">Le paramètre ne peut pas avoir une valeur supérieure à '{0}'.</target>
2528-
<note />
2529-
</trans-unit>
2530-
<trans-unit id="ParameterCannotBeLessThan">
2531-
<source>The parameter value cannot be less than '{0}'.</source>
2532-
<target state="translated">Le paramètre ne peut pas avoir une valeur inférieure à '{0}'.</target>
2533-
<note />
2534-
</trans-unit>
2535-
<trans-unit id="ParameterCannotBeNegative">
2536-
<source>Parameter must be greater than or equal to zero.</source>
2537-
<target state="translated">Le paramètre doit être supérieur ou égal à zéro.</target>
2538-
<note />
2539-
</trans-unit>
25402525
<trans-unit id="ParameterMustBeBetween">
25412526
<source>The parameter value must be between '{0}' and '{1}'.</source>
25422527
<target state="translated">La valeur du paramètre doit être comprise entre '{0}' et '{1}'.</target>
25432528
<note />
25442529
</trans-unit>
2545-
<trans-unit id="ParameterMustBeGreaterThanZero">
2546-
<source>The parameter value must be greater than zero.</source>
2547-
<target state="translated">La valeur du paramètre doit être supérieure à zéro.</target>
2548-
<note />
2549-
</trans-unit>
25502530
<trans-unit id="ParameterValueCannotBeInfinity">
25512531
<source>The parameter value must be finite.</source>
25522532
<target state="translated">La valeur du paramètre doit être finie.</target>
@@ -2557,16 +2537,6 @@
25572537
<target state="translated">La valeur du paramètre doit être numérique.</target>
25582538
<note />
25592539
</trans-unit>
2560-
<trans-unit id="ParameterValueCannotBeNegative">
2561-
<source>'{0}' parameter value cannot be negative.</source>
2562-
<target state="translated">La valeur du paramètre '{0}' ne peut pas être négative.</target>
2563-
<note />
2564-
</trans-unit>
2565-
<trans-unit id="ParameterValueMustBeGreaterThanZero">
2566-
<source>'{0}' parameter value must be greater than zero.</source>
2567-
<target state="translated">La valeur du paramètre '{0}' doit être supérieure à zéro.</target>
2568-
<note />
2569-
</trans-unit>
25702540
<trans-unit id="Parser_BadForm">
25712541
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
25722542
<target state="translated">Forme '{0}' incorrecte trouvée durant l'analyse de la chaîne '{1}'.</target>
@@ -3619,4 +3589,4 @@
36193589
</trans-unit>
36203590
</body>
36213591
</file>
3622-
</xliff>
3592+
</xliff>

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/Resources/xlf/Strings.it.xlf‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2522,31 +2522,11 @@
25222522
<target state="translated">Il numero di pagina non può essere negativo.</target>
25232523
<note />
25242524
</trans-unit>
2525-
<trans-unit id="ParameterCannotBeGreaterThan">
2526-
<source>The parameter value cannot be greater than '{0}'.</source>
2527-
<target state="translated">Il valore del parametro non può essere maggiore di '{0}'.</target>
2528-
<note />
2529-
</trans-unit>
2530-
<trans-unit id="ParameterCannotBeLessThan">
2531-
<source>The parameter value cannot be less than '{0}'.</source>
2532-
<target state="translated">Il valore del parametro non può essere minore di '{0}'.</target>
2533-
<note />
2534-
</trans-unit>
2535-
<trans-unit id="ParameterCannotBeNegative">
2536-
<source>Parameter must be greater than or equal to zero.</source>
2537-
<target state="translated">Il valore del parametro deve essere maggiore o uguale a zero.</target>
2538-
<note />
2539-
</trans-unit>
25402525
<trans-unit id="ParameterMustBeBetween">
25412526
<source>The parameter value must be between '{0}' and '{1}'.</source>
25422527
<target state="translated">Il valore del parametro deve essere compreso tra '{0}' e '{1}'.</target>
25432528
<note />
25442529
</trans-unit>
2545-
<trans-unit id="ParameterMustBeGreaterThanZero">
2546-
<source>The parameter value must be greater than zero.</source>
2547-
<target state="translated">Il valore del parametro deve essere maggiore di zero.</target>
2548-
<note />
2549-
</trans-unit>
25502530
<trans-unit id="ParameterValueCannotBeInfinity">
25512531
<source>The parameter value must be finite.</source>
25522532
<target state="translated">Il valore del parametro deve essere finito.</target>
@@ -2557,16 +2537,6 @@
25572537
<target state="translated">Il valore del parametro deve essere un numero.</target>
25582538
<note />
25592539
</trans-unit>
2560-
<trans-unit id="ParameterValueCannotBeNegative">
2561-
<source>'{0}' parameter value cannot be negative.</source>
2562-
<target state="translated">Il valore del parametro '{0}' non può essere negativo.</target>
2563-
<note />
2564-
</trans-unit>
2565-
<trans-unit id="ParameterValueMustBeGreaterThanZero">
2566-
<source>'{0}' parameter value must be greater than zero.</source>
2567-
<target state="translated">Il valore del parametro '{0}' deve essere maggiore di zero.</target>
2568-
<note />
2569-
</trans-unit>
25702540
<trans-unit id="Parser_BadForm">
25712541
<source>Incorrect form '{0}' found parsing '{1}' string.</source>
25722542
<target state="translated">È stato trovato un formato non corretto '{0}' durante l'analisi della stringa '{1}'.</target>
@@ -3619,4 +3589,4 @@
36193589
</trans-unit>
36203590
</body>
36213591
</file>
3622-
</xliff>
3592+
</xliff>

0 commit comments

Comments
 (0)