Skip to content

Commit 6a61a31

Browse files
devlightsdevlights
committed
Fix warnings
1 parent 287d66d commit 6a61a31

11 files changed

Lines changed: 36 additions & 28 deletions

‎TryCSharp.Samples/Linq/LinqSamples37.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void Execute()
9595

9696
private class Order
9797
{
98-
public string Name { get; set; }
98+
public string? Name { get; set; }
9999
public int Amount { get; set; }
100100
public int Month { get; set; }
101101
}

‎TryCSharp.Samples/Linq/LinqSamples42.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void Execute()
4141

4242
private class Language
4343
{
44-
public string Name { get; set; }
44+
public string? Name { get; set; }
4545

4646
public static Language Create(string name)
4747
{
@@ -51,9 +51,9 @@ public static Language Create(string name)
5151

5252
private class LanguageNameComparer : EqualityComparer<Language>
5353
{
54-
public override bool Equals(Language l1, Language l2)
54+
public override bool Equals(Language? l1, Language? l2)
5555
{
56-
return l1.Name == l2.Name;
56+
return l1!.Name == l2!.Name;
5757
}
5858

5959
public override int GetHashCode(Language l)

‎TryCSharp.Samples/Linq/LinqSamples48.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void Execute()
6767

6868
private class Language
6969
{
70-
public string Name { get; set; }
70+
public string? Name { get; set; }
7171

7272
public static Language Create(string name)
7373
{
@@ -77,9 +77,9 @@ public static Language Create(string name)
7777

7878
private class LanguageNameComparer : EqualityComparer<Language>
7979
{
80-
public override bool Equals(Language l1, Language l2)
80+
public override bool Equals(Language? l1, Language? l2)
8181
{
82-
return l1.Name == l2.Name;
82+
return l1!.Name == l2!.Name;
8383
}
8484

8585
public override int GetHashCode(Language l)

‎TryCSharp.Samples/Linq/LinqSamples54.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void Execute()
3535
// -- File.OpenReadで返るのはFileStream
3636
// FileStreamはStreamのサブクラス.
3737
//
38-
XElement element = null;
38+
XElement? element = null;
3939
using (var stream = File.OpenRead("xml/Books.xml"))
4040
{
4141
element = XElement.Load(stream);

‎TryCSharp.Samples/Linq/LinqSamples61.cs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ public void Execute()
3232

3333
try
3434
{
35-
elem.Value = null;
35+
// C# 8.0 から追加された Nullable Reference Type によって以下は警告が
36+
// 必ず発生するようになったので意味がなくなった。
37+
// elem.Value = null;
3638
}
3739
catch (ArgumentNullException argNullEx)
3840
{
@@ -63,7 +65,9 @@ public void Execute()
6365

6466
try
6567
{
66-
elem.SetValue(null);
68+
// C# 8.0 から追加された Nullable Reference Type によって以下は警告が
69+
// 必ず発生するようになったので意味がなくなった。
70+
//elem.SetValue(null);
6771
}
6872
catch (ArgumentNullException argNullEx)
6973
{

‎TryCSharp.Samples/Linq/LinqSamples64.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void Execute()
2525
var attr = elem.FirstAttribute;
2626

2727
Output.WriteLine(attr);
28-
Output.WriteLine("{0}=\"{1}\"", attr.Name, attr.Value);
28+
Output.WriteLine("{0}=\"{1}\"", attr!.Name, attr.Value);
2929
Output.WriteLine("=====================================");
3030

3131
//

‎TryCSharp.Samples/Linq/LinqSamples66.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void Execute()
2929
var elem = root.Elements("Child").First();
3030

3131
var attr = elem.Attribute("Id");
32-
attr.Value = 500.ToString();
32+
attr!.Value = 500.ToString();
3333

3434
Output.WriteLine(root);
3535
Output.WriteLine("=====================================");

‎TryCSharp.Samples/Linq/LinqSamples83.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ public void Execute()
3434
// GUID,GUID?
3535
//
3636
var root = BuildSampleXml();
37+
if (root == null)
38+
{
39+
return;
40+
}
3741

38-
var title = (string) root.Descendants("Title").FirstOrDefault() ?? "Nothing";
39-
var attr = (string) root.Elements("Book").First().Attribute("id") ?? "Nothing";
40-
var noElem = (string) root.Descendants("NoElem").FirstOrDefault() ?? "Nothing";
42+
var title = (string) root.Descendants("Title").FirstOrDefault()! ?? "Nothing";
43+
var attr = (string) root.Elements("Book").First().Attribute("id")! ?? "Nothing";
44+
var noElem = (string) root.Descendants("NoElem").FirstOrDefault()! ?? "Nothing";
4145

4246
Output.WriteLine(title);
4347
Output.WriteLine(attr);

‎TryCSharp.Samples/Linq/LinqSamples84.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void Execute()
3636

3737
// 属性値を変更
3838
// Changingイベントなので、イベントハンドラ内にて見えるsenderの値は*更新前*の値となる。 (Change)
39-
book.Attribute("id").Value = "updated";
39+
book.Attribute("id")!.Value = "updated";
4040
// 要素の値を変更
4141
// Title要素は内部にXTextを持っているので、まずそれが削除される (Remove)
4242
// その後、更新後の値を持つXTextが設定される. (Add)
@@ -64,7 +64,7 @@ public void Execute()
6464

6565
// 属性値を変更
6666
// Changedイベントなので、イベントハンドラ内にて見えるsenderの値は*更新後*の値となる。 (Change)
67-
book.Attribute("id").Value = "updated";
67+
book.Attribute("id")!.Value = "updated";
6868
title.Value = "updated";
6969
title.Remove();
7070
book.Add(new XElement("newelem", "hogehoge"));
@@ -73,15 +73,15 @@ public void Execute()
7373
}
7474

7575
// Changingイベントハンドラ
76-
private void OnNodeChanging(object sender, XObjectChangeEventArgs e)
76+
private void OnNodeChanging(object? sender, XObjectChangeEventArgs e)
7777
{
78-
Output.WriteLine("Changing: sender--{0}:{1}, ObjectChange--{2}", sender.GetType().Name, sender, e.ObjectChange);
78+
Output.WriteLine("Changing: sender--{0}:{1}, ObjectChange--{2}", sender!.GetType().Name, sender, e.ObjectChange);
7979
}
8080

8181
// Changedイベントハンドラ
82-
private void OnNodeChanged(object sender, XObjectChangeEventArgs e)
82+
private void OnNodeChanged(object? sender, XObjectChangeEventArgs e)
8383
{
84-
Output.WriteLine("Changed: sender--{0}:{1}, ObjectChange--{2}", sender.GetType().Name, sender, e.ObjectChange);
84+
Output.WriteLine("Changed: sender--{0}:{1}, ObjectChange--{2}", sender!.GetType().Name, sender, e.ObjectChange);
8585
}
8686

8787
private XElement BuildSampleXml()

‎TryCSharp.Samples/Linq/LinqSamples85.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ from elem in original.Elements()
141141
select new XElement
142142
(
143143
"newdata",
144-
new XAttribute("code", elem.Element("code").Value),
145-
new XAttribute("name", elem.Element("name").Value)
144+
new XAttribute("code", elem.Element("code")!.Value),
145+
new XAttribute("name", elem.Element("name")!.Value)
146146
)
147147
);
148148

@@ -158,8 +158,8 @@ from elem in original.Elements()
158158
select new XElement
159159
(
160160
"newdata",
161-
new XAttribute("code", elem.Element("code").Value),
162-
new XAttribute("name", elem.Element("name").Value)
161+
new XAttribute("code", elem.Element("code")!.Value),
162+
new XAttribute("name", elem.Element("name")!.Value)
163163
)
164164
);
165165

@@ -177,8 +177,8 @@ from elem in StreamTooBigXml(filePath)
177177
select new XElement
178178
(
179179
"newdata",
180-
new XAttribute("code", elem.Element("code").Value),
181-
new XAttribute("name", elem.Element("name").Value)
180+
new XAttribute("code", elem.Element("code")!.Value),
181+
new XAttribute("name", elem.Element("name")!.Value)
182182
)
183183
);
184184

0 commit comments

Comments
 (0)