diff --git a/AirBomber/AirBomber/AirplaneCompareByType.cs b/AirBomber/AirBomber/AirplaneCompareByType.cs index 464b8f6..43bc7ce 100644 --- a/AirBomber/AirBomber/AirplaneCompareByType.cs +++ b/AirBomber/AirBomber/AirplaneCompareByType.cs @@ -18,9 +18,9 @@ { return -1; } - if (xAirplane.GetType().Name != yAirplane.Airplane.GetType().Name) + if (xAirplane.Airplane.GetType().Name != yAirplane.Airplane.GetType().Name) { - if (xAirplane.Airplane.GetType().Name == "DrawningAirplane") + if (xAirplane.Airplane.GetType() == typeof(DrawningAirplane)) { return -1; } diff --git a/AirBomber/AirBomber/FormMapWithSetAirplanes.Designer.cs b/AirBomber/AirBomber/FormMapWithSetAirplanes.Designer.cs index b7aa21f..9c855b6 100644 --- a/AirBomber/AirBomber/FormMapWithSetAirplanes.Designer.cs +++ b/AirBomber/AirBomber/FormMapWithSetAirplanes.Designer.cs @@ -298,7 +298,7 @@ this.buttonSortByColor.TabIndex = 11; this.buttonSortByColor.Text = "Отсортировать по цвету"; this.buttonSortByColor.UseVisualStyleBackColor = true; - this.buttonSortByColor.Click += new System.EventHandler(this.ButtonSortByType_Click); + this.buttonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click); // // buttonSortByType // @@ -308,7 +308,7 @@ this.buttonSortByType.TabIndex = 12; this.buttonSortByType.Text = "Отсортировать по типу"; this.buttonSortByType.UseVisualStyleBackColor = true; - this.buttonSortByType.Click += new System.EventHandler(this.ButtonSortByColor_Click); + this.buttonSortByType.Click += new System.EventHandler(this.ButtonSortByType_Click); // // FormMapWithSetAirplanes // diff --git a/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs b/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs index cd48a0b..96b94fb 100644 --- a/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs +++ b/AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace AirBomber { internal class MapWithSetAirplanesGeneric - where T : class, IDrawningObject + where T : class, IEquatable, IDrawningObject where U : AbstractMap { ///