From da6babe2dd1016339cb57038a0edb787e3472ade Mon Sep 17 00:00:00 2001
From: Ismail TAHA JANAN <ismailtahajanan2@gmail.com>
Date: Fri, 23 Sep 2022 16:55:16 +0200
Subject: [PATCH] =?UTF-8?q?#59=20:=20=EF=BF=BD:adhesive=5Fbandage:=20fix:?=
 =?UTF-8?q?=20more=20conflict=20fixing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/Data/Stub.cs                    | 18 ------------------
 Sources/Model/{ => Dice}/AbstractDie.cs | 10 +++++-----
 Sources/Model/{ => Dice}/ColorDie.cs    |  2 +-
 Sources/Model/{ => Dice}/ImageDie.cs    |  2 +-
 Sources/Model/{ => Dice}/NumberDie.cs   |  6 +++---
 5 files changed, 10 insertions(+), 28 deletions(-)
 rename Sources/Model/{ => Dice}/AbstractDie.cs (69%)
 rename Sources/Model/{ => Dice}/ColorDie.cs (96%)
 rename Sources/Model/{ => Dice}/ImageDie.cs (96%)
 rename Sources/Model/{ => Dice}/NumberDie.cs (79%)

diff --git a/Sources/Data/Stub.cs b/Sources/Data/Stub.cs
index ace25d7..e1dce10 100644
--- a/Sources/Data/Stub.cs
+++ b/Sources/Data/Stub.cs
@@ -73,24 +73,6 @@ namespace Data
             return list;
         }
 
-<<<<<<< HEAD
-        public static List<AbstractDie> LoadDices()
-        {
-            List<AbstractDie> list = new()
-            {
-                new AbstractDie("Dice 1"),
-                new AbstractDie("Dice 1"),
-                new AbstractDie("Dice 1"),
-                new AbstractDie("Dice 1"),
-                new AbstractDie("Dice 1"),
-                new AbstractDie("Dice 1")
-            };
-
-            return list;
-        }
-
-=======
->>>>>>> main
         public static List<NumberDieFace> LoadNumFaces()
         {
             List<NumberDieFace> list = new()
diff --git a/Sources/Model/AbstractDie.cs b/Sources/Model/Dice/AbstractDie.cs
similarity index 69%
rename from Sources/Model/AbstractDie.cs
rename to Sources/Model/Dice/AbstractDie.cs
index 88a3df8..7f35fad 100644
--- a/Sources/Model/AbstractDie.cs
+++ b/Sources/Model/Dice/AbstractDie.cs
@@ -1,18 +1,18 @@
 using System.Collections.Generic;
 
-namespace Model
+namespace Model.Dice
 {
     public abstract class AbstractDie<T> where T : AbstractDieFace
     {
         protected string Name;
-        public  IEnumerable<T> ListFaces  => listFaces; 
+        public IEnumerable<T> ListFaces => listFaces;
 
-        private readonly List<T> listFaces =new();
+        private readonly List<T> listFaces = new();
 
         public AbstractDie(string name, params T[] faces)
         {
-            this.Name = name;
-            listFaces.AddRange(faces) ;
+            Name = name;
+            listFaces.AddRange(faces);
         }
 
 
diff --git a/Sources/Model/ColorDie.cs b/Sources/Model/Dice/ColorDie.cs
similarity index 96%
rename from Sources/Model/ColorDie.cs
rename to Sources/Model/Dice/ColorDie.cs
index 191e66a..d997c25 100644
--- a/Sources/Model/ColorDie.cs
+++ b/Sources/Model/Dice/ColorDie.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Dice
 {
     public class ColorDie : AbstractDie<ColorDieFace>
     {
diff --git a/Sources/Model/ImageDie.cs b/Sources/Model/Dice/ImageDie.cs
similarity index 96%
rename from Sources/Model/ImageDie.cs
rename to Sources/Model/Dice/ImageDie.cs
index 2daf6bb..222473b 100644
--- a/Sources/Model/ImageDie.cs
+++ b/Sources/Model/Dice/ImageDie.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Dice
 {
     public class ImageDie : AbstractDie<ImageDieFace>
     {
diff --git a/Sources/Model/NumberDie.cs b/Sources/Model/Dice/NumberDie.cs
similarity index 79%
rename from Sources/Model/NumberDie.cs
rename to Sources/Model/Dice/NumberDie.cs
index 211ac15..e58bd13 100644
--- a/Sources/Model/NumberDie.cs
+++ b/Sources/Model/Dice/NumberDie.cs
@@ -4,18 +4,18 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Dice
 {
     public class NumberDie : AbstractDie<NumberDieFace>
     {
 
-        public NumberDie(string name, params NumberDieFace[] faces ) : base(name,faces)
+        public NumberDie(string name, params NumberDieFace[] faces) : base(name, faces)
         {
         }
         public override NumberDieFace GetRandomFace()
         {
             Random rnd = new();
-            int faceIndex = rnd.Next(1, ListFaces.Count()+1);
+            int faceIndex = rnd.Next(1, ListFaces.Count() + 1);
             return ListFaces.ElementAt(faceIndex);
 
         }