1

AirFighter/AirFighter/CollectionGenericObjects/AbstractCompany.cs

@@ -60,7 +60,7 @@ public abstract class AbstractCompany
     /// <returns></returns>
     public static int operator +(AbstractCompany company, DrawningMilitaryAircraft militaryAircraft)
     {
-        return company._collection.Insert(militaryAircraft);
+        return company._collection.Insert(militaryAircraft, new DrawiningCarEqutables());
     }
 
     /// <summary>
@@ -113,6 +113,12 @@ public abstract class AbstractCompany
         return bitmap;
     }
 
+    /// <summary>
+	/// Сортировка
+	/// </summary>
+	/// <param name="comparer">Сравнитель объектов</param>
+	public void Sort(IComparer<DrawningMilitaryAircraft?> comparer) => _collection?.CollectionSort(comparer);
+
     /// <summary>
     /// Вывод заднего фона
     /// </summary>

AirFighter/AirFighter/CollectionGenericObjects/CollectionInfo.cs

@@ -0,0 +1,76 @@
+namespace ProjectAirFighter.CollectionGenericObjects;
+
+/// <summary>
+/// Класс, хранящиий информацию по коллекции
+/// </summary>
+public class CollectionInfo : IEquatable<CollectionInfo>
+{
+    /// <summary>
+    /// Название
+    /// </summary>
+    public string Name { get; private set; }
+
+    /// <summary>
+    /// Тип
+    /// </summary>
+    public CollectionType CollectionType { get; private set; }
+
+    /// <summary>
+    /// Описание
+    /// </summary>
+    public string Description { get; private set; }
+
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separator = "-";
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="name">Название</param>
+    /// <param name="collectionType">Тип</param>
+    /// <param name="description">Описание</param>
+    public CollectionInfo(string name, CollectionType collectionType, string description)
+    {
+        Name = name;
+        CollectionType = collectionType;
+        Description = description;
+    }
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="data">Строка</param>
+    /// <returns>Объект или null</returns>
+    public static CollectionInfo? GetCollectionInfo(string data)
+    {
+        string[] strs = data.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
+        if (strs.Length < 1 || strs.Length > 3)
+        {
+            return null;
+        }
+
+        return new CollectionInfo(strs[0], (CollectionType)Enum.Parse(typeof(CollectionType), strs[1]), strs.Length > 2 ? strs[2] : string.Empty);
+    }
+
+    public override string ToString()
+    {
+        return Name + _separator + CollectionType + _separator + Description;
+    }
+
+    public bool Equals(CollectionInfo? other)
+    {
+        return Name == other?.Name;
+    }
+
+    public override bool Equals(object? obj)
+    {
+        return Equals(obj as CollectionInfo);
+    }
+
+    public override int GetHashCode()
+    {
+        return Name.GetHashCode();
+    }
+}

AirFighter/AirFighter/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -24,7 +24,7 @@ public interface ICollectionGenericObjects<T>
     /// </summary>
     /// <param name="obj">Добавляемый объект</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert(T obj);
+    int Insert(T obj, IEqualityComparer<T?>? comparer = null);
 
     /// <summary>
     /// Добавление объекта в коллекцию на конкретную позицию
@@ -32,7 +32,7 @@ public interface ICollectionGenericObjects<T>
     /// <param name="obj">Добавляемый объект</param>
     /// <param name="position">Позиция</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert(T obj, int position);
+    int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null);
 
     /// <summary>
     /// Удаление объекта из коллекции с конкретной позиции
@@ -58,4 +58,10 @@ public interface ICollectionGenericObjects<T>
     /// </summary>
     /// <returns>Поэлементый вывод элементов коллекции</returns>
     IEnumerable<T?> GetItems();
+
+    /// <summary>
+	/// Сортировка коллекции
+	/// </summary>
+	/// <param name="comparer">Сравнитель объектов</param>
+	void CollectionSort(IComparer<T?> comparer);
 }

AirFighter/AirFighter/CollectionGenericObjects/ListGenericObjects.cs

@@ -52,19 +52,21 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         return _collection[position];
     }
 
-    public int Insert(T obj)
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
     {
         if (Count == _maxCount) throw new CollectionOverflowException(Count);
         _collection.Add(obj);
         return Count;
+        //TODO
     }
 
-    public int Insert(T obj, int position)
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
     {
         if (Count == _maxCount) throw new CollectionOverflowException(Count);
         if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
         _collection.Insert(position, obj);
         return position;
+        //TODO
     }
 
     public T? Remove(int position)
@@ -82,4 +84,9 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
             yield return _collection[i];
         }
     }
+
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        _collection.Sort(comparer);
+    }
 }

AirFighter/AirFighter/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -55,8 +55,19 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         return _collection[position];
     }
 
-    public int Insert(T obj)
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
     {
+        if (comparer != null)
+        {
+            for (int i = 0; i < Count; i++)
+            {
+                if (comparer.Equals(_collection[i], obj))
+                {
+                    throw new CollectionInsertException(obj);
+                }
+            }
+        }
+
         for (int i = 0; i < Count - 3; i++)
         {
             if (_collection[i] == null)
@@ -68,10 +79,21 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         throw new CollectionOverflowException(Count);
     }
 
-    public int Insert(T obj, int position)
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
     {
         if (position < 0 || position >= Count - 3) throw new PositionOutOfCollectionException(position);
 
+        if (comparer != null)
+        {
+            for (int i = 0; i < Count; i++)
+            {
+                if (comparer.Equals(_collection[i], obj))
+                {
+                    throw new CollectionInsertException(obj);
+                }
+            }
+        }
+
         if (_collection[position] != null)
         {
             bool pushed = false;
@@ -125,4 +147,9 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             yield return _collection[i];
         }
     }
+
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        Array.Sort(_collection, comparer);
+    }
 }

AirFighter/AirFighter/CollectionGenericObjects/StorageCollection.cs

@@ -124,8 +124,6 @@ public class StorageCollection<T>
 
                 sb.Append(value.Key);
                 sb.Append(_separatorForKeyValue);
-                sb.Append(value.Value.GetCollectionType);
-                sb.Append(_separatorForKeyValue);
                 sb.Append(value.Value.MaxCount);
                 sb.Append(_separatorForKeyValue);
 
@@ -178,22 +176,19 @@ public class StorageCollection<T>
             {
                 string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
 
-                if (record.Length != 4)
+                if (record.Length != 3)
                 {
                     continue;
                 }
 
-                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
+                CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ??
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
+                throw new Exception("Не удалось определить информацию коллекции:" + record[0]);
 
-                if (collection == null)
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.CollectionType) ??
-                {
+                    throw new Exception("Не удалось определить тип коллекции:" + record[1]);
-                    throw new InvalidOperationException("Не удалось определить тип коллекции:" + record[1]);
+                collection.MaxCount = Convert.ToInt32(record[1]);
-                }
 
-                collection.MaxCount = Convert.ToInt32(record[2]);
+                string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-
-                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
 
                 foreach (string elem in set)
                 {
@@ -212,7 +207,7 @@ public class StorageCollection<T>
                         }
                     }
                 }
-                _storages.Add(record[0], collection);
+                _storages.Add(collectionInfo, collection);
             }
         }
     }

AirFighter/AirFighter/Drawnings/DrawiningMilitaryAircraftEqutables.cs

@@ -0,0 +1,65 @@
+using ProjectAirFighter.Entities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace ProjectAirFighter.Drawnings;
+
+/// <summary>
+/// Реализация сравнения двух объектов класса-прорисовки
+/// </summary>
+public class DrawiningCarEqutables : IEqualityComparer<DrawningMilitaryAircraft?>
+{
+    public bool Equals(DrawningMilitaryAircraft? x, DrawningMilitaryAircraft? y)
+    {
+        if (x == null || x.EntityMilitaryAircraft == null)
+        {
+            return false;
+        }
+
+        if (y == null || y.EntityMilitaryAircraft == null)
+        {
+            return false;
+        }
+
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return false;
+        }
+
+        if (x.EntityMilitaryAircraft.Speed != y.EntityMilitaryAircraft.Speed)
+        {
+            return false;
+        }
+
+        if (x.EntityMilitaryAircraft.Weight != y.EntityMilitaryAircraft.Weight)
+        {
+            return false;
+        }
+
+        if (x.EntityMilitaryAircraft.BodyColor != y.EntityMilitaryAircraft.BodyColor)
+        {
+            return false;
+        }
+
+        if (x is DrawningAirFighter && y is DrawningAirFighter)
+        {
+            EntityAirFighter xAirFighter = (EntityAirFighter)x.EntityMilitaryAircraft;
+            EntityAirFighter yAirFighter = (EntityAirFighter)y.EntityMilitaryAircraft;
+
+            if (xAirFighter.AdditionalColor != yAirFighter.AdditionalColor)
+                return false;
+
+            if (xAirFighter.Wings != yAirFighter.Wings)
+                return false;
+
+            if (xAirFighter.Rockets != yAirFighter.Rockets)
+                return false;
+        }
+
+        return true;
+    }
+
+    public int GetHashCode([DisallowNull] DrawningMilitaryAircraft obj)
+    {
+        return obj.GetHashCode();
+    }
+}

AirFighter/AirFighter/Drawnings/DrawningMilitaryAircraftCarCompareByType.cs

@@ -0,0 +1,33 @@
+namespace ProjectAirFighter.Drawnings;
+
+/// <summary>
+/// Сравнение по типу, скорости, весу
+/// </summary>
+public class DrawningMilitaryAircraftCompareByType : IComparer<DrawningMilitaryAircraft?>
+{
+    public int Compare(DrawningMilitaryAircraft? x, DrawningMilitaryAircraft? y)
+    {
+        if (x == null || x.EntityMilitaryAircraft == null)
+        {
+            return -1;
+        }
+
+        if (y == null || y.EntityMilitaryAircraft == null)
+        {
+            return 1;
+        }
+
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return x.GetType().Name.CompareTo(y.GetType().Name);
+        }
+
+        var speedCompare = x.EntityMilitaryAircraft.Speed.CompareTo(y.EntityMilitaryAircraft.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+
+        return x.EntityMilitaryAircraft.Weight.CompareTo(y.EntityMilitaryAircraft.Weight);
+    }
+}

AirFighter/AirFighter/Drawnings/DrawningMilitaryAircraftCompareByColor.cs

@@ -0,0 +1,27 @@
+namespace ProjectAirFighter.Drawnings;
+internal class DrawningMilitaryAircraftCompareByColor : IComparer<DrawningMilitaryAircraft?>
+{
+    public int Compare(DrawningMilitaryAircraft? x, DrawningMilitaryAircraft? y)
+    {
+        if (x == null || x.EntityMilitaryAircraft == null)
+        {
+            return 1;
+        }
+
+        if (y == null || y.EntityMilitaryAircraft == null)
+        {
+            return -1;
+        }
+        var bodycolorCompare = x.EntityMilitaryAircraft.BodyColor.Name.CompareTo(y.EntityMilitaryAircraft.BodyColor.Name);
+        if (bodycolorCompare != 0)
+        {
+            return bodycolorCompare;
+        }
+        var speedCompare = x.EntityMilitaryAircraft.Speed.CompareTo(y.EntityMilitaryAircraft.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        return x.EntityMilitaryAircraft.Weight.CompareTo(y.EntityMilitaryAircraft.Weight);
+    }
+}

AirFighter/AirFighter/Exceptions/CollectionAlreadyExistsException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace AirFighter;
+
+public class CollectionAlreadyExistsException : Exception
+{
+    public CollectionAlreadyExistsException() : base() { }
+    public CollectionAlreadyExistsException(CollectionInfo collectionInfo) : base($"Коллекция {collectionInfo} уже существует!") { }
+    public CollectionAlreadyExistsException(string name, Exception exception) :
+        base($"Коллекция {name} уже существует!", exception)
+    { }
+    protected CollectionAlreadyExistsException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

AirFighter/AirFighter/Exceptions/CollectionInfoException.cs

@@ -0,0 +1,12 @@
+namespace AirFighter;
+
+public class CollectionInfoException : Exception
+{
+    public CollectionInfoException() : base() { }
+    public CollectionInfoException(string message) : base(message) { }
+    public CollectionInfoException(string message, Exception exception) :
+        base(message, exception)
+    { }
+    protected CollectionInfoException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

AirFighter/AirFighter/Exceptions/CollectionInsertException.cs

@@ -0,0 +1,13 @@
+namespace AirFighter;
+
+public class CollectionInsertException : Exception
+{
+    public CollectionInsertException(object obj) : base($"Объект {obj} не удволетворяет уникальности") { }
+    public CollectionInsertException() : base() { }
+    public CollectionInsertException(string message) : base(message) { }
+    public CollectionInsertException(string message, Exception exception) :
+        base(message, exception)
+    { }
+    protected CollectionInsertException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

AirFighter/AirFighter/Exceptions/CollectionTypeException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace AirFighter;
+
+public class CollectionTypeException : Exception
+{
+    public CollectionTypeException() : base() { }
+    public CollectionTypeException(string message) : base(message) { }
+    public CollectionTypeException(string message, Exception exception) :
+        base(message, exception)
+    { }
+    protected CollectionTypeException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

AirFighter/AirFighter/FormMilitaryAircraftCollection.Designer.cs

@@ -52,6 +52,8 @@
             loadToolStripMenuItem = new ToolStripMenuItem();
             saveFileDialog = new SaveFileDialog();
             openFileDialog = new OpenFileDialog();
+            buttonSortByColor = new Button();
+            buttonSortByType = new Button();
             groupBoxTools.SuspendLayout();
             panelCompanyTools.SuspendLayout();
             panelStorage.SuspendLayout();
@@ -68,13 +70,15 @@
             groupBoxTools.Dock = DockStyle.Right;
             groupBoxTools.Location = new Point(744, 28);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(206, 639);
+            groupBoxTools.Size = new Size(206, 711);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
             // panelCompanyTools
             // 
+            panelCompanyTools.Controls.Add(buttonSortByColor);
+            panelCompanyTools.Controls.Add(buttonSortByType);
             panelCompanyTools.Controls.Add(buttonRefresh);
             panelCompanyTools.Controls.Add(buttonGoToCheck);
             panelCompanyTools.Controls.Add(buttonRemoveMilitaryAircraft);
@@ -82,15 +86,15 @@
             panelCompanyTools.Controls.Add(maskedTextBoxPosition);
             panelCompanyTools.Dock = DockStyle.Bottom;
             panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 357);
+            panelCompanyTools.Location = new Point(3, 360);
             panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(200, 279);
+            panelCompanyTools.Size = new Size(200, 348);
             panelCompanyTools.TabIndex = 10;
             // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(0, 227);
+            buttonRefresh.Location = new Point(8, 195);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(192, 49);
             buttonRefresh.TabIndex = 7;
@@ -101,7 +105,7 @@
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 178);
+            buttonGoToCheck.Location = new Point(3, 140);
             buttonGoToCheck.Name = "buttonGoToCheck";
             buttonGoToCheck.Size = new Size(192, 49);
             buttonGoToCheck.TabIndex = 6;
@@ -112,7 +116,7 @@
             // buttonRemoveMilitaryAircraft
             // 
             buttonRemoveMilitaryAircraft.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveMilitaryAircraft.Location = new Point(4, 129);
+            buttonRemoveMilitaryAircraft.Location = new Point(4, 91);
             buttonRemoveMilitaryAircraft.Name = "buttonRemoveMilitaryAircraft";
             buttonRemoveMilitaryAircraft.Size = new Size(191, 49);
             buttonRemoveMilitaryAircraft.TabIndex = 5;
@@ -134,7 +138,7 @@
             // maskedTextBoxPosition
             // 
             maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            maskedTextBoxPosition.Location = new Point(3, 96);
+            maskedTextBoxPosition.Location = new Point(3, 58);
             maskedTextBoxPosition.Mask = "00";
             maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             maskedTextBoxPosition.Size = new Size(192, 27);
@@ -250,7 +254,7 @@
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 28);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(744, 639);
+            pictureBox.Size = new Size(744, 711);
             pictureBox.TabIndex = 3;
             pictureBox.TabStop = false;
             // 
@@ -295,11 +299,33 @@
             // 
             openFileDialog.Filter = "txt file | *.txt";
             // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByColor.Location = new Point(4, 296);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(192, 49);
+            buttonSortByColor.TabIndex = 9;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += buttonSortByColor_Click;
+            // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByType.Location = new Point(6, 250);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(191, 49);
+            buttonSortByType.TabIndex = 8;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += buttonSortByType_Click;
+            // 
             // FormMilitaryAircraftCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(950, 667);
+            ClientSize = new Size(950, 739);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
             Controls.Add(menuStrip);
@@ -344,5 +370,7 @@
         private ToolStripMenuItem loadToolStripMenuItem;
         private SaveFileDialog saveFileDialog;
         private OpenFileDialog openFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
     }
 }

AirFighter/AirFighter/FormMilitaryAircraftCollection.cs

@@ -290,4 +290,39 @@ public partial class FormMilitaryAircraftCollection : Form
             }
         }
     }
+
+    /// <summary>
+	/// Сортировка по типу
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void buttonSortByType_Click(object sender, EventArgs e)
+    {
+        CompareCars(new DrawningMilitaryAircraftCompareByType());
+    }
+
+    /// <summary>
+	/// Сортировка по цвету
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void buttonSortByColor_Click(object sender, EventArgs e)
+    {
+        CompareCars(new DrawningMilitaryAircraftCompareByType());
+    }
+
+    /// <summary>
+	/// Сортировка по сравнителю
+	/// </summary>
+	/// <param name="comparer">Сравнитель объектов</param>
+	private void CompareCars(IComparer<DrawningMilitaryAircraft?> comparer)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        _company.Sort(comparer);
+        pictureBox.Image = _company.Show();
+    }
 }

AirFighter/AirFighter/FormMilitaryAircraftCollection.resx

@@ -126,4 +126,7 @@
   <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>310, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>71</value>
+  </metadata>
 </root>