ChipsEater/PIbd-23_Polevoy_S.V._SelfPropelledArtilleryUnit_Hard
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
BlasphemyGod 2022-11-08 16:19:52 +04:00
parent e60990067a
commit 5c582f70b3
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FormMapWithSetArtilleries.java
View File

@ -155,15 +155,12 @@ public class FormMapWithSetArtilleries extends JFrame {
}); });
buttonShowDeleted.addActionListener(e -> { buttonShowDeleted.addActionListener(e -> {
if (!deletedObjects.empty()) { FormArtillery dialog = new FormArtillery(deletedObjects.empty() ? null : ((DrawingObjectArtillery)deletedObjects.pop()).getArtillery());
DrawingObjectArtillery deleted = (DrawingObjectArtillery) deletedObjects.pop();
FormArtillery dialog = new FormArtillery(deleted == null ? null : deleted.getArtillery());
dialog.setSize(800, 500); dialog.setSize(800, 500);
dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL); dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.setVisible(true); dialog.setVisible(true);
}
}); });
buttonLeft.addActionListener(e -> { buttonLeft.addActionListener(e -> {

2
MapWithSetArtilleriesGeneric.java
View File

@ -7,7 +7,7 @@ public class MapWithSetArtilleriesGeneric<T extends IDrawingObject, U extends Ab
public final int _pictureHeight; public final int _pictureHeight;
public final int _placeSizeWidth = 210; public final int _placeSizeWidth = 210;
public final int _placeSizeHeight = 90; public final int _placeSizeHeight = 90;
private final SetArtilleriesGeneric<T> _setArtilleries; public final SetArtilleriesGeneric<T> _setArtilleries;
private final U _map; private final U _map;
public MapWithSetArtilleriesGeneric(int picWidth, int picHeight, U map) { public MapWithSetArtilleriesGeneric(int picWidth, int picHeight, U map) {

8
MapsCollection.java
View File

@ -30,4 +30,12 @@ public class MapsCollection {
public MapWithSetArtilleriesGeneric<IDrawingObject, AbstractMap> getMap(String name) { public MapWithSetArtilleriesGeneric<IDrawingObject, AbstractMap> getMap(String name) {
return _mapsStorage.getOrDefault(name, null); return _mapsStorage.getOrDefault(name, null);
} }
public IDrawingObject getArtillery(String mapName, int index) {
var map = _mapsStorage.getOrDefault(mapName, null);
if (map != null) {
return map._setArtilleries.get(index);
}
return null;
}
} }