From 5c582f70b3e3d42cf1200658fbdacab48e33ce04 Mon Sep 17 00:00:00 2001
From: BlasphemyGod <sergpolevoi@yandex.ru>
Date: Tue, 8 Nov 2022 16:19:52 +0400
Subject: [PATCH 1/2] Fixes

---
 FormMapWithSetArtilleries.java    | 13 +++++--------
 MapWithSetArtilleriesGeneric.java |  2 +-
 MapsCollection.java               |  8 ++++++++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/FormMapWithSetArtilleries.java b/FormMapWithSetArtilleries.java
index 2491a0c..552512b 100644
--- a/FormMapWithSetArtilleries.java
+++ b/FormMapWithSetArtilleries.java
@@ -155,15 +155,12 @@ public class FormMapWithSetArtilleries extends JFrame {
         });
 
         buttonShowDeleted.addActionListener(e -> {
-            if (!deletedObjects.empty()) {
-                DrawingObjectArtillery deleted = (DrawingObjectArtillery) deletedObjects.pop();
-                FormArtillery dialog = new FormArtillery(deleted == null ? null : deleted.getArtillery());
-                dialog.setSize(800, 500);
-                dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
-                dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+            FormArtillery dialog = new FormArtillery(deletedObjects.empty() ? null : ((DrawingObjectArtillery)deletedObjects.pop()).getArtillery());
+            dialog.setSize(800, 500);
+            dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
+            dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 
-                dialog.setVisible(true);
-            }
+            dialog.setVisible(true);
         });
 
         buttonLeft.addActionListener(e -> {
diff --git a/MapWithSetArtilleriesGeneric.java b/MapWithSetArtilleriesGeneric.java
index 826e6d4..3c2774f 100644
--- a/MapWithSetArtilleriesGeneric.java
+++ b/MapWithSetArtilleriesGeneric.java
@@ -7,7 +7,7 @@ public class MapWithSetArtilleriesGeneric<T extends IDrawingObject, U extends Ab
     public final int _pictureHeight;
     public final int _placeSizeWidth = 210;
     public final int _placeSizeHeight = 90;
-    private final SetArtilleriesGeneric<T> _setArtilleries;
+    public final SetArtilleriesGeneric<T> _setArtilleries;
     private final U _map;
 
     public MapWithSetArtilleriesGeneric(int picWidth, int picHeight, U map) {
diff --git a/MapsCollection.java b/MapsCollection.java
index 95b6399..5b9f24c 100644
--- a/MapsCollection.java
+++ b/MapsCollection.java
@@ -30,4 +30,12 @@ public class MapsCollection {
     public MapWithSetArtilleriesGeneric<IDrawingObject, AbstractMap> getMap(String name) {
         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;
+    }
 }

From ccab9cd6204f38755676ae771e69d9b492b8fc96 Mon Sep 17 00:00:00 2001
From: BlasphemyGod <sergpolevoi@yandex.ru>
Date: Tue, 8 Nov 2022 16:32:08 +0400
Subject: [PATCH 2/2] Fixes

---
 FormMapWithSetArtilleries.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/FormMapWithSetArtilleries.java b/FormMapWithSetArtilleries.java
index 552512b..84de017 100644
--- a/FormMapWithSetArtilleries.java
+++ b/FormMapWithSetArtilleries.java
@@ -155,12 +155,17 @@ public class FormMapWithSetArtilleries extends JFrame {
         });
 
         buttonShowDeleted.addActionListener(e -> {
-            FormArtillery dialog = new FormArtillery(deletedObjects.empty() ? null : ((DrawingObjectArtillery)deletedObjects.pop()).getArtillery());
-            dialog.setSize(800, 500);
-            dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
-            dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+            if (!deletedObjects.empty()) {
+                DrawingObjectArtillery deleted = (DrawingObjectArtillery) deletedObjects.pop();
+                FormArtillery dialog = new FormArtillery(deleted.getArtillery());
+                dialog.setSize(800, 500);
+                dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
+                dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 
-            dialog.setVisible(true);
+                dialog.setVisible(true);
+            } else {
+                JOptionPane.showMessageDialog(this, "Стек удалённых объектов пуст", "Провал", JOptionPane.INFORMATION_MESSAGE);
+            }
         });
 
         buttonLeft.addActionListener(e -> {