move data containers into features directory

WoWs-Builder-Team · Oct 28, 2023 · 7b740f2 · 7b740f2
1 parent 261f93b
commit 7b740f2
Show file tree

Hide file tree

Showing 58 changed files with 93 additions and 93 deletions.
diff --git a/WoWsShipBuilder.Common/Features/AccelerationCharts/AccelerationCharts.razor b/WoWsShipBuilder.Common/Features/AccelerationCharts/AccelerationCharts.razor
@@ -1,12 +1,12 @@
 @page "/acceleration-charts"
 
-@using WoWsShipBuilder.DataContainers
 @using WoWsShipBuilder.DataStructures
 @using WoWsShipBuilder.DataStructures.Ship
 @using WoWsShipBuilder.Features.BallisticCharts
 @using WoWsShipBuilder.Features.BallisticCharts.Data
 @using WoWsShipBuilder.Features.Builds
 @using WoWsShipBuilder.Features.Builds.Components
+@using WoWsShipBuilder.Features.DataContainers
 @using WoWsShipBuilder.Infrastructure.ApplicationData
 @using WoWsShipBuilder.Infrastructure.DataTransfer
 @using WoWsShipBuilder.Infrastructure.GameData

diff --git a/WoWsShipBuilder.Common/Features/BallisticCharts/BallisticHelper.cs b/WoWsShipBuilder.Common/Features/BallisticCharts/BallisticHelper.cs
@@ -1,6 +1,6 @@
-using WoWsShipBuilder.DataContainers;
 using WoWsShipBuilder.DataStructures;
 using WoWsShipBuilder.DataStructures.Projectile;
+using WoWsShipBuilder.Features.DataContainers;
 
 namespace WoWsShipBuilder.Features.BallisticCharts;
 

diff --git a/WoWsShipBuilder.Common/Features/BallisticCharts/Charts.razor b/WoWsShipBuilder.Common/Features/BallisticCharts/Charts.razor
@@ -1,11 +1,11 @@
 @page "/charts"
-@using WoWsShipBuilder.DataContainers
 @using WoWsShipBuilder.DataStructures
 @using WoWsShipBuilder.DataStructures.Ship
 @using WoWsShipBuilder.DataStructures.Projectile
 @using WoWsShipBuilder.Features.BallisticCharts.Data
 @using WoWsShipBuilder.Features.Builds
 @using WoWsShipBuilder.Features.Builds.Components
+@using WoWsShipBuilder.Features.DataContainers
 @using WoWsShipBuilder.Infrastructure.ApplicationData
 @using WoWsShipBuilder.Infrastructure.DataTransfer
 @using WoWsShipBuilder.Infrastructure.GameData

diff --git a/WoWsShipBuilder.Common/Features/BallisticCharts/DispersionPlot.razor b/WoWsShipBuilder.Common/Features/BallisticCharts/DispersionPlot.razor
@@ -1,7 +1,7 @@
-@using WoWsShipBuilder.DataContainers
-@using WoWsShipBuilder.Features.BallisticCharts.Data
+@using WoWsShipBuilder.Features.BallisticCharts.Data
 @using WoWsShipBuilder.Infrastructure.Localization
 @using WoWsShipBuilder.Infrastructure.Localization.Resources
+
 @implements IAsyncDisposable
 @inject IJSRuntime Runtime
 @inject ILocalizer Localizer

diff --git a/WoWsShipBuilder.Common/Features/BallisticCharts/ShipAndShellSelectionDialog.razor b/WoWsShipBuilder.Common/Features/BallisticCharts/ShipAndShellSelectionDialog.razor
@@ -2,11 +2,11 @@
 @using System.Collections.Specialized
 @using System.Linq
 @using DynamicData
-@using WoWsShipBuilder.DataContainers
 @using WoWsShipBuilder.DataStructures
 @using WoWsShipBuilder.DataStructures.Ship
 @using WoWsShipBuilder.Features.BallisticCharts.Data
 @using WoWsShipBuilder.Features.Builds
+@using WoWsShipBuilder.Features.DataContainers
 @using WoWsShipBuilder.Infrastructure.DataTransfer
 @using WoWsShipBuilder.Infrastructure.Localization.Resources
 @using WoWsShipBuilder.Infrastructure.Utility

diff --git a/WoWsShipBuilder.Common/Features/Builds/Components/CaptainSkillSelectorImageRender.razor b/WoWsShipBuilder.Common/Features/Builds/Components/CaptainSkillSelectorImageRender.razor
@@ -1,6 +1,5 @@
-@using WoWsShipBuilder.DataStructures
-@using System.Text
-@using WoWsShipBuilder.DataContainers
+@using System.Text
+@using WoWsShipBuilder.DataStructures
 @using WoWsShipBuilder.Features.ShipStats.ViewModels
 @using WoWsShipBuilder.DataStructures.Captain
 @using WoWsShipBuilder.Infrastructure.Localization.Resources

diff --git a/WoWsShipBuilder.Common/Features/Builds/Components/ConsumableSelectorImageRender.razor b/WoWsShipBuilder.Common/Features/Builds/Components/ConsumableSelectorImageRender.razor
@@ -1,8 +1,8 @@
-@using WoWsShipBuilder.DataContainers
+@using WoWsShipBuilder.Features.DataContainers
 @using WoWsShipBuilder.Features.ShipStats.Components
 @using WoWsShipBuilder.Infrastructure.Localization
 @using WoWsShipBuilder.Infrastructure.Utility
-@using ConsumableDataContainer = WoWsShipBuilder.DataContainers.ConsumableDataContainer
+
 @inherits ReactiveComponentBase<WoWsShipBuilder.Features.ShipStats.ViewModels.ConsumableViewModel>
 @inject ILocalizer Localizer
 
@@ -113,4 +113,4 @@
         }
     }
 
-}
+}
diff --git a/WoWsShipBuilder.Common/Features/Builds/Components/ShipUpgradeSelectorImageRender.razor b/WoWsShipBuilder.Common/Features/Builds/Components/ShipUpgradeSelectorImageRender.razor
@@ -1,8 +1,9 @@
 @using WoWsShipBuilder.DataStructures.Upgrade
-@using WoWsShipBuilder.DataContainers
+@using WoWsShipBuilder.Features.DataContainers
 @using WoWsShipBuilder.Features.ShipStats.ViewModels
 @using WoWsShipBuilder.Infrastructure.Localization.Resources
 @using WoWsShipBuilder.Infrastructure.Utility
+
 @inherits ReactiveComponentBase<WoWsShipBuilder.Features.ShipStats.ViewModels.UpgradePanelViewModelBase>
 @inject ILocalizer Localizer
 
@@ -99,4 +100,4 @@
                 return "min-width: 60px; width: 60px; height: 60px; padding: 2px;";
         }
     }
-}
+}
diff --git a/WoWsShipBuilder.Common/Features/Builds/Components/SignalSelectorImageRender.razor b/WoWsShipBuilder.Common/Features/Builds/Components/SignalSelectorImageRender.razor
@@ -1,6 +1,7 @@
-@using WoWsShipBuilder.DataContainers
+@using WoWsShipBuilder.Features.DataContainers
 @using WoWsShipBuilder.Infrastructure.Localization.Resources
 @using WoWsShipBuilder.Infrastructure.Utility
+
 @inherits ReactiveComponentBase<WoWsShipBuilder.Features.ShipStats.ViewModels.SignalSelectorViewModel>
 @inject ILocalizer Localizer
 

diff --git a/WoWsShipBuilder.Common/Features/Builds/ShipBuildViewModel.cs b/WoWsShipBuilder.Common/Features/Builds/ShipBuildViewModel.cs
@@ -1,6 +1,6 @@
 using ReactiveUI;
-using WoWsShipBuilder.DataContainers;
 using WoWsShipBuilder.DataStructures.Ship;
+using WoWsShipBuilder.Features.DataContainers;
 using WoWsShipBuilder.Features.ShipStats.ViewModels;
 using WoWsShipBuilder.Infrastructure.ApplicationData;
 using WoWsShipBuilder.Infrastructure.DataTransfer;

diff --git a/.../DataContainers/AccelerationCalculator.cs → .../DataContainers/AccelerationCalculator.cs b/.../DataContainers/AccelerationCalculator.cs → .../DataContainers/AccelerationCalculator.cs
@@ -2,7 +2,7 @@
 using WoWsShipBuilder.DataStructures.Ship;
 using WoWsShipBuilder.Infrastructure.ApplicationData;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 public static class AccelerationCalculator
 {

diff --git a/...ainers/Aircraft/AirstrikeDataContainer.cs → ...ainers/Aircraft/AirstrikeDataContainer.cs b/...ainers/Aircraft/AirstrikeDataContainer.cs → ...ainers/Aircraft/AirstrikeDataContainer.cs
@@ -5,7 +5,7 @@
 using WoWsShipBuilder.Infrastructure.ApplicationData;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record AirstrikeDataContainer : DataContainerBase

diff --git a/...iners/Aircraft/CvAircraftDataContainer.cs → ...iners/Aircraft/CvAircraftDataContainer.cs b/...iners/Aircraft/CvAircraftDataContainer.cs → ...iners/Aircraft/CvAircraftDataContainer.cs
@@ -8,7 +8,7 @@
 using WoWsShipBuilder.Infrastructure.GameData;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record CvAircraftDataContainer : DataContainerBase

diff --git a/...ment/DepthChargesLauncherDataContainer.cs → ...ment/DepthChargesLauncherDataContainer.cs b/...ment/DepthChargesLauncherDataContainer.cs → ...ment/DepthChargesLauncherDataContainer.cs
@@ -4,7 +4,7 @@
 using WoWsShipBuilder.DataStructures.Ship;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record DepthChargesLauncherDataContainer : DataContainerBase

diff --git a/...ners/Armament/MainBatteryDataContainer.cs → ...ners/Armament/MainBatteryDataContainer.cs b/...ners/Armament/MainBatteryDataContainer.cs → ...ners/Armament/MainBatteryDataContainer.cs
@@ -8,7 +8,7 @@
 using WoWsShipBuilder.Infrastructure.Utility;
 
 // ReSharper disable UnusedAutoPropertyAccessor.Global
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record MainBatteryDataContainer : DataContainerBase
@@ -246,16 +246,16 @@ public partial record MainBatteryDataContainer : DataContainerBase
 
     private bool ShouldDisplayHeDpm(object obj)
     {
-        return DisplayHeDpm;
+        return this.DisplayHeDpm;
     }
 
     private bool ShouldDisplayApDpm(object obj)
     {
-        return DisplayApDpm;
+        return this.DisplayApDpm;
     }
 
     private bool ShouldDisplaySapDpm(object obj)
     {
-        return DisplaySapDpm;
+        return this.DisplaySapDpm;
     }
 }
diff --git a/...ainers/Armament/PingerGunDataContainer.cs → ...ainers/Armament/PingerGunDataContainer.cs b/...ainers/Armament/PingerGunDataContainer.cs → ...ainers/Armament/PingerGunDataContainer.cs
@@ -5,7 +5,7 @@
 using WoWsShipBuilder.DataStructures.Ship;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record PingerGunDataContainer : DataContainerBase

diff --git a/...Armament/SecondaryBatteryDataContainer.cs → ...Armament/SecondaryBatteryDataContainer.cs b/...Armament/SecondaryBatteryDataContainer.cs → ...Armament/SecondaryBatteryDataContainer.cs
@@ -7,7 +7,7 @@
 using WoWsShipBuilder.Infrastructure.GameData;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record SecondaryBatteryDataContainer : DataContainerBase
@@ -142,6 +142,6 @@ public partial record SecondaryBatteryDataContainer : DataContainerBase
 
     private bool ShouldDisplayFpm(object obj)
     {
-        return DisplayFpm;
+        return this.DisplayFpm;
     }
 }
diff --git a/...mament/SecondaryBatteryUiDataContainer.cs → ...mament/SecondaryBatteryUiDataContainer.cs b/...mament/SecondaryBatteryUiDataContainer.cs → ...mament/SecondaryBatteryUiDataContainer.cs
@@ -1,6 +1,6 @@
 using WoWsShipBuilder.DataStructures.Ship;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 public record SecondaryBatteryUiDataContainer(List<SecondaryBatteryDataContainer>? Secondaries)
 {

diff --git a/.../Armament/TorpedoArmamentDataContainer.cs → .../Armament/TorpedoArmamentDataContainer.cs b/.../Armament/TorpedoArmamentDataContainer.cs → .../Armament/TorpedoArmamentDataContainer.cs
@@ -6,7 +6,7 @@
 using WoWsShipBuilder.DataStructures.Ship;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record TorpedoArmamentDataContainer : DataContainerBase

diff --git a/...uilder.Common/DataContainers/Constants.cs → ...mmon/Features/DataContainers/Constants.cs b/...uilder.Common/DataContainers/Constants.cs → ...mmon/Features/DataContainers/Constants.cs
@@ -1,4 +1,4 @@
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 public static class Constants
 {

diff --git a/...on/DataContainers/DataContainerUtility.cs → ...es/DataContainers/DataContainerUtility.cs b/...on/DataContainers/DataContainerUtility.cs → ...es/DataContainers/DataContainerUtility.cs
@@ -1,7 +1,7 @@
 using WoWsShipBuilder.DataStructures.Ship;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 public static class DataContainerUtility
 {

diff --git a/...ntainers/Projectiles/BombDataContainer.cs → ...ntainers/Projectiles/BombDataContainer.cs b/...ntainers/Projectiles/BombDataContainer.cs → ...ntainers/Projectiles/BombDataContainer.cs
@@ -5,7 +5,7 @@
 using WoWsShipBuilder.Infrastructure.GameData;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record BombDataContainer : ProjectileDataContainer
@@ -118,6 +118,6 @@ public static BombDataContainer FromBombName(string name, List<(string name, flo
 
     private bool ShouldDisplayBlastPenetration(object obj)
     {
-        return ShowBlastPenetration;
+        return this.ShowBlastPenetration;
     }
 }
diff --git a/...s/Projectiles/DepthChargeDataContainer.cs → ...s/Projectiles/DepthChargeDataContainer.cs b/...s/Projectiles/DepthChargeDataContainer.cs → ...s/Projectiles/DepthChargeDataContainer.cs
@@ -3,7 +3,7 @@
 using WoWsShipBuilder.Infrastructure.ApplicationData;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record DepthChargeDataContainer : ProjectileDataContainer

diff --git a/...rs/Projectiles/ProjectileDataContainer.cs → ...rs/Projectiles/ProjectileDataContainer.cs b/...rs/Projectiles/ProjectileDataContainer.cs → ...rs/Projectiles/ProjectileDataContainer.cs
@@ -1,5 +1,5 @@
 using WoWsShipBuilder.DataElements;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 public abstract record ProjectileDataContainer : DataContainerBase;
diff --git a/...ainers/Projectiles/RocketDataContainer.cs → ...ainers/Projectiles/RocketDataContainer.cs b/...ainers/Projectiles/RocketDataContainer.cs → ...ainers/Projectiles/RocketDataContainer.cs
@@ -5,7 +5,7 @@
 using WoWsShipBuilder.Infrastructure.GameData;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record RocketDataContainer : ProjectileDataContainer
@@ -112,6 +112,6 @@ public static RocketDataContainer FromRocketName(string name, List<(string name,
 
     private bool ShouldDisplayBlastPenetration(object obj)
     {
-        return ShowBlastPenetration;
+        return this.ShowBlastPenetration;
     }
 }
diff --git a/...tainers/Projectiles/ShellDataContainer.cs → ...tainers/Projectiles/ShellDataContainer.cs b/...tainers/Projectiles/ShellDataContainer.cs → ...tainers/Projectiles/ShellDataContainer.cs
@@ -8,7 +8,7 @@
 using WoWsShipBuilder.Infrastructure.GameData;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record ShellDataContainer : DataContainerBase
@@ -216,6 +216,6 @@ private static ShellDataContainer ProcessShell(List<(string Name, float Value)>
 
     private bool ShouldDisplayBlastPenetration(object obj)
     {
-        return ShowBlastPenetration;
+        return this.ShowBlastPenetration;
     }
 }
diff --git a/...iners/Projectiles/TorpedoDataContainer.cs → ...iners/Projectiles/TorpedoDataContainer.cs b/...iners/Projectiles/TorpedoDataContainer.cs → ...iners/Projectiles/TorpedoDataContainer.cs
@@ -5,7 +5,7 @@
 using WoWsShipBuilder.Infrastructure.GameData;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record TorpedoDataContainer : ProjectileDataContainer
@@ -205,6 +205,6 @@ public static List<TorpedoDataContainer> FromTorpedoName(List<string> torpedoNam
 
     private bool ShouldDisplayName(object obj)
     {
-        return IsFromPlane;
+        return this.IsFromPlane;
     }
 }
diff --git a/...taContainers/Ship/AntiAirDataContainer.cs → ...taContainers/Ship/AntiAirDataContainer.cs b/...taContainers/Ship/AntiAirDataContainer.cs → ...taContainers/Ship/AntiAirDataContainer.cs
@@ -3,7 +3,7 @@
 using WoWsShipBuilder.Infrastructure.Utility;
 
 // ReSharper disable InconsistentNaming
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 public record AntiAirDataContainer
 {

diff --git a/...aContainers/Ship/AuraDataDataContainer.cs → ...aContainers/Ship/AuraDataDataContainer.cs b/...aContainers/Ship/AuraDataDataContainer.cs → ...aContainers/Ship/AuraDataDataContainer.cs
@@ -1,7 +1,7 @@
 using WoWsShipBuilder.DataElements;
 using WoWsShipBuilder.DataElements.DataElementAttributes;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record AuraDataDataContainer : DataContainerBase

diff --git a/...ntainers/Ship/ConcealmentDataContainer.cs → ...ntainers/Ship/ConcealmentDataContainer.cs b/...ntainers/Ship/ConcealmentDataContainer.cs → ...ntainers/Ship/ConcealmentDataContainer.cs
@@ -4,7 +4,7 @@
 using WoWsShipBuilder.DataStructures.Ship;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record ConcealmentDataContainer : DataContainerBase

diff --git a/...ontainers/Ship/ConsumableDataContainer.cs → ...ontainers/Ship/ConsumableDataContainer.cs b/...ontainers/Ship/ConsumableDataContainer.cs → ...ontainers/Ship/ConsumableDataContainer.cs
@@ -9,7 +9,7 @@
 using WoWsShipBuilder.Infrastructure.GameData;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record ConsumableDataContainer : DataContainerBase

diff --git a/...ners/Ship/ManeuverabilityDataContainer.cs → ...ners/Ship/ManeuverabilityDataContainer.cs b/...ners/Ship/ManeuverabilityDataContainer.cs → ...ners/Ship/ManeuverabilityDataContainer.cs
@@ -4,7 +4,7 @@
 using WoWsShipBuilder.DataStructures.Ship;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record ManeuverabilityDataContainer : DataContainerBase

diff --git a/.../DataContainers/Ship/ShipDataContainer.cs → .../DataContainers/Ship/ShipDataContainer.cs b/.../DataContainers/Ship/ShipDataContainer.cs → .../DataContainers/Ship/ShipDataContainer.cs
@@ -1,6 +1,6 @@
 using WoWsShipBuilder.DataStructures.Ship;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 public record ShipDataContainer(string Index)
 {

diff --git a/...iners/Ship/SpecialAbilityDataContainer.cs → ...iners/Ship/SpecialAbilityDataContainer.cs b/...iners/Ship/SpecialAbilityDataContainer.cs → ...iners/Ship/SpecialAbilityDataContainer.cs
@@ -5,7 +5,7 @@
 using WoWsShipBuilder.DataStructures.Ship;
 
 // ReSharper disable InconsistentNaming
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record SpecialAbilityDataContainer : DataContainerBase

diff --git a/...ainers/Ship/SurvivabilityDataContainer.cs → ...ainers/Ship/SurvivabilityDataContainer.cs b/...ainers/Ship/SurvivabilityDataContainer.cs → ...ainers/Ship/SurvivabilityDataContainer.cs
@@ -6,7 +6,7 @@
 using WoWsShipBuilder.DataStructures.Ship;
 using WoWsShipBuilder.Infrastructure.Utility;
 
-namespace WoWsShipBuilder.DataContainers;
+namespace WoWsShipBuilder.Features.DataContainers;
 
 [DataContainer]
 public partial record SurvivabilityDataContainer : DataContainerBase