diff --git a/ProjectFlowerShop/FormProduct.Designer.cs b/ProjectFlowerShop/FormFlower.Designer.cs similarity index 99% rename from ProjectFlowerShop/FormProduct.Designer.cs rename to ProjectFlowerShop/FormFlower.Designer.cs index 1d8f653..aa3790a 100644 --- a/ProjectFlowerShop/FormProduct.Designer.cs +++ b/ProjectFlowerShop/FormFlower.Designer.cs @@ -1,6 +1,6 @@ namespace ProjectFlowerShop { - partial class FormProduct + partial class FormFlower { /// /// Required designer variable. diff --git a/ProjectFlowerShop/FormProduct.cs b/ProjectFlowerShop/FormFlower.cs similarity index 96% rename from ProjectFlowerShop/FormProduct.cs rename to ProjectFlowerShop/FormFlower.cs index abc08d3..40ad362 100644 --- a/ProjectFlowerShop/FormProduct.cs +++ b/ProjectFlowerShop/FormFlower.cs @@ -15,7 +15,7 @@ using System.Windows.Forms; namespace ProjectFlowerShop { - public partial class FormProduct : Form + public partial class FormFlower : Form { private readonly ILogger _logger; private readonly IFlowerLogic _logic; @@ -23,7 +23,7 @@ namespace ProjectFlowerShop private Dictionary _flowerComponents; public int Id { set { _id = value; } } - public FormProduct(ILogger logger, IFlowerLogic logic) + public FormFlower(ILogger logger, IFlowerLogic logic) { InitializeComponent(); _logger = logger; @@ -95,8 +95,8 @@ namespace ProjectFlowerShop private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormProductComponent)); - if (service is FormProductComponent form) + var service = Program.ServiceProvider?.GetService(typeof(FormFlowerComponent)); + if (service is FormFlowerComponent form) { if (form.ShowDialog() == DialogResult.OK) { @@ -124,8 +124,8 @@ namespace ProjectFlowerShop if (dataGridView.SelectedRows.Count == 1) { var service = - Program.ServiceProvider?.GetService(typeof(FormProductComponent)); - if (service is FormProductComponent form) + Program.ServiceProvider?.GetService(typeof(FormFlowerComponent)); + if (service is FormFlowerComponent form) { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); diff --git a/ProjectFlowerShop/FormProduct.resx b/ProjectFlowerShop/FormFlower.resx similarity index 100% rename from ProjectFlowerShop/FormProduct.resx rename to ProjectFlowerShop/FormFlower.resx diff --git a/ProjectFlowerShop/FormProductComponent.Designer.cs b/ProjectFlowerShop/FormFlowerComponent.Designer.cs similarity index 99% rename from ProjectFlowerShop/FormProductComponent.Designer.cs rename to ProjectFlowerShop/FormFlowerComponent.Designer.cs index 807a79e..8e3378b 100644 --- a/ProjectFlowerShop/FormProductComponent.Designer.cs +++ b/ProjectFlowerShop/FormFlowerComponent.Designer.cs @@ -1,6 +1,6 @@ namespace ProjectFlowerShop { - partial class FormProductComponent + partial class FormFlowerComponent { /// /// Required designer variable. diff --git a/ProjectFlowerShop/FormProductComponent.cs b/ProjectFlowerShop/FormFlowerComponent.cs similarity index 95% rename from ProjectFlowerShop/FormProductComponent.cs rename to ProjectFlowerShop/FormFlowerComponent.cs index cafef61..697ece2 100644 --- a/ProjectFlowerShop/FormProductComponent.cs +++ b/ProjectFlowerShop/FormFlowerComponent.cs @@ -13,7 +13,7 @@ using System.Windows.Forms; namespace ProjectFlowerShop { - public partial class FormProductComponent : Form + public partial class FormFlowerComponent : Form { private readonly List? _list; public int Id @@ -52,7 +52,7 @@ namespace ProjectFlowerShop set { textBoxNumber.Text = value.ToString(); } } - public FormProductComponent(IComponentLogic logic) + public FormFlowerComponent(IComponentLogic logic) { InitializeComponent(); _list = logic.ReadList(null); diff --git a/ProjectFlowerShop/FormProductComponent.resx b/ProjectFlowerShop/FormFlowerComponent.resx similarity index 100% rename from ProjectFlowerShop/FormProductComponent.resx rename to ProjectFlowerShop/FormFlowerComponent.resx diff --git a/ProjectFlowerShop/FormFlowers.cs b/ProjectFlowerShop/FormFlowers.cs index 5d5b18c..49c1b87 100644 --- a/ProjectFlowerShop/FormFlowers.cs +++ b/ProjectFlowerShop/FormFlowers.cs @@ -53,8 +53,8 @@ namespace ProjectFlowerShop private void AddButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormProduct)); - if (service is FormProduct form) + var service = Program.ServiceProvider?.GetService(typeof(FormFlower)); + if (service is FormFlower form) { if (form.ShowDialog() == DialogResult.OK) { @@ -67,8 +67,8 @@ namespace ProjectFlowerShop { if (DataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormProduct)); - if (service is FormProduct form) + var service = Program.ServiceProvider?.GetService(typeof(FormFlower)); + if (service is FormFlower form) { var tmp = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); diff --git a/ProjectFlowerShop/Program.cs b/ProjectFlowerShop/Program.cs index 320cfed..d9210a5 100644 --- a/ProjectFlowerShop/Program.cs +++ b/ProjectFlowerShop/Program.cs @@ -47,8 +47,8 @@ namespace ProjectFlowerShop services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient();