[Samples] Move GoodClasses samples to Lesson7 folder

florinc · florinc · commit 706b714a1dc7 · 2020-02-27T16:05:20.000+02:00
diff --git a/LessonsSamples/LessonsSamples/Lesson6/MovieListerFactory.cs b/LessonsSamples/LessonsSamples/Lesson6/MovieListerFactory.cs
@@ -1,6 +1,6 @@
 ﻿using System;
-using LessonsSamples.Lesson3.DataModel;
 using LessonsSamples.Lesson6.DependencyInjection;
+using LessonsSamples.Lesson7.GoodClasses.DataModel;
 
 namespace LessonsSamples.Lesson6
 {
diff --git a/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/DataModel/Repository.cs b/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/DataModel/Repository.cs
@@ -9,7 +9,7 @@
 using System.Security.Claims;
 using iQuarc.AppBoot;
 
-namespace LessonsSamples.Lesson3.DataModel
+namespace LessonsSamples.Lesson7.GoodClasses.DataModel
 {
     public interface IRepository : IDisposable
     {
diff --git a/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/DataModel/SalesOrder.cs b/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/DataModel/SalesOrder.cs
@@ -1,8 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
-using ClassLibrary1;
 
-namespace LessonsSamples.Lesson3.DataModel
+namespace LessonsSamples.Lesson7.GoodClasses.DataModel
 {
     public partial class SalesOrderHeader
     {
diff --git a/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/Geometry/CircleGeometry.cs b/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/Geometry/CircleGeometry.cs
@@ -1,7 +1,7 @@
 using System;
-using ProceduralShapes;
+using LessonsSamples.Lesson7.GoodClasses.Procedural;
 
-namespace LessonsSamples.Lesson3.Geometry
+namespace LessonsSamples.Lesson7.GoodClasses.Geometry
 {
     class SquareGeometry : GeometryCalculator<Square>
     {
diff --git a/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/Geometry/GeometryCalculatorFactory.cs b/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/Geometry/GeometryCalculatorFactory.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using ProceduralShapes;
+using LessonsSamples.Lesson7.GoodClasses.Procedural;
 
-namespace LessonsSamples.Lesson3.Geometry
+namespace LessonsSamples.Lesson7.GoodClasses.Geometry
 {
     internal interface IGeometryCalculatorFactory
     {
@@ -18,7 +18,6 @@ class GeometryCalculatorFactory : IGeometryCalculatorFactory
             {typeof (Circle), () => new CircleGeometry()},
         };
 
-
         public IGeometryCalculator GetCalculator(Type shape)
         {
             var constructor = constructors[shape];
diff --git a/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/Geometry/IGeometryCalculator.cs b/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/Geometry/IGeometryCalculator.cs
@@ -1,6 +1,5 @@
-﻿using System;
-
-namespace LessonsSamples.Lesson3.Geometry
+﻿
+namespace LessonsSamples.Lesson7.GoodClasses.Geometry
 {
     class Geometry : IGeometryCalculator
     {
diff --git a/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/Geometry/PolymorphicShapes.cs b/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/Geometry/PolymorphicShapes.cs
@@ -1,7 +1,7 @@
 using System;
 using ClassLibrary1;
 
-namespace PolymorphicShapes
+namespace LessonsSamples.Lesson7.GoodClasses.Polimorphic
 {
     interface IShape
     {
@@ -12,10 +12,10 @@ class Square : IShape
     {
         private Point topLeft;
         private double side;
-        
+
         public double GetArea()
         {
-            return side*side;
+            return side * side;
         }
     }
 
diff --git a/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/Geometry/ProceduralShapes.cs b/LessonsSamples/LessonsSamples/Lesson7/GoodClasses/Geometry/ProceduralShapes.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using ClassLibrary1;
 
-namespace ProceduralShapes
+namespace LessonsSamples.Lesson7.GoodClasses.Procedural
 {
     class Square
     {
diff --git a/LessonsSamples/LessonsSamples/Lesson8/RowLevelAuth/Repository.cs b/LessonsSamples/LessonsSamples/Lesson8/RowLevelAuth/Repository.cs
@@ -4,7 +4,7 @@
 using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
-using LessonsSamples.Lesson3.DataModel;
+using LessonsSamples.Lesson7.GoodClasses.DataModel;
 
 namespace LessonsSamples.Lesson8.RowLevelAuth
 {
diff --git a/LessonsSamples/LessonsSamples/Lesson8/RowLevelAuth/SomeService.cs b/LessonsSamples/LessonsSamples/Lesson8/RowLevelAuth/SomeService.cs
@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Data.Entity;
 using System.Linq;
-using LessonsSamples.Lesson3.DataModel;
+using LessonsSamples.Lesson7.GoodClasses.DataModel;
 
 namespace LessonsSamples.Lesson8.RowLevelAuth
 {
diff --git a/LessonsSamples/LessonsSamples/LessonsSamples.csproj b/LessonsSamples/LessonsSamples/LessonsSamples.csproj
@@ -126,13 +126,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Customer.cs" />
-    <Compile Include="Lesson3\DataModel\Repository.cs" />
-    <Compile Include="Lesson3\DataModel\SalesOrder.cs" />
-    <Compile Include="Lesson3\Geometry\CircleGeometry.cs" />
-    <Compile Include="Lesson3\Geometry\GeometryCalculatorFactory.cs" />
-    <Compile Include="Lesson3\Geometry\IGeometryCalculator.cs" />
-    <Compile Include="Lesson3\PolymorphicShapes.cs" />
-    <Compile Include="Lesson3\ProceduralShapes.cs" />
+    <Compile Include="Lesson7\GoodClasses\DataModel\Repository.cs" />
+    <Compile Include="Lesson7\GoodClasses\DataModel\SalesOrder.cs" />
     <Compile Include="Lesson5\ImageScale.cs" />
     <Compile Include="Lesson5\Shapes.cs" />
     <Compile Include="Lesson5\Class2.cs" />
@@ -204,6 +199,11 @@
     <Compile Include="Lesson7\CohesionCoupling\13_PageXmlExportClient.cs" />
     <Compile Include="Lesson7\ErrorHandling\DeviceController.cs" />
     <Compile Include="Lesson7\ErrorHandling\CodeSnippet.cs" />
+    <Compile Include="Lesson7\GoodClasses\Geometry\CircleGeometry.cs" />
+    <Compile Include="Lesson7\GoodClasses\Geometry\GeometryCalculatorFactory.cs" />
+    <Compile Include="Lesson7\GoodClasses\Geometry\IGeometryCalculator.cs" />
+    <Compile Include="Lesson7\GoodClasses\Geometry\PolymorphicShapes.cs" />
+    <Compile Include="Lesson7\GoodClasses\Geometry\ProceduralShapes.cs" />
     <Compile Include="Lesson7\InheritanceComposition\Account.cs" />
     <Compile Include="Lesson7\InheritanceComposition\AccountClientCode.cs" />
     <Compile Include="Lesson7\InheritanceComposition\AccountClientCodeTests.cs" />
@@ -245,6 +245,9 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Lesson3\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`		`-using LessonsSamples.Lesson3.DataModel;`
`3`	`2`	`using LessonsSamples.Lesson6.DependencyInjection;`
	`3`	`+using LessonsSamples.Lesson7.GoodClasses.DataModel;`
`4`	`4`
`5`	`5`	`namespace LessonsSamples.Lesson6`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`using System.Security.Claims;`
`10`	`10`	`using iQuarc.AppBoot;`
`11`	`11`
`12`		`-namespace LessonsSamples.Lesson3.DataModel`
	`12`	`+namespace LessonsSamples.Lesson7.GoodClasses.DataModel`
`13`	`13`	`{`
`14`	`14`	`public interface IRepository : IDisposable`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using ClassLibrary1;`
`4`	`3`
`5`		`-namespace LessonsSamples.Lesson3.DataModel`
	`4`	`+namespace LessonsSamples.Lesson7.GoodClasses.DataModel`
`6`	`5`	`{`
`7`	`6`	`public partial class SalesOrderHeader`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`		`-using ProceduralShapes;`
	`2`	`+using LessonsSamples.Lesson7.GoodClasses.Procedural;`
`3`	`3`
`4`		`-namespace LessonsSamples.Lesson3.Geometry`
	`4`	`+namespace LessonsSamples.Lesson7.GoodClasses.Geometry`
`5`	`5`	`{`
`6`	`6`	`class SquareGeometry : GeometryCalculator<Square>`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using ProceduralShapes;`
	`3`	`+using LessonsSamples.Lesson7.GoodClasses.Procedural;`
`4`	`4`
`5`		`-namespace LessonsSamples.Lesson3.Geometry`
	`5`	`+namespace LessonsSamples.Lesson7.GoodClasses.Geometry`
`6`	`6`	`{`
`7`	`7`	`internal interface IGeometryCalculatorFactory`
`8`	`8`	`{`
`@@ -18,7 +18,6 @@ class GeometryCalculatorFactory : IGeometryCalculatorFactory`
`18`	`18`	`{typeof (Circle), () => new CircleGeometry()},`
`19`	`19`	`};`
`20`	`20`
`21`		`-`
`22`	`21`	`public IGeometryCalculator GetCalculator(Type shape)`
`23`	`22`	`{`
`24`	`23`	`var constructor = constructors[shape];`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`		`-using System;`
`2`		`-`
`3`		`-namespace LessonsSamples.Lesson3.Geometry`
	`1`	`+`
	`2`	`+namespace LessonsSamples.Lesson7.GoodClasses.Geometry`
`4`	`3`	`{`
`5`	`4`	`class Geometry : IGeometryCalculator`
`6`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using ClassLibrary1;`
`3`	`3`
`4`		`-namespace PolymorphicShapes`
	`4`	`+namespace LessonsSamples.Lesson7.GoodClasses.Polimorphic`
`5`	`5`	`{`
`6`	`6`	`interface IShape`
`7`	`7`	`{`
`@@ -12,10 +12,10 @@ class Square : IShape`
`12`	`12`	`{`
`13`	`13`	`private Point topLeft;`
`14`	`14`	`private double side;`
`15`		`-`
	`15`	`+`
`16`	`16`	`public double GetArea()`
`17`	`17`	`{`
`18`		`- return side*side;`
	`18`	`+ return side * side;`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Linq.Expressions;`
`5`	`5`	`using System.Text;`
`6`	`6`	`using System.Threading.Tasks;`
`7`		`-using LessonsSamples.Lesson3.DataModel;`
	`7`	`+using LessonsSamples.Lesson7.GoodClasses.DataModel;`
`8`	`8`
`9`	`9`	`namespace LessonsSamples.Lesson8.RowLevelAuth`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Collections;`
`2`	`2`	`using System.Data.Entity;`
`3`	`3`	`using System.Linq;`
`4`		`-using LessonsSamples.Lesson3.DataModel;`
	`4`	`+using LessonsSamples.Lesson7.GoodClasses.DataModel;`
`5`	`5`
`6`	`6`	`namespace LessonsSamples.Lesson8.RowLevelAuth`
`7`	`7`	`{`