LabWork8::hard_part::Полностью сделанная 8 лабораторная

Liner.iml

@@ -7,5 +7,14 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$USER_HOME$/Downloads/apache-log4j-1.2.17/log4j-1.2.17.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>

src/AbstractMap.java

@@ -126,4 +126,39 @@ public abstract class AbstractMap {
     protected abstract void GenerateMap();
     protected abstract void DrawRoadPart(Graphics g, int i, int j);
     protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+    @Override
+    public boolean equals(Object other) {
+        if (other == null) {
+            return false;
+        }
+        AbstractMap otherMap = (AbstractMap) other;
+        if (otherMap == null) {
+            return false;
+        }
+        if (_width != otherMap._width) {
+            return false;
+        }
+        if (_height != otherMap._height) {
+            return false;
+        }
+        if (_size_x != otherMap._size_x)
+        {
+            return false;
+        }
+        if (_size_y != otherMap._size_y)
+        {
+            return false;
+        }
+        for(int i = 0; i < _map.length; i++)
+        {
+            for (int j = 0; j < _map[i].length; j++)
+            {
+                if (_map[i][j] != otherMap._map[i][j])
+                {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 }

src/DrawingLiner.java

@@ -1,4 +1,5 @@
 import java.awt.*;
+import java.util.Iterator;
 
 public class DrawingLiner extends DrawingShip
 {
@@ -6,6 +7,7 @@ public class DrawingLiner extends DrawingShip
     public DrawingLiner(int speed, float weight, Color bodyColor,int numdeck,Color dopColor,boolean dopDeck,boolean pool)
     {
         super(speed,weight,bodyColor,numdeck,130,45);
+        fields = new Object[]{ speed, weight, bodyColor,Deck,numdeck, dopColor, dopDeck, pool };
         Ship = new EntityLiner(speed, weight, bodyColor, dopColor, dopDeck, pool);
         this.dopColor=dopColor;
     }
@@ -19,6 +21,8 @@ public class DrawingLiner extends DrawingShip
         var temp = (EntityLiner) Ship;
         Ship=new EntityLiner(temp.GetSpeed(),temp.GetWeight(),temp.GetBodyColor(),color,temp.DopDeck,temp.Pool);
         dopColor=color;
+        fields[5]=dopColor;
+
     }
     @Override
     public void SetColor(Color color)
@@ -26,6 +30,7 @@ public class DrawingLiner extends DrawingShip
         var temp = (EntityLiner) Ship;
         dopColor = dopColor==null? Color.WHITE : dopColor;
         Ship=new EntityLiner(temp.GetSpeed(),temp.GetWeight(),color,dopColor,temp.DopDeck,temp.Pool);
+        fields[2]=color;
     }
     @Override
     public void DrawTransport(Graphics gr) {

src/DrawingObjectShip.java

@@ -1,4 +1,5 @@
 import java.awt.*;
+import java.util.Objects;
 
 public class DrawingObjectShip implements IDrawingObject {
     private DrawingShip _ship = null;
@@ -48,5 +49,60 @@ public class DrawingObjectShip implements IDrawingObject {
     {
         return new DrawingObjectShip(ExtentionShip.CreateDrawingShip(data));
     }
+    @Override
+    public boolean equals(Object other)
+    {
+        if(other==null)
+        {
+            return false;
+        }
+        if(!(other instanceof DrawingObjectShip otherShip))
+        {
+            return false;
+        }
+        EntityShip ship=_ship.Ship;
+        EntityShip otherShipShip=otherShip._ship.Ship;
+        if(!(ship.getClass().getSimpleName().equals(otherShipShip.getClass().getSimpleName())))
+        {
+            return false;
+        }
+        if(ship.GetSpeed() != otherShipShip.GetSpeed())
+        {
+            return false;
+        }
+        if(ship.GetWeight() != otherShipShip.GetWeight())
+        {
+            return false;
+        }
+        if (!Objects.equals(ship.GetBodyColor().toString(), otherShipShip.GetBodyColor().toString()))
+        {
+            return false;
+        }
+        if(_ship.GetDeck().getClass()!=otherShip._ship.GetDeck().getClass())
+        {
+            return false;
+        }
+        if(_ship.GetDeck().GetDeckEnum()!=otherShip._ship.GetDeck().GetDeckEnum())
+        {
+            return false;
+        }
+        if(ship instanceof  EntityLiner Liner && otherShipShip instanceof  EntityLiner otherLiner)
+        {
+            if(!Objects.equals(Liner.DopColor.toString(), otherLiner.DopColor.toString()))
+            {
+                return false;
+            }
+            if(Liner.Pool != otherLiner.Pool)
+            {
+                return false;
+            }
+            if(Liner.DopDeck != otherLiner.DopDeck)
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
 
 }

src/DrawingShip.java

@@ -1,14 +1,18 @@
 import javax.swing.*;
 import java.awt.*;
+import java.util.Iterator;
 import java.util.Random;
 import java.util.Set;
 
-public class DrawingShip extends JComponent{
+public class DrawingShip extends JComponent implements  Iterable<Object>, Iterator<Object> {
     protected EntityShip Ship;
     protected IAdditionalDrawingObject Deck;
+    private int currentIndex = 0;
+    protected Object[] fields;
     public void SetColor(Color color)
     {
         Ship=new EntityShip(Ship.GetSpeed(),Ship.GetWeight(),color);
+        fields[2]=color;
     }
     public IAdditionalDrawingObject GetDeck()
     {
@@ -18,10 +22,13 @@ public class DrawingShip extends JComponent{
     {
         Deck=deck;
         Deck.SetAddEnum(decksnum);
+        fields[3]=Deck;
+        fields[4]=Deck.GetDeckEnum();
     }
     public void SetDeck(IAdditionalDrawingObject deck)
     {
         Deck=deck;
+        fields[3]=Deck;
     }
     public EntityShip GetShip() {
         return Ship;
@@ -36,6 +43,7 @@ public class DrawingShip extends JComponent{
     public DrawingShip(int speed, float weight, Color bodycolor,int numdeck) {
         Ship = new EntityShip(speed, weight, bodycolor);
         Deck = new DrawingTriangleDeck();
+        fields = new Object[]{speed, weight, bodycolor,Deck,numdeck};
         Random r = new Random();
         int numbEnum = r.nextInt(1, 4);
         if (numbEnum == 1) {
@@ -61,6 +69,7 @@ public class DrawingShip extends JComponent{
     {
         Ship=ship;
         Deck=deck;
+        fields = new Object[]{ ship.GetSpeed(), ship.GetWeight(), ship.GetBodyColor(),Deck,Deck.GetDeckEnum() };
     }
     public void SetPosition(int x, int y, int width, int height) {
         if (width <= _ShipWidth + x || height <= _ShipHeight + y || x < 0 || y < 0) {
@@ -135,4 +144,22 @@ public class DrawingShip extends JComponent{
     {
         return new float[] {/*UP*/_startPosY, /*RIGHT*/ _startPosX + _ShipWidth, /*DOWN*/ _startPosY + _ShipHeight, /*LEFT*/ _startPosX};
     }
+
+    @Override
+    public Iterator<Object> iterator()
+    {
+        return this;
+    }
+
+    @Override
+    public boolean hasNext()
+    {
+        return currentIndex < fields.length && fields[currentIndex] != null;
+    }
+
+    @Override
+    public Object next()
+    {
+        return fields[currentIndex++];
+    }
 }

src/FormMapWithSetShipsGeneric.form

@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="Mainpanel" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="798" height="551"/>
+      <xy x="20" y="20" width="798" height="601"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -25,7 +25,7 @@
           <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
-      <grid id="4fa91" binding="GroupBoxTools" layout-manager="GridLayoutManager" row-count="8" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="4fa91" binding="GroupBoxTools" layout-manager="GridLayoutManager" row-count="10" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="3" column="1" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -35,7 +35,7 @@
         <children>
           <component id="cdb80" class="javax.swing.JButton" binding="ButtonAddShip">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Добавить корабль"/>
@@ -43,7 +43,7 @@
           </component>
           <component id="e5494" class="javax.swing.JTextField" binding="maskedTextBoxPosition">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="3" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -51,7 +51,7 @@
           </component>
           <component id="8bb89" class="javax.swing.JButton" binding="ButtonDeleteShip">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Удалить корабль"/>
@@ -59,7 +59,7 @@
           </component>
           <component id="aa482" class="javax.swing.JButton" binding="ButtonShowStorage">
             <constraints>
-              <grid row="3" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="5" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Показать хранилище"/>
@@ -67,7 +67,7 @@
           </component>
           <component id="9ebdc" class="javax.swing.JButton" binding="ButtonShowMap">
             <constraints>
-              <grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="6" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Показать карту"/>
@@ -75,7 +75,7 @@
           </component>
           <component id="acbc" class="javax.swing.JButton" binding="ButtonUp">
             <constraints>
-              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+              <grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
                 <minimum-size width="30" height="30"/>
                 <preferred-size width="30" height="30"/>
                 <maximum-size width="30" height="30"/>
@@ -87,7 +87,7 @@
           </component>
           <component id="a584e" class="javax.swing.JButton" binding="ButtonDown">
             <constraints>
-              <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+              <grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
                 <minimum-size width="30" height="30"/>
                 <preferred-size width="30" height="30"/>
                 <maximum-size width="30" height="30"/>
@@ -99,7 +99,7 @@
           </component>
           <component id="e9fe6" class="javax.swing.JButton" binding="ButtonLeft">
             <constraints>
-              <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+              <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
                 <minimum-size width="30" height="30"/>
                 <preferred-size width="30" height="30"/>
                 <maximum-size width="30" height="30"/>
@@ -111,7 +111,7 @@
           </component>
           <component id="25a22" class="javax.swing.JButton" binding="ButtonRight">
             <constraints>
-              <grid row="7" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+              <grid row="9" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
                 <minimum-size width="30" height="30"/>
                 <preferred-size width="30" height="30"/>
                 <maximum-size width="30" height="30"/>
@@ -123,12 +123,28 @@
           </component>
           <component id="6734a" class="javax.swing.JButton" binding="ButtonCheckDel">
             <constraints>
-              <grid row="5" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="7" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Удаленные"/>
             </properties>
           </component>
+          <component id="4226" class="javax.swing.JButton" binding="ButtonSortByType">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Отсортировать по типу"/>
+            </properties>
+          </component>
+          <component id="2dae0" class="javax.swing.JButton" binding="ButtonSortByColor">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Отсортировать по цвету"/>
+            </properties>
+          </component>
         </children>
       </grid>
       <grid id="d087c" binding="GroupBoxMaps" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">

src/FormMapWithSetShipsGeneric.java

@@ -6,8 +6,12 @@ import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.util.HashMap;
+
+import org.apache.log4j.*;
+
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 public class FormMapWithSetShipsGeneric extends JFrame{
@@ -26,7 +30,6 @@ public class FormMapWithSetShipsGeneric extends JFrame{
     private JTextField maskedTextBoxPosition;
     private JTextField textBoxNewMapName;
     private final int picWidth=600;
-
     private final int picHeight=400;
     private JButton ButtonAddMap;
     private JList ListBoxMaps;
@@ -40,12 +43,15 @@ public class FormMapWithSetShipsGeneric extends JFrame{
     private JMenu MenuMap;
     private JMenuItem SaveToolStripMap;
     private JMenuItem LoadToolStripMap;
+    private JButton ButtonSortByType;
+    private JButton ButtonSortByColor;
     private  MapWithSetShipsGeneric<DrawingObjectShip,AbstractMap> _mapShipsCollectionGeneric;
     private final HashMap<String,AbstractMap> _mapsDict = new HashMap<>(){{
         put("Простая карта",new SimpleMap());
         put("Карта море",new SeaMap());
     }};
     private final MapsCollection _mapsCollection;
+    private static Logger _logger = Logger.getLogger("FormMapWithSetShipsGeneric");
     public void UpdateWindow(BufferedImage bmp)
     {
         pictureBoxShip.removeAll();
@@ -98,19 +104,30 @@ public class FormMapWithSetShipsGeneric extends JFrame{
             public void actionPerformed(ActionEvent e) {
                 FormShipConfig formShipConfig = new FormShipConfig();
                 formShipConfig.AddEvent(newShip -> {
-                    if (ListBoxMaps.getSelectedIndex() == -1) {
-                        return;
-                    }
-                    if (newShip != null) {
-                        DrawingObjectShip ship = new DrawingObjectShip(newShip);
-                        if (_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).Add(ship) != -1) {
-                            JOptionPane.showMessageDialog(null, "Объект добавлен");
-                            UpdateWindow(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).ShowSet());
-                        } else {
-                            JOptionPane.showMessageDialog(null, "Не удалось добавить объект");
+                    try
+                    {
+                        if (ListBoxMaps.getSelectedIndex() == -1) {
+                            return;
                         }
+                        if (newShip != null) {
+                            DrawingObjectShip ship = new DrawingObjectShip(newShip);
+                            if (_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).Add(ship) != -1) {
+                                JOptionPane.showMessageDialog(null, "Объект добавлен");
+                                _logger.log(Level.INFO,"Добавлен объект: "+ship);
+                                UpdateWindow(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).ShowSet());
+                            } else {
+                                JOptionPane.showMessageDialog(null, "Не удалось добавить объект","Ошибка",JOptionPane.ERROR_MESSAGE);
+                                _logger.log(Level.INFO,"Не удалось добавить объект:"+ship);
+                            }
+                        }
+                    }catch (StorageOverflowException ex)
+                    {
+                        _logger.log(Level.WARN,"Ошибка переполнения хранилища: "+ex.getMessage());
+                        JOptionPane.showMessageDialog(null, "Ошибка переполнения хранилища: "+ex.getMessage(),"Ошибка",JOptionPane.ERROR_MESSAGE);
+                    } catch (Exception ex) {
+                        JOptionPane.showMessageDialog(null, "Неизвестная ошибка: "+ex.getMessage(),"Ошибка",JOptionPane.ERROR_MESSAGE);
+                        _logger.log(Level.FATAL,"Неизвестная ошибка: "+ex.getMessage());
                     }
-
                 });
                 formShipConfig.setSize(850, 300);
                 formShipConfig.setVisible(true);
@@ -122,6 +139,7 @@ public class FormMapWithSetShipsGeneric extends JFrame{
                 if (ListBoxMaps.getSelectedIndex() == -1)
                     return;
                 UpdateWindow(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).ShowSet());
+                _logger.log(Level.INFO, "Переход на карту: "+ListBoxMaps.getSelectedValue().toString());
             }
         });
         ButtonDeleteShip.addActionListener(new ActionListener() {
@@ -137,14 +155,26 @@ public class FormMapWithSetShipsGeneric extends JFrame{
                     return;
                 }
                 int pos=Integer.parseInt(maskedTextBoxPosition.getText());
-                if(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).Delete(pos)!=null)
+                try
                 {
-                    JOptionPane.showMessageDialog(null, "Объект удален");
-                    UpdateWindow(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).ShowSet());
-                }
-                else
-                {
-                    JOptionPane.showMessageDialog(null, "Не удалось удалить объект");
+                    var delShip = _mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).Delete(pos);
+                    if(delShip!=null)
+                    {
+                        JOptionPane.showMessageDialog(null, "Объект удален");
+                        _logger.log(Level.INFO,"Объект удален"+delShip);
+                        UpdateWindow(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).ShowSet());
+                    }
+                    else
+                    {
+                        JOptionPane.showMessageDialog(null, "Не удалось удалить объект","Ошибка",JOptionPane.ERROR_MESSAGE);
+                        _logger.log(Level.INFO,"Не удалось удалить объект"+delShip);
+                    }
+                } catch (ShipNotFoundException ex) {
+                    JOptionPane.showMessageDialog(null, "Ошибка удаления: "+ex.getMessage(),"Ошибка",JOptionPane.ERROR_MESSAGE);
+                    _logger.log(Level.WARN,"Ошибка удаления: "+ex.getMessage());
+                } catch (Exception ex) {
+                    JOptionPane.showMessageDialog(null, "Неизвестная ошибка: "+ex.getMessage(),"Ошибка",JOptionPane.ERROR_MESSAGE);
+                    _logger.log(Level.FATAL,"Неизвестная ошибка: "+ex.getMessage());
                 }
             }
         });
@@ -252,13 +282,16 @@ public class FormMapWithSetShipsGeneric extends JFrame{
                 if (ComboBoxSelectorMap.getSelectedIndex() == -1 || textBoxNewMapName.getText().isEmpty())
                 {
                     JOptionPane.showMessageDialog(null,"Не все данные заполнены","Ошибка",JOptionPane.ERROR_MESSAGE);
+                    _logger.log(Level.ERROR,"Не все данные заполнены");
                     return;
                 }
                 if(!_mapsDict.containsKey(ComboBoxSelectorMap.getSelectedItem()))
                 {
                     JOptionPane.showMessageDialog(null,"Нет такой карты","Ошибка",JOptionPane.ERROR_MESSAGE);
+                    _logger.log(Level.ERROR,"Нет такой карты");
                 }
                 _mapsCollection.AddMap(textBoxNewMapName.getText(),_mapsDict.get(ComboBoxSelectorMap.getSelectedItem().toString()));
+                _logger.log(Level.INFO,"Добавлена карта: "+textBoxNewMapName.getText());
                 ReloadMaps();
             }
         });
@@ -272,6 +305,7 @@ public class FormMapWithSetShipsGeneric extends JFrame{
                 if(JOptionPane.showConfirmDialog(null,"Удалить карту"+ListBoxMaps.getSelectedValue().toString()+"?","Удаление",JOptionPane.YES_NO_OPTION)==0)
                 {
                     _mapsCollection.DelMap(ListBoxMaps.getSelectedValue().toString());
+                    _logger.log(Level.INFO, "Удалена карта: "+ListBoxMaps.getSelectedValue().toString());
                     ReloadMaps();
                 }
             }
@@ -302,15 +336,13 @@ public class FormMapWithSetShipsGeneric extends JFrame{
                 if(returnVal==JFileChooser.APPROVE_OPTION)
                 {
                     try {
-                        if (_mapsCollection.SaveData(fc.getSelectedFile().getPath())) {
-                            JOptionPane.showMessageDialog(null, "Сохранение прошло успешно", "Результат",JOptionPane.INFORMATION_MESSAGE);
-                        }
-                        else
-                        {
-                            JOptionPane.showMessageDialog(null, "Не сохранилось", "Результат",JOptionPane.ERROR_MESSAGE);
-                        }
-                    } catch (IOException ex) {
-                        throw new RuntimeException(ex);
+                        File selectedFile=fc.getSelectedFile();
+                        _mapsCollection.SaveData(selectedFile.getPath());
+                        JOptionPane.showMessageDialog(null, "Сохранение прошло успешно", "Результат",JOptionPane.INFORMATION_MESSAGE);
+                        _logger.log(Level.INFO,"Сохранение прошло успешно");
+                    } catch (Exception ex) {
+                        JOptionPane.showMessageDialog(null, "Не сохранилось: "+ex.getMessage(), "Результат",JOptionPane.ERROR_MESSAGE);
+                        _logger.log(Level.ERROR,"Не сохранилось: "+ex.getMessage());
                     }
                 }
             }
@@ -323,17 +355,14 @@ public class FormMapWithSetShipsGeneric extends JFrame{
                 if(returnVal==JFileChooser.APPROVE_OPTION)
                 {
                     try {
-                        if(_mapsCollection.LoadData(fc.getSelectedFile().getPath()))
-                        {
-                            ReloadMaps();
-                            JOptionPane.showMessageDialog(null, "Загрузка прошла успешно", "Результат",JOptionPane.INFORMATION_MESSAGE);
-                        }
-                        else
-                        {
-                            JOptionPane.showMessageDialog(null, "Не загрузилось", "Результат",JOptionPane.ERROR_MESSAGE);
-                        }
-                    } catch (IOException ex) {
-                        throw new RuntimeException(ex);
+                        File selectedFile=fc.getSelectedFile();
+                        _mapsCollection.LoadData(selectedFile.getPath());
+                        ReloadMaps();
+                        JOptionPane.showMessageDialog(null, "Загрузка прошла успешно", "Результат",JOptionPane.INFORMATION_MESSAGE);
+                        _logger.log(Level.INFO,"Загрузка прошло успешно");
+                    } catch (FileNotFoundException | IllegalArgumentException ex ) {
+                        JOptionPane.showMessageDialog(null, "Не загрузилось: "+ex.getMessage(), "Результат",JOptionPane.ERROR_MESSAGE);
+                        _logger.log(Level.ERROR,"Не загрузилось: "+ex.getMessage());
                     }
                 }
             }
@@ -351,15 +380,13 @@ public class FormMapWithSetShipsGeneric extends JFrame{
                 if(returnVal==JFileChooser.APPROVE_OPTION)
                 {
                     try {
-                        if (_mapsCollection.SaveMapData(fc.getSelectedFile().getPath(),ListBoxMaps.getSelectedValue().toString())){
-                            JOptionPane.showMessageDialog(null, "Сохранение прошло успешно", "Результат",JOptionPane.INFORMATION_MESSAGE);
-                        }
-                        else
-                        {
-                            JOptionPane.showMessageDialog(null, "Не сохранилось", "Результат",JOptionPane.ERROR_MESSAGE);
-                        }
-                    } catch (IOException ex) {
-                        throw new RuntimeException(ex);
+                        File selectedFile=fc.getSelectedFile();
+                        _mapsCollection.SaveMapData(selectedFile.getPath(),ListBoxMaps.getSelectedValue().toString());
+                        JOptionPane.showMessageDialog(null, "Сохранение прошло успешно", "Результат",JOptionPane.INFORMATION_MESSAGE);
+                        _logger.log(Level.INFO,"Сохранение прошло успешно");
+                    } catch (Exception ex) {
+                        JOptionPane.showMessageDialog(null, "Не сохранилось: "+ex.getMessage(), "Результат",JOptionPane.ERROR_MESSAGE);
+                        _logger.log(Level.ERROR,"Не сохранилось: "+ex.getMessage());
                     }
                 }
             }
@@ -372,21 +399,40 @@ public class FormMapWithSetShipsGeneric extends JFrame{
                 if(returnVal==JFileChooser.APPROVE_OPTION)
                 {
                     try {
-                        if(_mapsCollection.LoadMapData(fc.getSelectedFile().getPath()))
-                        {
-                            ReloadMaps();
-                            JOptionPane.showMessageDialog(null, "Загрузка прошла успешно", "Результат",JOptionPane.INFORMATION_MESSAGE);
-                        }
-                        else
-                        {
-                            JOptionPane.showMessageDialog(null, "Не загрузилось", "Результат",JOptionPane.ERROR_MESSAGE);
-                        }
-                    } catch (IOException ex) {
-                        throw new RuntimeException(ex);
+                        File selectedFile=fc.getSelectedFile();
+                        _mapsCollection.LoadMapData(selectedFile.getPath());
+                        ReloadMaps();
+                        JOptionPane.showMessageDialog(null, "Загрузка прошла успешно", "Результат",JOptionPane.INFORMATION_MESSAGE);
+                        _logger.log(Level.INFO,"Загрузка прошло успешно");
+                    } catch (FileNotFoundException | IllegalArgumentException ex ) {
+                        JOptionPane.showMessageDialog(null, "Не загрузилось: "+ex.getMessage(), "Результат",JOptionPane.ERROR_MESSAGE);
+                        _logger.log(Level.ERROR,"Не загрузилось: "+ex.getMessage());
                     }
                 }
             }
         });
+        ButtonSortByType.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (ListBoxMaps.getSelectedIndex() == -1)
+                {
+                    return;
+                }
+                _mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).Sort(new ShipCompareByType());
+                UpdateWindow(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).ShowSet());
+            }
+        });
+        ButtonSortByColor.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (ListBoxMaps.getSelectedIndex() == -1)
+                {
+                    return;
+                }
+                _mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).Sort(new ShipCompareByColor());
+                UpdateWindow(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).ShowSet());
+            }
+        });
     }
 
     private void createUIComponents() {

src/MapWithSetShipsGeneric.java

@@ -1,8 +1,9 @@
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.util.Comparator;
 import java.util.LinkedList;
 
-public class MapWithSetShipsGeneric<T extends IDrawingObject, U extends  AbstractMap> {
+public class MapWithSetShipsGeneric<T extends IDrawingObject, U extends  AbstractMap> implements Comparable<MapWithSetShipsGeneric>{
     private final int _pictureWidth;
     private final int _pictureHeight;
     private final int _placeSizeWidth = 170;
@@ -20,12 +21,10 @@ public class MapWithSetShipsGeneric<T extends IDrawingObject, U extends  Abstrac
         _pictureHeight = picHeight;
         _map = map;
     }
-    public int Add(T ship)
-    {
+    public int Add(T ship) throws StorageOverflowException {
         return _setShips.Insert(ship);
     }
-    public T Delete(int position)
-    {
+    public T Delete(int position) throws ShipNotFoundException {
         T ship=_setShips.Remove(position);
         _deletedShips.add(ship);
         return ship;
@@ -42,8 +41,7 @@ public class MapWithSetShipsGeneric<T extends IDrawingObject, U extends  Abstrac
         DrawShips(gr);
         return bmp;
     }
-    public BufferedImage ShowOnMap()
-    {
+    public BufferedImage ShowOnMap(){
         Shaking();
         for(var ship : _setShips)
         {
@@ -59,8 +57,7 @@ public class MapWithSetShipsGeneric<T extends IDrawingObject, U extends  Abstrac
         }
         return new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_RGB);
     }
-    private void Shaking()
-    {
+    private void Shaking(){
         int j = _setShips.Count() - 1;
         for (int i = 0; i < _setShips.Count(); i++)
         {
@@ -71,8 +68,16 @@ public class MapWithSetShipsGeneric<T extends IDrawingObject, U extends  Abstrac
                     var ship = _setShips.Get(j);
                     if (ship != null)
                     {
-                        _setShips.Insert(ship, i);
-                        _setShips.Remove(j);
+                        try {
+                            _setShips.Insert(ship, i);
+                        } catch (StorageOverflowException e) {
+                            throw new RuntimeException(e);
+                        }
+                        try {
+                            _setShips.Remove(j);
+                        } catch (ShipNotFoundException e) {
+                            throw new RuntimeException(e);
+                        }
                         break;
                     }
                 }
@@ -154,8 +159,7 @@ public class MapWithSetShipsGeneric<T extends IDrawingObject, U extends  Abstrac
         }
         return data.toString();
     }
-    public void LoadData(String[] records)
-    {
+    public void LoadData(String[] records) throws StorageOverflowException {
         for(var rec:records)
         {
             _setShips.Insert((T) DrawingObjectShip.Create(rec));
@@ -172,5 +176,23 @@ public class MapWithSetShipsGeneric<T extends IDrawingObject, U extends  Abstrac
         }
         return _deletedShips.poll();
     }
+    public void Sort(Comparator<T> comparer)
+    {
+        _setShips.SortSet(comparer);
+    }
+    @Override
+    public int compareTo(MapWithSetShipsGeneric o) {
+        if (o == null)
+        {
+            return 1;
+        }
+        if (this == o)
+        {
+            return 0;
+        }
+        Integer temp1=(Integer) _setShips.Count();
+        Integer temp2=(Integer) o._setShips.Count();
+        return temp1.compareTo(temp2);
+    }
 }
 

src/MapsCollection.java

@@ -46,7 +46,7 @@ public class MapsCollection {
         }
         return null;
     }
-    public boolean SaveData(String filename) throws IOException {
+    public void SaveData(String filename) throws IOException {
         File file = new File(filename);
         if(file.exists())
         {
@@ -60,20 +60,19 @@ public class MapsCollection {
                 fw.write(String.format("%s%c%s%s",storage,separatorDict,_mapStorages.get(storage).GetData(separatorDict,separatorData),System.lineSeparator()));
             }
         }
-        return true;
     }
-    public boolean LoadData(String filename) throws IOException {
+    public void LoadData(String filename) throws FileNotFoundException {
         File file=new File(filename);
         if(!file.exists())
         {
-            return false;
+            throw new FileNotFoundException("Файл не найден");
         }
         try(BufferedReader fr = new BufferedReader(new FileReader(file)))
         {
             String str="";
             if((str=fr.readLine())==null || !str.contains("MapsCollection"))
             {
-                return false;
+                throw new IllegalArgumentException("Формат данных в файле неправильный");
             }
             _mapStorages.clear();
             while((str=fr.readLine())!=null)
@@ -95,10 +94,13 @@ public class MapsCollection {
                     _mapStorages.get(tempElem[0]).LoadData(tempElem[2].split(String.valueOf(separatorData)));
                 }
             }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (StorageOverflowException e) {
+            throw new RuntimeException(e);
         }
-        return true;
     }
-    public boolean SaveMapData(String filename,String Key)throws IOException
+    public void SaveMapData(String filename,String Key)throws IOException
     {
         File file = new File(filename);
         if(file.exists())
@@ -113,20 +115,19 @@ public class MapsCollection {
             fw.write(String.format("Objects_In_Map_Info:%s",System.lineSeparator()));
             fw.write(String.format("%s%s",Map.GetDataForMap(separatorDict,separatorData,false),System.lineSeparator()));
         }
-        return true;
     }
-    public boolean LoadMapData(String filename) throws IOException {
+    public void LoadMapData(String filename) throws FileNotFoundException {
         File file=new File(filename);
         if(!file.exists())
         {
-            return false;
+            throw new FileNotFoundException("Файл не найден");
         }
         try(BufferedReader fr = new BufferedReader(new FileReader(file)))
         {
             String str="";
             if((str=fr.readLine())==null || !str.contains("Map_Info:"))
             {
-                return false;
+                throw new IllegalArgumentException("Формат данных в файле неправильный");
             }
             str=fr.readLine();
             var tempElem = str.split(String.format("\\%c",separatorDict));
@@ -150,16 +151,18 @@ public class MapsCollection {
             String str_second=fr.readLine();
             if(!str_second.contains("Objects_In_Map_Info:"))
             {
-                return false;
+                throw new IllegalArgumentException("Формат данных в файле неправильный");
             }
             str_second= fr.readLine();
             str=str+str_second;
-            System.out.println(str);
             tempElem = str.split(String.format("\\%c",separatorDict));
             if(tempElem.length==3) {
                 _mapStorages.get(tempElem[0]).LoadData(tempElem[2].split(String.valueOf(separatorData)));
             }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (StorageOverflowException e) {
+            throw new RuntimeException(e);
         }
-        return true;
     }
 }

src/SetShipsGeneric.java

@@ -1,4 +1,5 @@
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Iterator;
 public class SetShipsGeneric<T extends  Object> implements  Iterable<T>{
     private ArrayList<T> _places;
@@ -12,21 +13,26 @@ public class SetShipsGeneric<T extends  Object> implements  Iterable<T>{
         _maxCount=count;
         _places = new ArrayList<>();
     }
-    public int Insert(T ship)
-    {
+    public int Insert(T ship) throws StorageOverflowException {
         return Insert(ship, 0);
     }
-    public int Insert(T ship, int position)
-    {
+    public int Insert(T ship, int position) throws StorageOverflowException {
+        if (_places.contains(ship))
+        {
+            return -1;
+        }
+        if(_maxCount == Count())
+        {
+            throw new StorageOverflowException(_maxCount);
+        }
         if (position < 0 || position > Count() || _maxCount == Count()) return -1;
         _places.add(position,ship);
         return position;
     }
-    public T Remove(int position)
-    {
+    public T Remove(int position) throws ShipNotFoundException {
         if (position >= Count() || position < 0)
         {
-            return null;
+            throw new ShipNotFoundException(position);
         }
         T ship = (T) _places.get(position);
         _places.remove(ship);
@@ -44,8 +50,7 @@ public class SetShipsGeneric<T extends  Object> implements  Iterable<T>{
         }
         return _places.get(position);
     }
-    public void Set(int position,T value)
-    {
+    public void Set(int position,T value) throws StorageOverflowException {
         if (position < _maxCount || position >= 0)
         {
             Insert(value,position);
@@ -55,5 +60,13 @@ public class SetShipsGeneric<T extends  Object> implements  Iterable<T>{
     public Iterator<T> iterator() {
         return _places.iterator();
     }
+    public void SortSet(Comparator<T> comparer)
+    {
+        if(comparer==null)
+        {
+            return;
+        }
+        _places.sort(comparer);
+    }
 }
 

src/ShipCompareByColor.java

@@ -0,0 +1,60 @@
+import java.util.Comparator;
+
+public class ShipCompareByColor implements Comparator<IDrawingObject> {
+    @Override
+    public int compare(IDrawingObject x,IDrawingObject y)
+    {
+        if (x == null && y == null)
+        {
+            return 0;
+        }
+        if (x == null && y != null)
+        {
+            return 1;
+        }
+        if (x != null && y == null)
+        {
+            return -1;
+        }
+        DrawingObjectShip xShip = (DrawingObjectShip) x;
+        DrawingObjectShip yShip =(DrawingObjectShip) y;
+        if (xShip == null && yShip == null)
+        {
+            return 0;
+        }
+        if (xShip == null && yShip != null)
+        {
+            return 1;
+        }
+        if (xShip != null && yShip == null)
+        {
+            return -1;
+        }
+        Integer xShipColor=xShip.GetDrawingObjectShip().Ship.GetBodyColor().getRGB();
+        Integer yShipColor=yShip.GetDrawingObjectShip().Ship.GetBodyColor().getRGB();
+        if (!xShipColor.equals(yShipColor))
+        {
+            return xShipColor.compareTo(yShipColor);
+        }
+        if (xShip.GetDrawingObjectShip().Ship instanceof EntityLiner xLiner && yShip.GetDrawingObjectShip().Ship instanceof EntityLiner yLiner)
+        {
+            Integer xShipDopColor = xLiner.DopColor.getRGB();
+            Integer yShipDopColor = yLiner.DopColor.getRGB();
+            var dopColorCompare = xShipDopColor.compareTo(yShipDopColor);
+            if (dopColorCompare != 0)
+            {
+                return dopColorCompare;
+            }
+        }
+        Integer temp1=(Integer)xShip.GetDrawingObjectShip().Ship.GetSpeed();
+        Integer temp2=(Integer)yShip.GetDrawingObjectShip().Ship.GetSpeed();
+        var speedCompare = (temp1.compareTo(temp2));
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        Float tempfl1=xShip.GetDrawingObjectShip().Ship.GetWeight();
+        Float templfl2=yShip.GetDrawingObjectShip().Ship.GetWeight();
+        return tempfl1.compareTo(templfl2);
+    }
+}

src/ShipCompareByType.java

@@ -0,0 +1,53 @@
+import java.util.Comparator;
+import java.util.concurrent.DelayQueue;
+
+public class ShipCompareByType implements Comparator<IDrawingObject> {
+    @Override
+    public int compare(IDrawingObject x,IDrawingObject y)
+    {
+        if(x==null && y==null)
+        {
+            return 0;
+        }
+        if(x == null)
+        {
+            return 1;
+        }
+        if(y == null)
+        {
+            return -1;
+        }
+        DrawingObjectShip xShip = (DrawingObjectShip) x;
+        DrawingObjectShip yShip =(DrawingObjectShip) y;
+        if(!xShip.GetDrawingObjectShip().getClass().getSimpleName().equals(yShip.GetDrawingObjectShip().getClass().getSimpleName()))
+        {
+            if (xShip.GetDrawingObjectShip().getClass().getName().equals("DrawingShip"))
+            {
+                return -1;
+            }
+            return 1;
+        }
+        var deckcompareX=xShip.GetDrawingObjectShip().GetDeck().getClass().getName();
+        var deckcompareY=xShip.GetDrawingObjectShip().GetDeck().getClass().getName();
+        if(!deckcompareX.equals(deckcompareY))
+        {
+            return deckcompareX.compareTo(deckcompareY);
+        }
+        Integer deckenumX=xShip.GetDrawingObjectShip().GetDeck().GetDeckEnum();
+        Integer deckenumY=yShip.GetDrawingObjectShip().GetDeck().GetDeckEnum();
+        if(!deckenumX.equals(deckenumY))
+        {
+            return deckenumX.compareTo(deckenumY);
+        }
+        Integer temp1=(Integer)xShip.GetDrawingObjectShip().Ship.GetSpeed();
+        Integer temp2=(Integer)yShip.GetDrawingObjectShip().Ship.GetSpeed();
+        var speedCompare = (temp1.compareTo(temp2));
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        Float tempfl1=xShip.GetDrawingObjectShip().Ship.GetWeight();
+        Float templfl2=yShip.GetDrawingObjectShip().Ship.GetWeight();
+        return tempfl1.compareTo(templfl2);
+    }
+}

src/ShipNotFoundException.java

@@ -0,0 +1,14 @@
+public class ShipNotFoundException extends Exception{
+    public ShipNotFoundException(int i){
+        super(String.format("%s%d","Не найден объект по позиции",i));
+    }
+    public ShipNotFoundException(){
+        super();
+    }
+    public ShipNotFoundException(String message){
+        super(message);
+    }
+    public ShipNotFoundException(String message,Exception ex){
+        super(message,ex);
+    }
+}

src/StorageOverflowException.java

@@ -0,0 +1,14 @@
+public class StorageOverflowException extends Exception {
+    public StorageOverflowException(int count){
+        super("В наборе превышено допустимое количество: "+count);
+    }
+    public StorageOverflowException(){
+        super();
+    }
+    public StorageOverflowException(String message){
+        super(message);
+    }
+    public StorageOverflowException(String message,Exception ex){
+        super(message,ex);
+    }
+}

src/log4j.properties

@@ -0,0 +1,27 @@
+log4j.logger.FormMapWithSetShipsGeneric=INFO, fileAppender,adminAppender
+
+
+log4j.additivity.file=false
+log4j.additivity.admin=false
+
+log4j.appender.fileAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.fileAppender.File=loginfo.log
+log4j.appender.fileAppender.MaxFileSize=1MB
+log4j.appender.fileAppender.MaxBackupIndex=1
+log4j.appender.fileAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.fileAppender.filter.F1=org.apache.log4j.varia.LevelRangeFilter
+log4j.appender.fileAppender.filter.F1.LevelMin=INFO
+log4j.appender.fileAppender.filter.F1.LevelMax=INFO
+log4j.appender.fileAppender.filter.F1.AcceptOnMatch=true
+log4j.appender.fileAppender.layout.ConversionPattern=%-5p %c{1}:%L - %m %d{dd-MM-yyyy}%n
+
+log4j.appender.adminAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.adminAppender.File=logwarn.log
+log4j.appender.adminAppender.MaxFileSize=1MB
+log4j.appender.adminAppender.MaxBackupIndex=1
+log4j.appender.adminAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.adminAppender.filter.F1=org.apache.log4j.varia.LevelRangeFilter
+log4j.appender.adminAppender.filter.F1.LevelMin=WARN
+log4j.appender.adminAppender.filter.F1.LevelMax=ERROR
+log4j.appender.adminAppender.filter.F1.AcceptOnMatch=true
+log4j.appender.adminAppender.layout.ConversionPattern=%-5p %c{1}:%L - %m %d{dd-MM-yyyy}%n