fixed namespaces

lastunicorn · Jan 15, 2024 · b4d0865 · b4d0865
1 parent ab71c2e
commit b4d0865
Show file tree

Hide file tree

Showing 31 changed files with 34 additions and 29 deletions.
diff --git a/sources/Dot.AdventureGame/GameModel/AddOnCollection.cs b/sources/Dot.AdventureGame/GameModel/AddOnCollection.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using DustInTheWind.Dot.AdventureGame.ExportModel;
 using DustInTheWind.Dot.AdventureGame.LocationModel;
 using DustInTheWind.Dot.AdventureGame.ObjectModel;
+using DustInTheWind.Dot.Domain.GameModel;
 
 namespace DustInTheWind.Dot.AdventureGame.GameModel
 {

diff --git a/sources/Dot.AdventureGame/GameModel/Game.cs b/sources/Dot.AdventureGame/GameModel/Game.cs
@@ -4,7 +4,6 @@
 using System.Reflection;
 using DustInTheWind.Dot.AdventureGame.ActionModel;
 using DustInTheWind.Dot.AdventureGame.Actions;
-using DustInTheWind.Dot.AdventureGame.ExportModel;
 using DustInTheWind.Dot.AdventureGame.LocationModel;
 using DustInTheWind.Dot.AdventureGame.ObjectModel;
 using DustInTheWind.Dot.AdventureGame.Verbs;

diff --git a/sources/Dot.AdventureGame/GameModel/IAddOn.cs b/sources/Dot.AdventureGame/GameModel/IAddOn.cs
@@ -1,4 +1,4 @@
-using DustInTheWind.Dot.AdventureGame.ExportModel;
+using DustInTheWind.Dot.Domain.GameModel;
 
 namespace DustInTheWind.Dot.AdventureGame.GameModel
 {

diff --git a/sources/Dot.AdventureGame/LocationModel/LocationBase.cs b/sources/Dot.AdventureGame/LocationModel/LocationBase.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
-using DustInTheWind.Dot.AdventureGame.ExportModel;
 using DustInTheWind.Dot.AdventureGame.GameModel;
 using DustInTheWind.Dot.AdventureGame.ObjectModel;
 using DustInTheWind.Dot.Domain.AudioTextModel;
+using DustInTheWind.Dot.Domain.GameModel;
 
 namespace DustInTheWind.Dot.AdventureGame.LocationModel
 {

diff --git a/sources/Dot.AdventureGame/LocationModel/LocationEngine.cs b/sources/Dot.AdventureGame/LocationModel/LocationEngine.cs
@@ -2,8 +2,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using DustInTheWind.Dot.AdventureGame.ExportModel;
 using DustInTheWind.Dot.AdventureGame.ObjectModel;
+using DustInTheWind.Dot.Domain.GameModel;
 
 namespace DustInTheWind.Dot.AdventureGame.LocationModel
 {

diff --git a/sources/Dot.AdventureGame/ObjectModel/ContainerObject.cs b/sources/Dot.AdventureGame/ObjectModel/ContainerObject.cs
@@ -2,7 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using DustInTheWind.Dot.AdventureGame.ExportModel;
+using DustInTheWind.Dot.Domain.GameModel;
 
 namespace DustInTheWind.Dot.AdventureGame.ObjectModel
 {

diff --git a/sources/Dot.AdventureGame/ObjectModel/IExportable.cs b/sources/Dot.AdventureGame/ObjectModel/IExportable.cs
@@ -1,4 +1,4 @@
-using DustInTheWind.Dot.AdventureGame.ExportModel;
+using DustInTheWind.Dot.Domain.GameModel;
 
 namespace DustInTheWind.Dot.AdventureGame.ObjectModel
 {

diff --git a/sources/Dot.AdventureGame/ObjectModel/ObjectBase.cs b/sources/Dot.AdventureGame/ObjectModel/ObjectBase.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections;
-using DustInTheWind.Dot.AdventureGame.ExportModel;
 using DustInTheWind.Dot.AdventureGame.LocationModel;
 using DustInTheWind.Dot.Domain;
 using DustInTheWind.Dot.Domain.AudioTextModel;
+using DustInTheWind.Dot.Domain.GameModel;
 
 namespace DustInTheWind.Dot.AdventureGame.ObjectModel
 {

diff --git a/sources/Dot.Application/StorageDataExtensions.cs b/sources/Dot.Application/StorageDataExtensions.cs
@@ -16,7 +16,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using DustInTheWind.Dot.AdventureGame.ExportModel;
+using DustInTheWind.Dot.Domain.GameModel;
 using DustInTheWind.Dot.Ports.GameSavesAccess;
 
 namespace DustInTheWind.Dot.Application;

diff --git a/sources/Dot.Application/UseCases/LoadGame/LoadGameUseCase.cs b/sources/Dot.Application/UseCases/LoadGame/LoadGameUseCase.cs
@@ -6,6 +6,7 @@
 using DustInTheWind.Dot.Domain.DataAccess;
 using DustInTheWind.Dot.Domain.GameModel;
 using DustInTheWind.Dot.Ports.GameSavesAccess;
+using DustInTheWind.Dot.Ports.PresentationAccess;
 
 namespace DustInTheWind.Dot.Application.UseCases.LoadGame
 {

diff --git a/sources/Dot.Application/UseCases/SaveGame/SaveGameUseCase.cs b/sources/Dot.Application/UseCases/SaveGame/SaveGameUseCase.cs
@@ -5,6 +5,7 @@
 using DustInTheWind.Dot.Domain.DataAccess;
 using DustInTheWind.Dot.Domain.GameModel;
 using DustInTheWind.Dot.Ports.GameSavesAccess;
+using DustInTheWind.Dot.Ports.PresentationAccess;
 
 namespace DustInTheWind.Dot.Application.UseCases.SaveGame;
 

diff --git a/sources/Dot.Domain/GameModel/ExportData.cs b/sources/Dot.Domain/GameModel/ExportData.cs
@@ -16,7 +16,7 @@
 
 using System;
 
-namespace DustInTheWind.Dot.AdventureGame.ExportModel;
+namespace DustInTheWind.Dot.Domain.GameModel;
 
 public class ExportData : ExportNode
 {

diff --git a/sources/Dot.Domain/GameModel/ExportNode.cs b/sources/Dot.Domain/GameModel/ExportNode.cs
@@ -17,7 +17,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace DustInTheWind.Dot.AdventureGame.ExportModel;
+namespace DustInTheWind.Dot.Domain.GameModel;
 
 public class ExportNode : Dictionary<string, object>
 {

diff --git a/sources/Dot.Domain/GameModel/IGame.cs b/sources/Dot.Domain/GameModel/IGame.cs
@@ -1,5 +1,4 @@
 using System;
-using DustInTheWind.Dot.AdventureGame.ExportModel;
 
 namespace DustInTheWind.Dot.Domain.GameModel
 {

diff --git a/sources/Dot.Ports.PresentationAccess/GameSlotId.cs b/sources/Dot.Ports.PresentationAccess/GameSlotId.cs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace DustInTheWind.Dot.Application.UseCases.LoadGame;
+namespace DustInTheWind.Dot.Ports.PresentationAccess;
 
 public class GameSlotId
 {

diff --git a/sources/Dot.Ports.PresentationAccess/ILoadGameView.cs b/sources/Dot.Ports.PresentationAccess/ILoadGameView.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace DustInTheWind.Dot.Application.UseCases.LoadGame
+namespace DustInTheWind.Dot.Ports.PresentationAccess
 {
     public interface ILoadGameView
     {

diff --git a/sources/Dot.Ports.PresentationAccess/ISaveGameView.cs b/sources/Dot.Ports.PresentationAccess/ISaveGameView.cs
@@ -14,9 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-using DustInTheWind.Dot.Application.UseCases.LoadGame;
-
-namespace DustInTheWind.Dot.Application.UseCases.SaveGame;
+namespace DustInTheWind.Dot.Ports.PresentationAccess;
 
 public interface ISaveGameView
 {

diff --git a/sources/Dot.Presentation/Controls/LoadMenuControl.cs b/sources/Dot.Presentation/Controls/LoadMenuControl.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using DustInTheWind.Dot.Application.UseCases.LoadGame;
+using DustInTheWind.Dot.Ports.PresentationAccess;
 using DustInTheWind.Dot.Presentation.ConsoleHelpers.UIControls;
 
 namespace DustInTheWind.Dot.Presentation.Controls

diff --git a/sources/Dot.Presentation/Controls/SaveMenuControl.cs b/sources/Dot.Presentation/Controls/SaveMenuControl.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using DustInTheWind.Dot.Application.UseCases.LoadGame;
+using DustInTheWind.Dot.Ports.PresentationAccess;
 using DustInTheWind.Dot.Presentation.ConsoleHelpers.UIControls;
 
 namespace DustInTheWind.Dot.Presentation.Controls;

diff --git a/sources/Dot.Presentation/GameHostActions/ExitAction.cs b/sources/Dot.Presentation/GameHostActions/ExitAction.cs
@@ -20,9 +20,10 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using DustInTheWind.Dot.AdventureGame.ActionModel;
+using DustInTheWind.Dot.Application;
 using DustInTheWind.Dot.Application.UseCases.Exit;
 
-namespace DustInTheWind.Dot.Application.GameHostActions;
+namespace DustInTheWind.Dot.Presentation.GameHostActions;
 
 public class ExitAction : ActionBase
 {

diff --git a/sources/Dot.Presentation/GameHostActions/LoadGameAction.cs b/sources/Dot.Presentation/GameHostActions/LoadGameAction.cs
@@ -20,9 +20,10 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using DustInTheWind.Dot.AdventureGame.ActionModel;
+using DustInTheWind.Dot.Application;
 using DustInTheWind.Dot.Application.UseCases.LoadGame;
 
-namespace DustInTheWind.Dot.Application.GameHostActions;
+namespace DustInTheWind.Dot.Presentation.GameHostActions;
 
 public class LoadGameAction : ActionBase
 {

diff --git a/sources/Dot.Presentation/GameHostActions/MainMenuAction.cs b/sources/Dot.Presentation/GameHostActions/MainMenuAction.cs
@@ -20,9 +20,10 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using DustInTheWind.Dot.AdventureGame.ActionModel;
+using DustInTheWind.Dot.Application;
 using DustInTheWind.Dot.Application.UseCases.MainMenu;
 
-namespace DustInTheWind.Dot.Application.GameHostActions;
+namespace DustInTheWind.Dot.Presentation.GameHostActions;
 
 public class MainMenuAction : ActionBase
 {

diff --git a/sources/Dot.Presentation/GameHostActions/NewGameAction.cs b/sources/Dot.Presentation/GameHostActions/NewGameAction.cs
@@ -20,9 +20,10 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using DustInTheWind.Dot.AdventureGame.ActionModel;
+using DustInTheWind.Dot.Application;
 using DustInTheWind.Dot.Application.UseCases.NewGame;
 
-namespace DustInTheWind.Dot.Application.GameHostActions;
+namespace DustInTheWind.Dot.Presentation.GameHostActions;
 
 public class NewGameAction : ActionBase
 {

diff --git a/sources/Dot.Presentation/GameHostActions/SaveGameAction.cs b/sources/Dot.Presentation/GameHostActions/SaveGameAction.cs
@@ -20,9 +20,10 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using DustInTheWind.Dot.AdventureGame.ActionModel;
+using DustInTheWind.Dot.Application;
 using DustInTheWind.Dot.Application.UseCases.SaveGame;
 
-namespace DustInTheWind.Dot.Application.GameHostActions;
+namespace DustInTheWind.Dot.Presentation.GameHostActions;
 
 public class SaveGameAction : ActionBase
 {

diff --git a/sources/Dot.Presentation/Presenters/GamePresenter.cs b/sources/Dot.Presentation/Presenters/GamePresenter.cs
@@ -8,11 +8,11 @@
 using DustInTheWind.Dot.AdventureGame.ActionResults;
 using DustInTheWind.Dot.AdventureGame.GameModel;
 using DustInTheWind.Dot.Application;
-using DustInTheWind.Dot.Application.GameHostActions;
 using DustInTheWind.Dot.Domain;
 using DustInTheWind.Dot.Domain.AudioTextModel;
 using DustInTheWind.Dot.Domain.DataAccess;
 using DustInTheWind.Dot.Domain.GameModel;
+using DustInTheWind.Dot.Presentation.GameHostActions;
 using DustInTheWind.Dot.Presentation.Views;
 
 namespace DustInTheWind.Dot.Presentation.Presenters

diff --git a/sources/Dot.Presentation/Views/LoadGameView.cs b/sources/Dot.Presentation/Views/LoadGameView.cs
@@ -18,6 +18,7 @@
 using System.Collections.Generic;
 using DustInTheWind.Dot.Application.UseCases.LoadGame;
 using DustInTheWind.Dot.AudioSupport;
+using DustInTheWind.Dot.Ports.PresentationAccess;
 using DustInTheWind.Dot.Presentation.ConsoleHelpers.ConsoleUtil;
 using DustInTheWind.Dot.Presentation.ConsoleHelpers.UIControls;
 using DustInTheWind.Dot.Presentation.Controls;

diff --git a/sources/Dot.Presentation/Views/SaveGameView.cs b/sources/Dot.Presentation/Views/SaveGameView.cs
@@ -19,6 +19,7 @@
 using DustInTheWind.Dot.Application.UseCases.LoadGame;
 using DustInTheWind.Dot.Application.UseCases.SaveGame;
 using DustInTheWind.Dot.AudioSupport;
+using DustInTheWind.Dot.Ports.PresentationAccess;
 using DustInTheWind.Dot.Presentation.ConsoleHelpers.ConsoleUtil;
 using DustInTheWind.Dot.Presentation.ConsoleHelpers.UIControls;
 using DustInTheWind.Dot.Presentation.Controls;

diff --git a/sources/Dot.Tests/AdventureGame/LocationModel/LocationBaseTests/ExportImportTests.cs b/sources/Dot.Tests/AdventureGame/LocationModel/LocationBaseTests/ExportImportTests.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using DustInTheWind.Dot.AdventureGame.ExportModel;
+using DustInTheWind.Dot.Domain.GameModel;
 using DustInTheWind.Dot.Ports.GameSavesAccess;
 using Xunit;
 

diff --git a/sources/Dot.Tests/AdventureGame/LocationModel/LocationBaseTests/TestAddOn.cs b/sources/Dot.Tests/AdventureGame/LocationModel/LocationBaseTests/TestAddOn.cs
@@ -1,7 +1,7 @@
 using System;
-using DustInTheWind.Dot.AdventureGame.ExportModel;
 using DustInTheWind.Dot.AdventureGame.GameModel;
 using DustInTheWind.Dot.AdventureGame.LocationModel;
+using DustInTheWind.Dot.Domain.GameModel;
 using DustInTheWind.Dot.Ports.GameSavesAccess;
 
 namespace Dot.Tests.AdventureGame.LocationModel.LocationBaseTests

diff --git a/sources/Dot.Tests/AdventureGame/ObjectModel/ContainerObjectTests/ExportImportTests.cs b/sources/Dot.Tests/AdventureGame/ObjectModel/ContainerObjectTests/ExportImportTests.cs
@@ -1,6 +1,6 @@
 using System.Linq;
-using DustInTheWind.Dot.AdventureGame.ExportModel;
 using DustInTheWind.Dot.AdventureGame.ObjectModel;
+using DustInTheWind.Dot.Domain.GameModel;
 using DustInTheWind.Dot.Ports.GameSavesAccess;
 using Xunit;
 

diff --git a/sources/Dot.Tests/AdventureGame/ObjectModel/ObjectBaseTests/ExportImportTests.cs b/sources/Dot.Tests/AdventureGame/ObjectModel/ObjectBaseTests/ExportImportTests.cs
@@ -1,4 +1,4 @@
-using DustInTheWind.Dot.AdventureGame.ExportModel;
+using DustInTheWind.Dot.Domain.GameModel;
 using DustInTheWind.Dot.Ports.GameSavesAccess;
 using Xunit;