bekodeg/PIbd_22_Borovkov_M_V_ElectricLocomotive_base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7 работа финал

Browse Source
This commit is contained in:
bekodeg 2023-12-06 10:42:21 +04:00
parent 7a3a4b66ca
commit 992ae0d74b
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElectricLocomotive/Generics/LocomotivesGenericStorage.cs
View File

@ -158,7 +158,7 @@ namespace ProjectElectricLocomotive.Generics
using (StreamReader sr = new(filename))
{
string line;
if (!((line = sr.ReadLine() != null) && line.StartsWith("LocomotiveStorage")))
if (!(((line = sr.ReadLine()) != null) && line.StartsWith("LocomotiveStorage")))
{
//если нет такой записи, то это не те данные
throw new ArgumentException("Неверный формат данных");

8
ElectricLocomotive/Generics/SetGeneric.cs
View File

@ -71,11 +71,7 @@ namespace ProjectElectricLocomotive.Generics
/// <returns></returns>
public bool Remove(int position)
{
if (position >= Count || position < 0)
{
return false;
}
if (_places[position] == null)
if (position >= Count || position < 0 || _places[position] == null)
{
throw new LocomotiveNotFoundException(position);
}
@ -94,7 +90,7 @@ namespace ProjectElectricLocomotive.Generics
{
if (position >= Count || position < 0)
{
return null;
throw new LocomotiveNotFoundException(position);
}
return _places[position];
}

8
ElectricLocomotive/LogicFormLocomotiveCollection.cs
View File

@ -145,7 +145,7 @@ namespace ProjectElectricLocomotive
catch (StorageOverflowException ex)
{
MessageBox.Show(ex.Message);
_logger.LogError(ex.ToString());
_logger.LogWarning(ex.ToString());
}
}
@ -197,7 +197,7 @@ namespace ProjectElectricLocomotive
catch (LocomotiveNotFoundException ex)
{
MessageBox.Show(ex.Message);
_logger.LogError(ex.ToString());
_logger.LogWarning(ex.ToString());
}
}
/// <summary>
@ -242,7 +242,7 @@ namespace ProjectElectricLocomotive
MessageBox.Show($"Не сохранилось: {ex.Message}",
"Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
_logger.LogInformation($"Не удалось сохранить в {saveFileDialog.FileName}: {ex.Message}");
_logger.LogDebug(ex.ToString());
_logger.LogWarning(ex.ToString());
}
}
}
@ -267,7 +267,7 @@ namespace ProjectElectricLocomotive
MessageBox.Show($"Не загрузилось: {ex.Message}",
"Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
_logger.LogInformation($"Не удалось загрузить из {openFileDialog.FileName}: {ex.Message}");
_logger.LogDebug(ex.ToString());
_logger.LogWarning(ex.ToString());
}
}
}