diff --git a/AirBomber/AirBomber/AirBomberNotFoundException.cs b/AirBomber/AirBomber/AirBomberNotFoundException.cs
new file mode 100644
index 0000000..9ff6925
--- /dev/null
+++ b/AirBomber/AirBomber/AirBomberNotFoundException.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirBomber
+{
+ [Serializable]
+ internal class AirBomberNotFoundException : ApplicationException
+ {
+ public AirBomberNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
+ public AirBomberNotFoundException() : base() { }
+ public AirBomberNotFoundException(string message) : base(message) { }
+ public AirBomberNotFoundException(string message, Exception exception) : base(message, exception) { }
+ protected AirBomberNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+ }
+}
diff --git a/AirBomber/AirBomber/FormMapWithSetAirBombers.cs b/AirBomber/AirBomber/FormMapWithSetAirBombers.cs
index e9d7648..2ce2671 100644
--- a/AirBomber/AirBomber/FormMapWithSetAirBombers.cs
+++ b/AirBomber/AirBomber/FormMapWithSetAirBombers.cs
@@ -48,9 +48,20 @@ namespace AirBomber
{
return;
}
- var formAirBomberConfig = new FormAirBomberConfig();
- formAirBomberConfig.AddEvent(AddAction);
- formAirBomberConfig.Show();
+ try
+ {
+ var formAirBomberConfig = new FormAirBomberConfig();
+ formAirBomberConfig.AddEvent(AddAction);
+ formAirBomberConfig.Show();
+ }
+ catch (StorageOverflowException ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show($"Неизвестная ошибка: {ex.Message}", "Ошибка!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
}
private void buttonRemoveAirBomber_Click(object sender, EventArgs e)
@@ -68,14 +79,21 @@ namespace AirBomber
return;
}
int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
- if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+ try
{
- MessageBox.Show("Объект удален");
- pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+ if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+ {
+ MessageBox.Show("Объект удален");
+ pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+ }
}
- else
+ catch (AirBomberNotFoundException ex)
{
- MessageBox.Show("Не удалось удалить объект");
+ MessageBox.Show($"Ошибка удаления: {ex.Message}", "Ошибка!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show($"Неизвестная ошибка: {ex.Message}", "Ошибка!", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
@@ -183,13 +201,14 @@ namespace AirBomber
{
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
- if (_mapsCollection.SaveData(saveFileDialog.FileName))
+ try
{
+ _mapsCollection.SaveData(saveFileDialog.FileName);
MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
- else
+ catch (Exception ex)
{
- MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
@@ -198,14 +217,23 @@ namespace AirBomber
{
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
- if (_mapsCollection.LoadData(openFileDialog.FileName))
+ try
{
+ _mapsCollection.LoadData(openFileDialog.FileName);
MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
ReloadMaps();
}
- else
+ catch(FileFormatException ex)
{
- MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ catch(FileNotFoundException ex)
+ {
+ MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show($"Неизвестная ошибка: {ex.Message}", "Ошибка!", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
diff --git a/AirBomber/AirBomber/MapsCollection.cs b/AirBomber/AirBomber/MapsCollection.cs
index b33ff80..a11452a 100644
--- a/AirBomber/AirBomber/MapsCollection.cs
+++ b/AirBomber/AirBomber/MapsCollection.cs
@@ -87,7 +87,7 @@ namespace AirBomber
///
/// Путь и имя файла
///
- public bool SaveData(string filename)
+ public void SaveData(string filename)
{
if (File.Exists(filename))
{
@@ -102,7 +102,6 @@ namespace AirBomber
sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}", sw);
}
}
- return true;
}
///
@@ -110,11 +109,11 @@ namespace AirBomber
///
///
///
- public bool LoadData(string filename)
+ public void LoadData(string filename)
{
if (!File.Exists(filename))
{
- return false;
+ throw new FileNotFoundException("Файл не найден");
}
using (FileStream fs = new(filename, FileMode.Open))
using (StreamReader sr = new StreamReader(fs))
@@ -122,7 +121,7 @@ namespace AirBomber
string line;
line = sr.ReadLine();
line.Trim();
- if (line != "MapsCollection") return false;
+ if (line != "MapsCollection") throw new FileFormatException("Неверный формат файла");
_mapStorages.Clear();
while ((line = sr.ReadLine()) != null)
{
@@ -145,7 +144,6 @@ namespace AirBomber
_mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
}
}
- return true;
}
}
}
diff --git a/AirBomber/AirBomber/SetAirBombersGeneric.cs b/AirBomber/AirBomber/SetAirBombersGeneric.cs
index a743086..aa09fbc 100644
--- a/AirBomber/AirBomber/SetAirBombersGeneric.cs
+++ b/AirBomber/AirBomber/SetAirBombersGeneric.cs
@@ -36,7 +36,10 @@ namespace AirBomber
///
public int Insert(T airBomber)
{
- if (_places.Count + 1 >= _maxCount) return -1;
+ if (_places.Count + 1 >= _maxCount)
+ {
+ throw new StorageOverflowException(_maxCount);
+ }
_places.Insert(0, airBomber);
return 0;
}
@@ -49,7 +52,10 @@ namespace AirBomber
public int Insert(T airBomber, int position)
{
if (position < 0 || position >= _maxCount) return -1;
- if (_places.Count + 1 >= _maxCount) return -1;
+ if (_places.Count + 1 >= _maxCount)
+ {
+ throw new StorageOverflowException(_maxCount);
+ }
_places.Insert(position, airBomber);
return position;
}
@@ -60,7 +66,10 @@ namespace AirBomber
///
public T Remove(int position)
{
- if (position < 0 || position >= _maxCount) return null;
+ if (position < 0 || position >= _maxCount)
+ {
+ throw new AirBomberNotFoundException(position);
+ }
T removedObject = _places[position];
_places.RemoveAt(position);
return removedObject;
diff --git a/AirBomber/AirBomber/StorageOverflowException.cs b/AirBomber/AirBomber/StorageOverflowException.cs
new file mode 100644
index 0000000..a3fa037
--- /dev/null
+++ b/AirBomber/AirBomber/StorageOverflowException.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirBomber
+{
+ [Serializable]
+ internal class StorageOverflowException : ApplicationException
+ {
+ public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: {count}") { }
+ public StorageOverflowException() : base() { }
+ public StorageOverflowException(string message) : base(message) { }
+ public StorageOverflowException(string message, Exception exception) : base(message, exception) { }
+ protected StorageOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+ }
+}