Skip to content

Commit 270db60

Browse files
committed
Fix string comparisons
1 parent 2f062a5 commit 270db60

File tree

14 files changed

+36
-23
lines changed

14 files changed

+36
-23
lines changed

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,14 @@ public static Matrix3D Parse(string source)
219219

220220
// The token will already have had whitespace trimmed so we can do a
221221
// simple string compare.
222-
if (firstToken == "Identity")
222+
if (firstToken.Equals("Identity", StringComparison.Ordinal))
223223
{
224224
value = Identity;
225225
}
226226
else
227227
{
228-
value = new Matrix3D(double.Parse(firstToken, formatProvider),
228+
value = new Matrix3D(
229+
double.Parse(firstToken, formatProvider),
229230
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
230231
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
231232
double.Parse(tokenizer.NextTokenRequired(), formatProvider),

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ public static Point3D Parse(string source)
157157

158158
ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
159159

160-
value = new Point3D(double.Parse(firstToken, formatProvider),
160+
value = new Point3D(
161+
double.Parse(firstToken, formatProvider),
161162
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
162163
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
163164

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ public static Point4D Parse(string source)
160160

161161
ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
162162

163-
value = new Point4D(double.Parse(firstToken, formatProvider),
163+
value = new Point4D(
164+
double.Parse(firstToken, formatProvider),
164165
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
165166
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
166167
double.Parse(tokenizer.NextTokenRequired(), formatProvider));

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,14 @@ public static Quaternion Parse(string source)
183183

184184
// The token will already have had whitespace trimmed so we can do a
185185
// simple string compare.
186-
if (firstToken == "Identity")
186+
if (firstToken.Equals("Identity", StringComparison.Ordinal))
187187
{
188188
value = Identity;
189189
}
190190
else
191191
{
192-
value = new Quaternion(double.Parse(firstToken, formatProvider),
192+
value = new Quaternion(
193+
double.Parse(firstToken, formatProvider),
193194
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
194195
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
195196
double.Parse(tokenizer.NextTokenRequired(), formatProvider));

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,14 @@ public static Rect3D Parse(string source)
182182

183183
// The token will already have had whitespace trimmed so we can do a
184184
// simple string compare.
185-
if (firstToken == "Empty")
185+
if (firstToken.Equals("Empty", StringComparison.Ordinal))
186186
{
187187
value = Empty;
188188
}
189189
else
190190
{
191-
value = new Rect3D(double.Parse(firstToken, formatProvider),
191+
value = new Rect3D(
192+
double.Parse(firstToken, formatProvider),
192193
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
193194
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
194195
double.Parse(tokenizer.NextTokenRequired(), formatProvider),

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,14 @@ public static Size3D Parse(string source)
173173

174174
// The token will already have had whitespace trimmed so we can do a
175175
// simple string compare.
176-
if (firstToken == "Empty")
176+
if (firstToken.Equals("Empty", StringComparison.Ordinal))
177177
{
178178
value = Empty;
179179
}
180180
else
181181
{
182-
value = new Size3D(double.Parse(firstToken, formatProvider),
182+
value = new Size3D(
183+
double.Parse(firstToken, formatProvider),
183184
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
184185
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
185186
}

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ public static Vector3D Parse(string source)
157157

158158
ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
159159

160-
value = new Vector3D(double.Parse(firstToken, formatProvider),
160+
value = new Vector3D(
161+
double.Parse(firstToken, formatProvider),
161162
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
162163
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
163164

src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Int32Rect.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,14 @@ public static Int32Rect Parse(string source)
170170

171171
// The token will already have had whitespace trimmed so we can do a
172172
// simple string compare.
173-
if (firstToken == "Empty")
173+
if (firstToken.Equals("Empty", StringComparison.Ordinal))
174174
{
175175
value = Empty;
176176
}
177177
else
178178
{
179-
value = new Int32Rect(Int32.Parse(firstToken, formatProvider),
179+
value = new Int32Rect(
180+
Int32.Parse(firstToken, formatProvider),
180181
Int32.Parse(tokenizer.NextTokenRequired(), formatProvider),
181182
Int32.Parse(tokenizer.NextTokenRequired(), formatProvider),
182183
Int32.Parse(tokenizer.NextTokenRequired(), formatProvider));

src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Point.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,9 @@ public static Point Parse(string source)
148148

149149
ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
150150

151-
value = new Point(double.Parse(firstToken, formatProvider),
152-
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
151+
value = new Point(
152+
double.Parse(firstToken, formatProvider),
153+
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
153154

154155
// There should be no more tokens in this string.
155156
tokenizer.LastTokenRequired();

src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Generated/Rect.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,14 @@ public static Rect Parse(string source)
170170

171171
// The token will already have had whitespace trimmed so we can do a
172172
// simple string compare.
173-
if (firstToken == "Empty")
173+
if (firstToken.Equals("Empty", StringComparison.Ordinal))
174174
{
175175
value = Empty;
176176
}
177177
else
178178
{
179-
value = new Rect(double.Parse(firstToken, formatProvider),
179+
value = new Rect(
180+
double.Parse(firstToken, formatProvider),
180181
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
181182
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
182183
double.Parse(tokenizer.NextTokenRequired(), formatProvider));

0 commit comments

Comments
 (0)