Fix for nameSpace

RomanSoloweow · RomanSoloweow · commit 4ac6ed2574d7 · 2020-02-20T23:21:39.000+03:00
diff --git a/SimpleStateMachineLibrary/Data/Data.cs b/SimpleStateMachineLibrary/Data/Data.cs
@@ -1,8 +1,6 @@
 ﻿using SimpleStateMachineLibrary.Helpers;
-using SimpleStateMachineLibrary.StateMachines;
 
-
-namespace SimpleStateMachineLibrary.Datas
+namespace SimpleStateMachineLibrary
 {
     public partial class Data : NamedObject
     {
diff --git a/SimpleStateMachineLibrary/Data/DataWorkWithXML.cs b/SimpleStateMachineLibrary/Data/DataWorkWithXML.cs
@@ -1,12 +1,11 @@
 ﻿using SimpleStateMachineLibrary.Helpers;
-using SimpleStateMachineLibrary.StateMachines;
 using System.Xml.Linq;
 
-namespace SimpleStateMachineLibrary.Datas
+
+namespace SimpleStateMachineLibrary
 {
-    public partial class Data : NamedObject
+    public partial class Data
     {
-
         public static XElement ToXElement(Data data)
         {
             Check.NamedObject(data);
diff --git a/SimpleStateMachineLibrary/Helpers/Check.cs b/SimpleStateMachineLibrary/Helpers/Check.cs
@@ -88,7 +88,7 @@ public static TObject Remove<TObject>(Dictionary<string, TObject> dictionary, st
             TObject removedObj = default(TObject);
             dictionary?.TryGetValue(nameObject, out removedObj);
 
-            if (removedObj== default(TObject))
+            if (removedObj == default(TObject))
             {
                 if (exeption)
                     throw new KeyNotFoundException(String.Format("Element with name {0} is not deleted because not found. ", nameObject));
@@ -124,13 +124,13 @@ public static TObject Remove<TObject>(Dictionary<string, TObject> dictionary, TO
         public static TObject GetElement<TObject>(Dictionary<string, TObject> dictionary, string nameObject, bool exeption = true) where TObject : NamedObject
         {
             bool contains = Contains(dictionary, nameObject, exeption);
-            return contains ? dictionary[nameObject]:default(TObject);
+            return contains ? dictionary[nameObject] : default(TObject);
         }
 
         public static TObject GetElement<TObject>(Dictionary<string, TObject> dictionary, TObject obj, bool exeption = true) where TObject : NamedObject
         {
             bool contains = Contains(dictionary, obj, exeption);
-            return contains? obj:default(TObject);
+            return contains ? obj : default(TObject);
         }
 
 
diff --git a/SimpleStateMachineLibrary/Helpers/NamedObject.cs b/SimpleStateMachineLibrary/Helpers/NamedObject.cs
@@ -1,8 +1,7 @@
-﻿using SimpleStateMachineLibrary.StateMachines;
-
-namespace SimpleStateMachineLibrary.Helpers
+﻿namespace SimpleStateMachineLibrary.Helpers
 {
-    public abstract class NamedObject
+
+    public  abstract class NamedObject
     {
         public string Name { get; }
         public StateMachine StateMachine { get; }
@@ -11,7 +10,7 @@ public NamedObject(StateMachine stateMachine, string nameObject)
         {
             StateMachine = Check.Object(stateMachine);
 
-            Name = Check.Name(nameObject);          
+            Name = Check.Name(nameObject);
         }
 
     }
diff --git a/SimpleStateMachineLibrary/StateMachines/StateMachine.cs b/SimpleStateMachineLibrary/StateMachines/StateMachine.cs
@@ -1,13 +1,9 @@
 ﻿using System.Collections.Generic;
 using System.Xml.Linq;
-
-using SimpleStateMachineLibrary.States;
-using SimpleStateMachineLibrary.Transitions;
-using SimpleStateMachineLibrary.Helpers;
-using SimpleStateMachineLibrary.Datas;
 using System;
+using SimpleStateMachineLibrary.Helpers;
 
-namespace SimpleStateMachineLibrary.StateMachines
+namespace SimpleStateMachineLibrary
 {
     public partial class StateMachine
     {
diff --git a/SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithData.cs b/SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithData.cs
@@ -1,8 +1,9 @@
-﻿using SimpleStateMachineLibrary.Datas;
-using SimpleStateMachineLibrary.Helpers;
+﻿
+
 
+using SimpleStateMachineLibrary.Helpers;
 
-namespace SimpleStateMachineLibrary.StateMachines
+namespace SimpleStateMachineLibrary
 {
     public partial class StateMachine
     {
diff --git a/SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithStates.cs b/SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithStates.cs
@@ -1,9 +1,8 @@
 ﻿using SimpleStateMachineLibrary.Helpers;
-using SimpleStateMachineLibrary.States;
-using System.Linq;
 using System.Xml.Linq;
 
-namespace SimpleStateMachineLibrary.StateMachines
+
+namespace SimpleStateMachineLibrary
 {
     public partial class StateMachine
     {
@@ -66,7 +65,7 @@ public State AddState(State state)
 
         public State AddState(XElement xElement)
         {
-            return States.State.FromXElement(this, Check.Object(xElement));
+            return SimpleStateMachineLibrary.State.FromXElement(this, Check.Object(xElement));
         }
 
         public State TryAddState(string nameState)
diff --git a/SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithTransitions.cs b/SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithTransitions.cs
@@ -1,13 +1,12 @@
-﻿using SimpleStateMachineLibrary.Helpers;
-using SimpleStateMachineLibrary.States;
-using SimpleStateMachineLibrary.Transitions;
+﻿
+using SimpleStateMachineLibrary.Helpers;
 using System.Xml.Linq;
 
-namespace SimpleStateMachineLibrary.StateMachines
+
+namespace SimpleStateMachineLibrary
 {
     public partial class StateMachine
     {
-
         private Transition _Transition(Transition transition, bool exeption)
         {
             return Check.GetElement(_transitions, transition, exeption);
@@ -79,7 +78,7 @@ public Transition AddTransition(Transition transition)
 
         public Transition AddTransition(XElement xElement)
         {
-            return Transitions.Transition.FromXElement(this, Check.Object(xElement));
+            return SimpleStateMachineLibrary.Transition.FromXElement(this, Check.Object(xElement));
         }
 
         public Transition TryAddTransition(string nameTrancition, State stateFrom, State stateTo)
diff --git a/SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithTransitionsForState.cs b/SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithTransitionsForState.cs
@@ -1,12 +1,10 @@
-﻿using SimpleStateMachineLibrary.States;
-using SimpleStateMachineLibrary.Transitions;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SimpleStateMachineLibrary.StateMachines
+namespace SimpleStateMachineLibrary
 {
     public partial class StateMachine
     {
diff --git a/SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithXML.cs b/SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithXML.cs
@@ -2,12 +2,13 @@
 using System.Linq;
 using System.Xml.Linq;
 
-namespace SimpleStateMachineLibrary.StateMachines
+
+namespace SimpleStateMachineLibrary
 {
     public partial class StateMachine
     {
 
-        public static XDocument ToXDocument(StateMachine stateMachine, string nameFile = "StateMachine.xml")
+        public static XDocument ToXDocument(StateMachine stateMachine, string nameFile)
         {
             Check.Object(stateMachine);
             Check.Name(nameFile);
@@ -33,7 +34,7 @@ public static XDocument ToXDocument(StateMachine stateMachine, string nameFile =
             return xDocument;
         }
 
-        public XDocument ToXDocument(string nameFile = "StateMachine.xml")
+        public XDocument ToXDocument(string nameFile)
         {
             return StateMachine.ToXDocument(this, nameFile);
         }
diff --git a/SimpleStateMachineLibrary/States/State.cs b/SimpleStateMachineLibrary/States/State.cs
@@ -1,12 +1,10 @@
 ﻿using SimpleStateMachineLibrary.Helpers;
-using SimpleStateMachineLibrary.StateMachines;
-using SimpleStateMachineLibrary.Transitions;
 using System;
 using System.Collections.Generic;
 
-namespace SimpleStateMachineLibrary.States
-{
 
+namespace SimpleStateMachineLibrary
+{
     public partial class State : NamedObject
     {
         private Action<StateMachine, Dictionary<string, object>> _actionOnEntryWithParameters;
diff --git a/SimpleStateMachineLibrary/States/StateWorkWithTransitionsFromThisState.cs b/SimpleStateMachineLibrary/States/StateWorkWithTransitionsFromThisState.cs
@@ -1,11 +1,10 @@
-﻿using SimpleStateMachineLibrary.Helpers;
-using SimpleStateMachineLibrary.Transitions;
+﻿
 using System;
 using System.Collections.Generic;
 
-namespace SimpleStateMachineLibrary.States
+namespace SimpleStateMachineLibrary
 {
-    public partial class State : NamedObject
+    public partial class State
     {
         public List<Transition> GetTransitionsFromThis()
         {
diff --git a/SimpleStateMachineLibrary/States/StateWorkWithTransitionsToThisState.cs b/SimpleStateMachineLibrary/States/StateWorkWithTransitionsToThisState.cs
@@ -1,11 +1,9 @@
 ﻿using System.Collections.Generic;
 
-using SimpleStateMachineLibrary.Helpers;
-using SimpleStateMachineLibrary.Transitions;
 
-namespace SimpleStateMachineLibrary.States
+namespace SimpleStateMachineLibrary
 {
-    public partial class State : NamedObject
+    public partial class State
     {
 
         public List<Transition> GetTransitionsToThis()
diff --git a/SimpleStateMachineLibrary/States/StateWorkWithXML.cs b/SimpleStateMachineLibrary/States/StateWorkWithXML.cs
@@ -1,10 +1,10 @@
 ﻿using SimpleStateMachineLibrary.Helpers;
-using SimpleStateMachineLibrary.StateMachines;
 using System.Xml.Linq;
 
-namespace SimpleStateMachineLibrary.States
+
+namespace SimpleStateMachineLibrary
 {
-    public partial class State : NamedObject
+    public partial class State
     {
         public static XElement ToXElement(State state)
         {
diff --git a/SimpleStateMachineLibrary/Transitions/Transition.cs b/SimpleStateMachineLibrary/Transitions/Transition.cs
@@ -1,10 +1,9 @@
 ﻿using SimpleStateMachineLibrary.Helpers;
-using SimpleStateMachineLibrary.StateMachines;
-using SimpleStateMachineLibrary.States;
 using System;
 using System.Collections.Generic;
 
-namespace SimpleStateMachineLibrary.Transitions
+
+namespace SimpleStateMachineLibrary
 {
     public partial class Transition : NamedObject
     {
diff --git a/SimpleStateMachineLibrary/Transitions/TransitionWorkWithXML.cs b/SimpleStateMachineLibrary/Transitions/TransitionWorkWithXML.cs
@@ -1,8 +1,8 @@
 ﻿using SimpleStateMachineLibrary.Helpers;
-using SimpleStateMachineLibrary.StateMachines;
 using System.Xml.Linq;
 
-namespace SimpleStateMachineLibrary.Transitions
+
+namespace SimpleStateMachineLibrary
 {
     public partial class Transition : NamedObject
     {
diff --git a/Tests/UnitTest1.cs b/Tests/UnitTest1.cs
@@ -1,8 +1,6 @@
 using Xunit;
-using SimpleStateMachineLibrary.StateMachines;
-using SimpleStateMachineLibrary.States;
-using SimpleStateMachineLibrary.Transitions;
 using System.Collections.Generic;
+using SimpleStateMachineLibrary;
 
 namespace Tests
 {
@@ -16,7 +14,7 @@ public struct Test
 
         void Testi1(StateMachine stateMachine, Dictionary<string, object> parameters)
         {
-            stateMachine.InvokeTransitionWithParameters("Transition1", new Dictionary<string, object>() { {"Test1", "Test1" } });
+            stateMachine.InvokeTransitionWithParameters("Transition1", new Dictionary<string, object>() { { "Test1", "Test1" } });
         }
         void Testi2(StateMachine stateMachine, Dictionary<string, object> parameters)
         {
@@ -25,7 +23,6 @@ void Testi2(StateMachine stateMachine, Dictionary<string, object> parameters)
         [Fact]
         public void Test1()
         {
-   
             StateMachine stateMachine = new StateMachine();
             State state1 = stateMachine.AddState("State1");
             State state2 = stateMachine.AddState("State2");

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`using SimpleStateMachineLibrary.Helpers;`
`2`		`-using SimpleStateMachineLibrary.StateMachines;`
`3`	`2`
`4`		`-`
`5`		`-namespace SimpleStateMachineLibrary.Datas`
	`3`	`+namespace SimpleStateMachineLibrary`
`6`	`4`	`{`
`7`	`5`	`public partial class Data : NamedObject`
`8`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`	`1`	`using SimpleStateMachineLibrary.Helpers;`
`2`		`-using SimpleStateMachineLibrary.StateMachines;`
`3`	`2`	`using System.Xml.Linq;`
`4`	`3`
`5`		`-namespace SimpleStateMachineLibrary.Datas`
	`4`	`+`
	`5`	`+namespace SimpleStateMachineLibrary`
`6`	`6`	`{`
`7`		`- public partial class Data : NamedObject`
	`7`	`+ public partial class Data`
`8`	`8`	`{`
`9`		`-`
`10`	`9`	`public static XElement ToXElement(Data data)`
`11`	`10`	`{`
`12`	`11`	`Check.NamedObject(data);`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public static TObject Remove<TObject>(Dictionary<string, TObject> dictionary, st`
`88`	`88`	`TObject removedObj = default(TObject);`
`89`	`89`	`dictionary?.TryGetValue(nameObject, out removedObj);`
`90`	`90`
`91`		`- if (removedObj== default(TObject))`
	`91`	`+ if (removedObj == default(TObject))`
`92`	`92`	`{`
`93`	`93`	`if (exeption)`
`94`	`94`	`throw new KeyNotFoundException(String.Format("Element with name {0} is not deleted because not found. ", nameObject));`
`@@ -124,13 +124,13 @@ public static TObject Remove<TObject>(Dictionary<string, TObject> dictionary, TO`
`124`	`124`	`public static TObject GetElement<TObject>(Dictionary<string, TObject> dictionary, string nameObject, bool exeption = true) where TObject : NamedObject`
`125`	`125`	`{`
`126`	`126`	`bool contains = Contains(dictionary, nameObject, exeption);`
`127`		`- return contains ? dictionary[nameObject]:default(TObject);`
	`127`	`+ return contains ? dictionary[nameObject] : default(TObject);`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`public static TObject GetElement<TObject>(Dictionary<string, TObject> dictionary, TObject obj, bool exeption = true) where TObject : NamedObject`
`131`	`131`	`{`
`132`	`132`	`bool contains = Contains(dictionary, obj, exeption);`
`133`		`- return contains? obj:default(TObject);`
	`133`	`+ return contains ? obj : default(TObject);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`		`-using SimpleStateMachineLibrary.StateMachines;`
`2`		`-`
`3`		`-namespace SimpleStateMachineLibrary.Helpers`
	`1`	`+namespace SimpleStateMachineLibrary.Helpers`
`4`	`2`	`{`
`5`		`- public abstract class NamedObject`
	`3`	`+`
	`4`	`+ public abstract class NamedObject`
`6`	`5`	`{`
`7`	`6`	`public string Name { get; }`
`8`	`7`	`public StateMachine StateMachine { get; }`
`@@ -11,7 +10,7 @@ public NamedObject(StateMachine stateMachine, string nameObject)`
`11`	`10`	`{`
`12`	`11`	`StateMachine = Check.Object(stateMachine);`
`13`	`12`
`14`		`- Name = Check.Name(nameObject);`
	`13`	`+ Name = Check.Name(nameObject);`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`		`-using SimpleStateMachineLibrary.Datas;`
`2`		`-using SimpleStateMachineLibrary.Helpers;`
	`1`	`+`
	`2`	`+`
`3`	`3`
	`4`	`+using SimpleStateMachineLibrary.Helpers;`
`4`	`5`
`5`		`-namespace SimpleStateMachineLibrary.StateMachines`
	`6`	`+namespace SimpleStateMachineLibrary`
`6`	`7`	`{`
`7`	`8`	`public partial class StateMachine`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`using SimpleStateMachineLibrary.Helpers;`
`2`		`-using SimpleStateMachineLibrary.States;`
`3`		`-using System.Linq;`
`4`	`2`	`using System.Xml.Linq;`
`5`	`3`
`6`		`-namespace SimpleStateMachineLibrary.StateMachines`
	`4`	`+`
	`5`	`+namespace SimpleStateMachineLibrary`
`7`	`6`	`{`
`8`	`7`	`public partial class StateMachine`
`9`	`8`	`{`
`@@ -66,7 +65,7 @@ public State AddState(State state)`
`66`	`65`
`67`	`66`	`public State AddState(XElement xElement)`
`68`	`67`	`{`
`69`		`- return States.State.FromXElement(this, Check.Object(xElement));`
	`68`	`+ return SimpleStateMachineLibrary.State.FromXElement(this, Check.Object(xElement));`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`public State TryAddState(string nameState)`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,12 @@`
`1`		`-using SimpleStateMachineLibrary.Helpers;`
`2`		`-using SimpleStateMachineLibrary.States;`
`3`		`-using SimpleStateMachineLibrary.Transitions;`
	`1`	`+`
	`2`	`+using SimpleStateMachineLibrary.Helpers;`
`4`	`3`	`using System.Xml.Linq;`
`5`	`4`
`6`		`-namespace SimpleStateMachineLibrary.StateMachines`
	`5`	`+`
	`6`	`+namespace SimpleStateMachineLibrary`
`7`	`7`	`{`
`8`	`8`	`public partial class StateMachine`
`9`	`9`	`{`
`10`		`-`
`11`	`10`	`private Transition _Transition(Transition transition, bool exeption)`
`12`	`11`	`{`
`13`	`12`	`return Check.GetElement(_transitions, transition, exeption);`
`@@ -79,7 +78,7 @@ public Transition AddTransition(Transition transition)`
`79`	`78`
`80`	`79`	`public Transition AddTransition(XElement xElement)`
`81`	`80`	`{`
`82`		`- return Transitions.Transition.FromXElement(this, Check.Object(xElement));`
	`81`	`+ return SimpleStateMachineLibrary.Transition.FromXElement(this, Check.Object(xElement));`
`83`	`82`	`}`
`84`	`83`
`85`	`84`	`public Transition TryAddTransition(string nameTrancition, State stateFrom, State stateTo)`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`		`-using SimpleStateMachineLibrary.States;`
`2`		`-using SimpleStateMachineLibrary.Transitions;`
`3`		`-using System;`
	`1`	`+using System;`
`4`	`2`	`using System.Collections.Generic;`
`5`	`3`	`using System.Linq;`
`6`	`4`	`using System.Text;`
`7`	`5`	`using System.Threading.Tasks;`
`8`	`6`
`9`		`-namespace SimpleStateMachineLibrary.StateMachines`
	`7`	`+namespace SimpleStateMachineLibrary`
`10`	`8`	`{`
`11`	`9`	`public partial class StateMachine`
`12`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,13 @@`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using System.Xml.Linq;`
`4`	`4`
`5`		`-namespace SimpleStateMachineLibrary.StateMachines`
	`5`	`+`
	`6`	`+namespace SimpleStateMachineLibrary`
`6`	`7`	`{`
`7`	`8`	`public partial class StateMachine`
`8`	`9`	`{`
`9`	`10`
`10`		`- public static XDocument ToXDocument(StateMachine stateMachine, string nameFile = "StateMachine.xml")`
	`11`	`+ public static XDocument ToXDocument(StateMachine stateMachine, string nameFile)`
`11`	`12`	`{`
`12`	`13`	`Check.Object(stateMachine);`
`13`	`14`	`Check.Name(nameFile);`
`@@ -33,7 +34,7 @@ public static XDocument ToXDocument(StateMachine stateMachine, string nameFile =`
`33`	`34`	`return xDocument;`
`34`	`35`	`}`
`35`	`36`
`36`		`- public XDocument ToXDocument(string nameFile = "StateMachine.xml")`
	`37`	`+ public XDocument ToXDocument(string nameFile)`
`37`	`38`	`{`
`38`	`39`	`return StateMachine.ToXDocument(this, nameFile);`
`39`	`40`	`}`