From a051a7a3fb61d0992b02eda5e1f11fb1703e6a1d Mon Sep 17 00:00:00 2001
From: prodigygirl <Prodigygirl1.0@yandex.ru>
Date: Sun, 20 Nov 2022 15:40:45 +0400
Subject: [PATCH] =?UTF-8?q?2.=20=D0=92=20=D1=84=D0=BE=D1=80=D0=BC=D1=83=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8E=20(=D0=BD=D1=83=D0=B6=D0=BD=D0=BE=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B5=20=D0=BE=D1=82=D1=80=D0=B8=D1=81=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/FormMapWithArmoredCars.form |  2 +-
 src/main/java/FormMapWithArmoredCars.java | 47 +++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/main/java/FormMapWithArmoredCars.form b/src/main/java/FormMapWithArmoredCars.form
index e62edd9..1d3d283 100644
--- a/src/main/java/FormMapWithArmoredCars.form
+++ b/src/main/java/FormMapWithArmoredCars.form
@@ -160,7 +160,7 @@
       <grid id="e184c" binding="drawPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
diff --git a/src/main/java/FormMapWithArmoredCars.java b/src/main/java/FormMapWithArmoredCars.java
index b2417c3..bdfe4bc 100644
--- a/src/main/java/FormMapWithArmoredCars.java
+++ b/src/main/java/FormMapWithArmoredCars.java
@@ -41,6 +41,19 @@ public class FormMapWithArmoredCars extends JFrame{
         setBounds(100, 100, 1000, 700);
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
+        JMenuBar jMenuBar = new JMenuBar();
+        JMenu jMenu = new JMenu("Файл");
+        JMenuItem itemSave = new JMenuItem("Сохранение");
+        itemSave.addActionListener(e -> saveActionMenuBar());
+        JMenuItem itemLoad = new JMenuItem("Загрузка");
+        itemLoad.addActionListener(e -> loadActionMenuBar());
+        jMenu.add(itemSave);
+        jMenu.add(itemLoad);
+        jMenuBar.add(jMenu);
+        // поместим меню в наше окно
+        setJMenuBar(jMenuBar);
+        //toolBar.add(jMenu);
+
         mapSelectorComboBox.removeAllItems();
         for (var elem : _mapsDict.keySet())
         {
@@ -233,4 +246,38 @@ public class FormMapWithArmoredCars extends JFrame{
             JOptionPane.showMessageDialog(null, "Не удалось добавить объект");
         }
     }
+
+    private void saveActionMenuBar() {
+        FileDialog fd = new FileDialog(this, "Choose a file", FileDialog.LOAD);
+        fd.setFile("*.txt");
+        fd.setVisible(true);
+        String filename = fd.getFile();
+        if (filename != null) {
+            if (_mapsCollection.SaveData(fd.getDirectory() + filename))
+            {
+                JOptionPane.showMessageDialog(null, "Сохранение прошло успешно");
+            }
+            else {
+                JOptionPane.showMessageDialog(null, "Не сохранилось");
+            }
+        }
+    }
+
+    private void loadActionMenuBar() {
+        FileDialog fd = new FileDialog(this, "Choose a file", FileDialog.LOAD);
+        fd.setFile("*.txt");
+        fd.setVisible(true);
+        String filename = fd.getFile();
+        if (filename != null) {
+            if (_mapsCollection.LoadData(fd.getDirectory() + filename))
+            {
+                JOptionPane.showMessageDialog(null, "Загрузка прошла успешно");
+                ReloadMaps();
+            }
+            else {
+                JOptionPane.showMessageDialog(null, "Не загрузилось");
+            }
+        }
+
+    }
 }