From d403b80e3ae27bff2a9862c3d8bb952b11fd65b2 Mon Sep 17 00:00:00 2001
From: prodigygirl <Prodigygirl1.0@yandex.ru>
Date: Sun, 4 Dec 2022 12:28:50 +0400
Subject: [PATCH] =?UTF-8?q?3.=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/FormMapWithArmoredCars.java | 20 ++++++++++++--------
 src/main/java/MapsCollection.java         | 17 +++++------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/main/java/FormMapWithArmoredCars.java b/src/main/java/FormMapWithArmoredCars.java
index e378988..8dfa97a 100644
--- a/src/main/java/FormMapWithArmoredCars.java
+++ b/src/main/java/FormMapWithArmoredCars.java
@@ -309,12 +309,13 @@ public class FormMapWithArmoredCars extends JFrame{
                     JOptionPane.showMessageDialog(null, "Не сохранилось " + ex.getMessage());
                 }
             } else if (type.equals("Файл карты")){
-                if (_mapsCollection.SaveDataMap(fd.getDirectory() + filename, (String) listBoxMaps.getSelectedValue())) {
+                try{
+                    _mapsCollection.SaveDataMap(fd.getDirectory() + filename, (String) listBoxMaps.getSelectedValue());
                     logger.log(Level.INFO, "Сохранение одной карты в файл " + fd.getDirectory() + filename);
                     JOptionPane.showMessageDialog(null, "Сохранение прошло успешно");
-                } else {
-                    logger.log(Level.WARN, "Не сохранилось ");
-                    JOptionPane.showMessageDialog(null, "Не сохранилось");
+                } catch (Exception ex){
+                    logger.log(Level.ERROR, "Не сохранилось " + ex.getMessage());
+                    JOptionPane.showMessageDialog(null, "Не сохранилось " + ex.getMessage());
                 }
             }
         }
@@ -340,13 +341,16 @@ public class FormMapWithArmoredCars extends JFrame{
                 }
 
             } else if (type.equals("Файл карты")){
-                if (_mapsCollection.LoadDataMap(fd.getDirectory() + filename)) {
+                try {
+                    _mapsCollection.LoadDataMap(fd.getDirectory() + filename);
                     logger.log(Level.INFO, "Загрузка одной карты из файла" + fd.getDirectory() + filename);
                     JOptionPane.showMessageDialog(null, "Загрузка прошла успешно");
                     ReloadMaps();
-                } else {
-                    logger.log(Level.WARN, "Не загрузилось");
-                    JOptionPane.showMessageDialog(null, "Не загрузилось");
+                }
+                catch (Exception ex)
+                {
+                    logger.log(Level.ERROR, "Не загрузилось " + ex.getMessage());
+                    JOptionPane.showMessageDialog(null, "Не загрузилось " + ex.getMessage());
                 }
             }
 
diff --git a/src/main/java/MapsCollection.java b/src/main/java/MapsCollection.java
index f70e449..da96dac 100644
--- a/src/main/java/MapsCollection.java
+++ b/src/main/java/MapsCollection.java
@@ -1,8 +1,5 @@
 import java.io.*;
-import java.nio.file.Files;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Set;
 
 public class MapsCollection {
@@ -101,9 +98,9 @@ public class MapsCollection {
         }
     }
 
-    public boolean SaveDataMap(String filename, String map) {
+    public void SaveDataMap(String filename, String map) {
         if (!_mapStorages.containsKey(map))
-            return false;
+            return;
         File f = new File(filename);
         if (f.exists())
         {
@@ -119,19 +116,17 @@ public class MapsCollection {
         }
         catch (IOException e) {
             e.printStackTrace();
-            return false;
         }
-        return true;
     }
 
-    public boolean LoadDataMap(String filename) {
+    public void LoadDataMap(String filename) throws Exception{
         File f = new File(filename);
         if (!f.exists()) {
-            return false;
+            throw new FileNotFoundException("Файл не найден");
         }
         try (BufferedReader reader = new BufferedReader(new FileReader(filename))) {
             if (!reader.readLine().contains("One Map"))
-                return false;
+                throw new Exception("Формат данных в файле не правильный");
             String line = reader.readLine();
             var elem = line.split(String.valueOf(separatorDict), -1);
             AbstractMap map = null;
@@ -154,8 +149,6 @@ public class MapsCollection {
             _mapStorages.get(elem[0]).LoadData(elem[2].split(String.valueOf(separatorData)));
         } catch (IOException e) {
             e.printStackTrace();
-            return false;
         }
-        return true;
     }
 }