2

Stormtrooper/Stormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,31 +1,33 @@
-using Stormtrooper.Drawnings;
+using Stormtrooper.Exceptions;
+using Stormtrooper.CollectionGenericObjects;
 using Stormtrooper.Exceptions;
-using System.CodeDom;
 
 namespace Stormtrooper.CollectionGenericObjects;
-
 /// <summary>
 /// Параметризованный набор объектов
 /// </summary>
 /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
 public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
-where T : class
+    where T : class
 {
     /// <summary>
     /// Массив объектов, которые храним
     /// </summary>
     private T?[] _collection;
-
     public int Count => _collection.Length;
-
-    public int MaxCount {
+    /// <summary>
+    /// Установка максимального кол-ва объектов
+    /// </summary>
+    public int MaxCount
+    {
         get
         {
             return _collection.Length;
         }
         set
         {
-            if (value > 0) {
+            if (value > 0)
+            {
                 if (_collection.Length > 0)
                 {
                     Array.Resize(ref _collection, value);
@@ -47,6 +49,11 @@ where T : class
     {
         _collection = Array.Empty<T?>();
     }
+    /// <summary>
+    /// Получение объекта по позиции
+    /// </summary>
+    /// <param name="position">Позиция (индекс)</param>
+    /// <returns></returns>
     public T? Get(int position)
     {
         if (position < 0 || position >= _collection.Length)

Stormtrooper/Stormtrooper/CollectionGenericObjects/StorageCollection.cs

@@ -52,22 +52,23 @@ where T : DrawningAircraft
     /// </summary>
     /// <param name="name">Название коллекции</param>
     /// <param name="collectionType">тип коллекции</param>
-    public void AddCollection(string name, CollectionType collectionType)
+	public void AddCollection(string name, CollectionType collectionType)
     {
-        // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
-        // TODO Прописать логику для добавления
-        if (!(collectionType == CollectionType.None) && !_storages.ContainsKey(name))
+        if (string.IsNullOrEmpty(name) || _storages.ContainsKey(name))
+            return;
+        switch (collectionType)
         {
-            if (collectionType == CollectionType.List)
-            {
+            case CollectionType.List:
                 _storages.Add(name, new ListGenericObjects<T>());
-            }
-            else if (collectionType == CollectionType.Massive)
-            {
+                break;
+            case CollectionType.Massive:
                 _storages.Add(name, new MassiveGenericObjects<T>());
-            }
+                break;
+            default:
+                break;
         }
     }
+
     /// <summary>
     /// Удаление коллекции
     /// </summary>
@@ -82,15 +83,12 @@ where T : DrawningAircraft
     /// </summary>
     /// <param name="name">Название коллекции</param>
     /// <returns></returns>
-    public ICollectionGenericObjects<T>? this[string name]
+	public ICollectionGenericObjects<T>? this[string name]
     {
         get
         {
-            // TODO Продумать логику получения объекта
-            if (_storages.ContainsKey(name))
-            {
-                return _storages[name];
-            }
+            if (_storages.TryGetValue(name, out ICollectionGenericObjects<T>? value))
+                return value;
             return null;
         }
     }
@@ -112,8 +110,6 @@ where T : DrawningAircraft
             File.Delete(filename);
         }
 
-
-
         using FileStream fs = new(filename, FileMode.Create);
         using StreamWriter streamWriter = new StreamWriter(fs);
         streamWriter.Write(_collectionKey);

Stormtrooper/Stormtrooper/Program.cs

@@ -4,43 +4,42 @@ using Microsoft.Extensions.Configuration;
 using Serilog;
 using Stormtrooper;
 
-namespace Battleship
+namespace Stormtrooper;
+
+internal static class Program
 {
-    internal static class Program
+    /// <summary>
+    ///  The main entry point for the application.
+    /// </summary>
+    [STAThread]
+    static void Main()
     {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
+        // To customize application configuration such as set high DPI settings or default font,
+        // see https://aka.ms/applicationconfiguration.
+        ApplicationConfiguration.Initialize();
+        var services = new ServiceCollection();
+        ConfigureServices(services);
+        using (ServiceProvider serviceProvider = services.BuildServiceProvider())
         {
-            // To customize application configuration such as set high DPI settings or default font,
-            // see https://aka.ms/applicationconfiguration.
-            ApplicationConfiguration.Initialize();
-            var services = new ServiceCollection();
-            ConfigureServices(services);
-            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
-            {
-                Application.Run(serviceProvider.GetRequiredService<FormAircraftCollection>());
-            }
-        }
-        private static void ConfigureServices(ServiceCollection services)
-        {
-            services.AddSingleton<FormAircraftCollection>()
-            .AddLogging(option =>
-            {
-                var configuration = new ConfigurationBuilder()
-                    .SetBasePath(Directory.GetCurrentDirectory())
-                    .AddJsonFile(path: "C:\\Users\\User\\Desktop\\2sem\\Egovoop\\lab1\\Stormtrooper\\Stormtrooper\\appSetting.json", optional: false, reloadOnChange: true)
-                    .Build();
-
-                var logger = new LoggerConfiguration()
-                    .ReadFrom.Configuration(configuration)
-                    .CreateLogger();
-
-                option.SetMinimumLevel(LogLevel.Information);
-                option.AddSerilog(logger);
-            });
+            Application.Run(serviceProvider.GetRequiredService<FormAircraftCollection>());
         }
     }
+    private static void ConfigureServices(ServiceCollection services)
+    {
+        services.AddSingleton<FormAircraftCollection>()
+        .AddLogging(option =>
+        {
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile(path: "C:\\Users\\User\\Desktop\\2sem\\Egovoop\\lab1\\Stormtrooper\\Stormtrooper\\appSetting.json", optional: false, reloadOnChange: true)
+                .Build();
+
+            var logger = new LoggerConfiguration()
+                .ReadFrom.Configuration(configuration)
+                .CreateLogger();
+
+            option.SetMinimumLevel(LogLevel.Information);
+            option.AddSerilog(logger);
+        });
+    }
 }

Stormtrooper/Stormtrooper/Stormtrooper.csproj

@@ -9,9 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.10" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />