Исправление

This commit is contained in:
Сергей Полевой 2022-11-05 00:12:05 +04:00
parent 3adbf1b7af
commit 6fefc142aa

View File

@ -9,7 +9,7 @@ namespace Artilleries
{
internal class MapsCollection
{
readonly Dictionary<string, MapWithSetArtilleriesGeneric<DrawingObjectArtillery, AbstractMap>> _mapsStorage;
readonly Dictionary<string, MapWithSetArtilleriesGeneric<IDrawingObject, AbstractMap>> _mapsStorage;
public List<string> Keys => _mapsStorage.Keys.ToList();
private readonly int _pictureWidth;
@ -20,7 +20,7 @@ namespace Artilleries
public MapsCollection(int pictureWidth, int pictureHeight)
{
_mapsStorage = new Dictionary<string, MapWithSetArtilleriesGeneric<DrawingObjectArtillery, AbstractMap>>();
_mapsStorage = new Dictionary<string, MapWithSetArtilleriesGeneric<IDrawingObject, AbstractMap>>();
_pictureWidth = pictureWidth;
_pictureHeight = pictureHeight;
}
@ -29,7 +29,7 @@ namespace Artilleries
{
if (!_mapsStorage.ContainsKey(name))
{
_mapsStorage.Add(name, new MapWithSetArtilleriesGeneric<DrawingObjectArtillery, AbstractMap>(_pictureWidth, _pictureHeight, map));
_mapsStorage.Add(name, new MapWithSetArtilleriesGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
}
}
@ -41,7 +41,7 @@ namespace Artilleries
}
}
public MapWithSetArtilleriesGeneric<DrawingObjectArtillery, AbstractMap> this[string index]
public MapWithSetArtilleriesGeneric<IDrawingObject, AbstractMap> this[string index]
{
get
{
@ -102,7 +102,7 @@ namespace Artilleries
break;
}
_mapsStorage.Add(elements[0], new MapWithSetArtilleriesGeneric<DrawingObjectArtillery, AbstractMap>(_pictureWidth, _pictureHeight, map));
_mapsStorage.Add(elements[0], new MapWithSetArtilleriesGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
_mapsStorage[elements[0]].LoadData(elements[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
}