From c88851af6e68482b620eed531f7b8943740eadea Mon Sep 17 00:00:00 2001 From: Alexis DRAI Date: Wed, 21 Sep 2022 13:26:46 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20args,=20=F0=9F=8E=A8?= =?UTF-8?q?=20improve=20code=20lisibility?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Model/NumberDieFace.cs | 14 +++--- Sources/Stub/Stub.cs | 88 ++++++++++++++++++---------------- 2 files changed, 55 insertions(+), 47 deletions(-) diff --git a/Sources/Model/NumberDieFace.cs b/Sources/Model/NumberDieFace.cs index 24ac0ab..f340c13 100644 --- a/Sources/Model/NumberDieFace.cs +++ b/Sources/Model/NumberDieFace.cs @@ -8,15 +8,15 @@ namespace Model { public class NumberDieFace : AbstractDieFace { - public int Num { get; set; } - - public NumberDieFace(int v) + protected override int Value { get; } + public NumberDieFace(int value) { - this.Num = v; + Value = value; } - - - + public override object GetPracticalValue() + { + return Value; + } } } diff --git a/Sources/Stub/Stub.cs b/Sources/Stub/Stub.cs index 285497c..fa5ee66 100644 --- a/Sources/Stub/Stub.cs +++ b/Sources/Stub/Stub.cs @@ -6,71 +6,79 @@ namespace Stub { public List LoadPlayers() { - List list = new List(); - list.Add(new Player("name 1")); - list.Add(new Player("name 2")); - list.Add(new Player("name 3")); - list.Add(new Player("name 4")); - list.Add(new Player("name 5")); - list.Add(new Player("name 6")); + List list = new() + { + new Player("name 1"), + new Player("name 2"), + new Player("name 3"), + new Player("name 4"), + new Player("name 5"), + new Player("name 6") + }; return list; } public List LoadDices() { - List list = new List(); - list.Add(new Die("Dice 1")); - list.Add(new Die("Dice 1")); - list.Add(new Die("Dice 1")); - list.Add(new Die("Dice 1")); - list.Add(new Die("Dice 1")); - list.Add(new Die("Dice 1")); + List list = new() + { + new Die("Dice 1"), + new Die("Dice 1"), + new Die("Dice 1"), + new Die("Dice 1"), + new Die("Dice 1"), + new Die("Dice 1") + }; return list; } public List LoadNumFaces() { - List list = new List(); - list.Add(new NumberDieFace(1)); - list.Add(new NumberDieFace(2)); - list.Add(new NumberDieFace(3)); - list.Add(new NumberDieFace(4)); - list.Add(new NumberDieFace(5)); - list.Add(new NumberDieFace(6)); - list.Add(new NumberDieFace(7)); + List list = new() + { + new NumberDieFace(1), + new NumberDieFace(2), + new NumberDieFace(3), + new NumberDieFace(4), + new NumberDieFace(5), + new NumberDieFace(6), + new NumberDieFace(7) + }; return list; } public List LoadClrFaces() { - List list = new List(); - list.Add(new ColorDieFace("#fff")); - list.Add(new ColorDieFace("#fff66")); - list.Add(new ColorDieFace("#fff11")); - list.Add(new ColorDieFace("#fff22")); - list.Add(new ColorDieFace("#fff33")); - list.Add(new ColorDieFace("#fff44")); - list.Add(new ColorDieFace("#fff55")); + List list = new() + { + new ColorDieFace("ffffff"), + new ColorDieFace("ffff66"), + new ColorDieFace("ffff11"), + new ColorDieFace("ffff22"), + new ColorDieFace("ffff33"), + new ColorDieFace("ffff44"), + new ColorDieFace("ffff55") + }; return list; } public List LoadImgFaces() { - List list = new List(); - list.Add(new ImageDieFace("http://baseUrl/img/1")); - list.Add(new ImageDieFace("http://baseUrl/img/2")); - list.Add(new ImageDieFace("http://baseUrl/img/3")); - list.Add(new ImageDieFace("http://baseUrl/img/4")); - list.Add(new ImageDieFace("http://baseUrl/img/5")); - list.Add(new ImageDieFace("http://baseUrl/img/6")); - list.Add(new ImageDieFace("http://baseUrl/img/7")); + List list = new() + { + new ImageDieFace("http://baseUrl/img/1"), + new ImageDieFace("http://baseUrl/img/2"), + new ImageDieFace("http://baseUrl/img/3"), + new ImageDieFace("http://baseUrl/img/4"), + new ImageDieFace("http://baseUrl/img/5"), + new ImageDieFace("http://baseUrl/img/6"), + new ImageDieFace("http://baseUrl/img/7") + }; return list; } - - } } \ No newline at end of file