lab6 full

AircraftFactory.java

@@ -0,0 +1,71 @@
+import java.awt.*;
+import java.util.Objects;
+
+public class AircraftFactory {
+    private static char _separatorForObject = ':';
+    private static Color convertStrToColor(String str) {
+        String color[] = str.split(",");
+        int r = Integer.parseInt(color[0]);
+        int g = Integer.parseInt(color[1]);
+        int b = Integer.parseInt(color[2]);
+
+        return new Color(r, g, b);
+    }
+
+    public static DrawingAircraft createAircraftFromData(String data) {
+        String strsArr[] = data.split(_separatorForObject + "");
+
+        DrawingAircraft result;
+        IDrawingEngines engines;
+
+        switch(strsArr[3]) {
+            case "DrawingTruncatedEngines":
+                engines = new DrawingTruncatedEngines(Integer.parseInt(strsArr[4]), convertStrToColor(strsArr[5]));
+                break;
+            case "DrawingWavyEngines":
+                engines = new DrawingWavyEngines(Integer.parseInt(strsArr[4]), convertStrToColor(strsArr[5]));
+                break;
+            default:
+                engines = new DrawingEngines(Integer.parseInt(strsArr[4]), convertStrToColor(strsArr[5]));
+        }
+
+        if(strsArr.length == 9) {
+            result = new DrawingModernAircraft(
+                    Integer.parseInt(strsArr[0]), Float.parseFloat(strsArr[1]), convertStrToColor(strsArr[2]),
+                    convertStrToColor(strsArr[6]), Objects.equals(strsArr[8], "true"), Objects.equals(strsArr[7], "true")
+            );
+        } else {
+            result = new DrawingAircraft(
+                    Integer.parseInt(strsArr[0]), Float.parseFloat(strsArr[1]), convertStrToColor(strsArr[2])
+            );
+        }
+        result.setEngines(engines);
+
+        return result;
+    }
+
+    public static String getDataForSave(DrawingAircraft drawingAircraft) {
+        EntityAircraft aircraft = drawingAircraft.AirFighter;
+
+        String res = aircraft.Speed + "" + _separatorForObject;
+        res += aircraft.Weight + "" + _separatorForObject;
+        res += aircraft.BodyColor.getRed() + "," + aircraft.BodyColor.getGreen() + "," + aircraft.BodyColor.getBlue();
+        res += _separatorForObject;
+
+        IDrawingEngines engines = drawingAircraft.getEngines();
+
+        res += engines.getClass().getName() + _separatorForObject;
+        res += engines.getCount() + "" + _separatorForObject;
+        res += engines.getColor().getRed() + "," + engines.getColor().getGreen() + "," + engines.getColor().getBlue();
+
+        if(aircraft instanceof EntityModernAircraft a) {
+            res += _separatorForObject;
+            res += a.DopColor.getRed() + "," + a.DopColor.getGreen() + "," + a.DopColor.getBlue();
+            res += _separatorForObject;
+            res += a.Rockets + "" + _separatorForObject;
+            res += a.DopWings + "";
+        }
+
+        return res;
+    }
+}

DrawingAircraft.java

@@ -51,6 +51,21 @@ class DrawingAircraft
         _airFighterHeight = airFighterHeight;
     }
 
+    public void setEngines(IDrawingEngines engines) {
+        drawingEngines = engines;
+    }
+
+    public IDrawingEngines getEngines() {
+        return drawingEngines;
+    }
+
+    public void setColor(Color color) {
+        AirFighter.BodyColor = color;
+    }
+
+    public Color getColor() {
+        return AirFighter.BodyColor;
+    }
 
     public void SetPosition(int x, int y, int width, int height)
     {

DrawingEngines.java

@@ -16,6 +16,23 @@ public class DrawingEngines implements IDrawingEngines {
         else enginesCount = EnginesCount.Four;
     }
 
+    @Override
+    public void setColor(Color color) {
+        this.color = color;
+    }
+
+    @Override
+    public int getCount() {
+        if(enginesCount == EnginesCount.Two) return 2;
+        if(enginesCount == EnginesCount.Four) return 4;
+        return 6;
+    }
+
+    @Override
+    public Color getColor() {
+        return color;
+    }
+
     public void draw(Graphics2D g, int startPosX, int startPosY) {
         g.setPaint(color);
         g.fillOval(startPosX + 80, startPosY + 10, 30, 15);

DrawingModernAircraft.java

@@ -12,6 +12,11 @@ public class DrawingModernAircraft extends DrawingAircraft
         super(speed, weight, bodyColor, 195, 166);
         AirFighter = new EntityModernAircraft(speed, weight, bodyColor, dopColor, dopWings, rockets);
     }
+
+    public void setDopColor(Color color) {
+        ((EntityModernAircraft)AirFighter).DopColor = color;
+    }
+
     @Override
     public void DrawTransport(Graphics2D g)
     {

DrawingObjectAircraft.java

@@ -7,6 +7,10 @@ public class DrawingObjectAircraft implements IDrawingObject
         _aircraft = aircraft;
     }
 
+    public DrawingAircraft getAircraft() {
+        return _aircraft;
+    }
+
     public void MoveObject(Direction direction) {
         if(_aircraft == null) return;
         _aircraft.MoveTransport(direction);
@@ -39,4 +43,13 @@ public class DrawingObjectAircraft implements IDrawingObject
         if(_aircraft == null) return new Point(0,0);
         return _aircraft.getRightBottom();
     }
+
+    @Override
+    public String GetInfo() {
+        return AircraftFactory.getDataForSave(_aircraft);
+    }
+
+    public static DrawingObjectAircraft Create(String data) {
+        return new DrawingObjectAircraft(AircraftFactory.createAircraftFromData(data));
+    }
 }

DrawingTruncatedEngines.java

@@ -16,6 +16,23 @@ public class DrawingTruncatedEngines implements IDrawingEngines {
         else enginesCount = EnginesCount.Four;
     }
 
+    @Override
+    public void setColor(Color color) {
+        this.color = color;
+    }
+
+    @Override
+    public int getCount() {
+        if(enginesCount == EnginesCount.Two) return 2;
+        if(enginesCount == EnginesCount.Four) return 4;
+        return 6;
+    }
+
+    @Override
+    public Color getColor() {
+        return color;
+    }
+
     public void draw(Graphics2D g, int startPosX, int startPosY) {
         g.setPaint(color);
         g.fillArc(startPosX + 90, startPosY + 10, 30, 15, 90, 180);

DrawingWavyEngines.java

@@ -16,6 +16,23 @@ public class DrawingWavyEngines implements IDrawingEngines {
         else enginesCount = EnginesCount.Four;
     }
 
+    @Override
+    public void setColor(Color color) {
+        this.color = color;
+    }
+
+    @Override
+    public int getCount() {
+        if(enginesCount == EnginesCount.Two) return 2;
+        if(enginesCount == EnginesCount.Four) return 4;
+        return 6;
+    }
+
+    @Override
+    public Color getColor() {
+        return color;
+    }
+
     private void drawEngine(Graphics2D g, int x, int y) {
         g.setColor(color);
         g.fillRect(x, y, 21, 10);

FormAircraft.java

@@ -25,6 +25,11 @@ public class FormAircraft extends JDialog implements Form {
         return selectedAircraft;
     }
 
+    public FormAircraft() {}
+
+    public FormAircraft(DrawingAircraft aircraft) {
+        _airFighter = aircraft;
+    }
 
     public void run() {
         add(mainPanel);

FormAircraftConfig.form

@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormAircraftConfig">
+  <grid id="27dc6" binding="mainPane" layout-manager="GridLayoutManager" row-count="1" 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="813" height="425"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="11ed" 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"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <grid id="6bdf" layout-manager="GridLayoutManager" row-count="2" 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"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <grid id="b99b4" layout-manager="GridLayoutManager" row-count="4" 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="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"/>
+                </constraints>
+                <properties/>
+                <border type="none" title="Параметры самолета"/>
+                <children>
+                  <grid id="bf610" binding="colorsPane" layout-manager="GridLayoutManager" row-count="2" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                    <margin top="0" left="0" bottom="0" right="0"/>
+                    <constraints>
+                      <grid row="1" 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="250" height="130"/>
+                        <preferred-size width="250" height="130"/>
+                        <maximum-size width="250" height="130"/>
+                      </grid>
+                    </constraints>
+                    <properties/>
+                    <border type="none" title="Цвета"/>
+                    <children>
+                      <grid id="b0657" binding="panelRed" 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"/>
+                        </constraints>
+                        <properties>
+                          <background color="-4389370"/>
+                        </properties>
+                        <border type="none"/>
+                        <children/>
+                      </grid>
+                      <grid id="454fe" binding="panelYellow" 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="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <background color="-7414"/>
+                        </properties>
+                        <border type="none"/>
+                        <children/>
+                      </grid>
+                      <grid id="acb3b" binding="panelGreen" 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="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <background color="-16408064"/>
+                        </properties>
+                        <border type="none"/>
+                        <children/>
+                      </grid>
+                      <grid id="e10ed" binding="panelBlue" 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="3" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <background color="-14474274"/>
+                        </properties>
+                        <border type="none"/>
+                        <children/>
+                      </grid>
+                      <grid id="6a752" binding="panelWhite" 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="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <background color="-1"/>
+                        </properties>
+                        <border type="none"/>
+                        <children/>
+                      </grid>
+                      <grid id="4650b" binding="panelGray" 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="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <background color="-5723992"/>
+                        </properties>
+                        <border type="none"/>
+                        <children/>
+                      </grid>
+                      <grid id="37a23" binding="panelBlack" 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="1" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <background color="-16777216"/>
+                        </properties>
+                        <border type="none"/>
+                        <children/>
+                      </grid>
+                      <grid id="6424" binding="panelPurple" 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="1" column="3" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <background color="-5166919"/>
+                        </properties>
+                        <border type="none"/>
+                        <children/>
+                      </grid>
+                    </children>
+                  </grid>
+                  <hspacer id="acd9a">
+                    <constraints>
+                      <grid row="1" column="2" 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="f9e1b" layout-manager="GridLayoutManager" row-count="3" 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>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                        <minimum-size width="130" height="-1"/>
+                      </grid>
+                    </constraints>
+                    <properties/>
+                    <border type="none"/>
+                    <children>
+                      <component id="290f9" class="javax.swing.JSpinner" binding="spinnerSpeed">
+                        <constraints>
+                          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties/>
+                      </component>
+                      <component id="76346" class="javax.swing.JSpinner" binding="spinnerWeight">
+                        <constraints>
+                          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties/>
+                      </component>
+                      <component id="f3384" class="javax.swing.JLabel">
+                        <constraints>
+                          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <text value="Скорость: "/>
+                        </properties>
+                      </component>
+                      <component id="28dee" class="javax.swing.JLabel">
+                        <constraints>
+                          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <text value="Вес:"/>
+                        </properties>
+                      </component>
+                    </children>
+                  </grid>
+                  <vspacer id="15d55">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                  </vspacer>
+                  <grid id="7ab15" layout-manager="GridLayoutManager" row-count="1" 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>
+                      <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties/>
+                    <border type="none"/>
+                    <children>
+                      <grid id="add02" 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"/>
+                        </constraints>
+                        <properties/>
+                        <border type="line"/>
+                        <children>
+                          <component id="30e35" class="javax.swing.JLabel" binding="labelBase">
+                            <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"/>
+                            </constraints>
+                            <properties>
+                              <font size="16"/>
+                              <horizontalAlignment value="0"/>
+                              <horizontalTextPosition value="0"/>
+                              <text value="Простой"/>
+                            </properties>
+                          </component>
+                        </children>
+                      </grid>
+                      <grid id="28265" 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="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties/>
+                        <border type="line"/>
+                        <children>
+                          <component id="72db3" class="javax.swing.JLabel" binding="labelAdvanced">
+                            <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"/>
+                            </constraints>
+                            <properties>
+                              <font size="16"/>
+                              <horizontalAlignment value="0"/>
+                              <horizontalTextPosition value="0"/>
+                              <text value="Продвинутый"/>
+                            </properties>
+                          </component>
+                        </children>
+                      </grid>
+                    </children>
+                  </grid>
+                  <grid id="12688" layout-manager="GridLayoutManager" row-count="2" 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="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties/>
+                    <border type="none"/>
+                    <children>
+                      <component id="e5986" class="javax.swing.JCheckBox" binding="checkboxDopWings">
+                        <constraints>
+                          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <text value="Дополнительные крылья"/>
+                        </properties>
+                      </component>
+                      <component id="cfe9b" class="javax.swing.JCheckBox" binding="checkboxRockets">
+                        <constraints>
+                          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <text value="ракеты"/>
+                        </properties>
+                      </component>
+                    </children>
+                  </grid>
+                  <vspacer id="18b96">
+                    <constraints>
+                      <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                  </vspacer>
+                </children>
+              </grid>
+              <grid id="6e579" layout-manager="GridLayoutManager" row-count="2" 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="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+                <border type="none" title="Параметры двигателей"/>
+                <children>
+                  <grid id="b79df" layout-manager="GridLayoutManager" row-count="1" 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>
+                      <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"/>
+                    </constraints>
+                    <properties/>
+                    <border type="none"/>
+                    <children>
+                      <component id="8c10b" class="javax.swing.JLabel">
+                        <constraints>
+                          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <text value="Количество двигателей:"/>
+                        </properties>
+                      </component>
+                      <component id="609e1" class="javax.swing.JSpinner" binding="spinnerEnginesCount">
+                        <constraints>
+                          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                            <maximum-size width="100" height="-1"/>
+                          </grid>
+                        </constraints>
+                        <properties/>
+                      </component>
+                    </children>
+                  </grid>
+                  <grid id="83f65" layout-manager="GridLayoutManager" row-count="1" 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="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties/>
+                    <border type="none"/>
+                    <children>
+                      <grid id="28e30" 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="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties/>
+                        <border type="line"/>
+                        <children>
+                          <component id="f884f" class="javax.swing.JLabel" binding="labelTruncatedEngine">
+                            <constraints>
+                              <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>
+                              <font size="16"/>
+                              <horizontalAlignment value="0"/>
+                              <text value="Усеченный"/>
+                            </properties>
+                          </component>
+                        </children>
+                      </grid>
+                      <grid id="96986" 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="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties/>
+                        <border type="line"/>
+                        <children>
+                          <component id="492da" class="javax.swing.JLabel" binding="labelWavyEngine">
+                            <constraints>
+                              <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>
+                              <font size="16"/>
+                              <horizontalAlignment value="0"/>
+                              <text value="Волнистый"/>
+                            </properties>
+                          </component>
+                        </children>
+                      </grid>
+                      <grid id="5bd24" 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"/>
+                        </constraints>
+                        <properties/>
+                        <border type="line"/>
+                        <children>
+                          <component id="43319" class="javax.swing.JLabel" binding="labelBaseEngine">
+                            <constraints>
+                              <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>
+                              <font size="16"/>
+                              <horizontalAlignment value="0"/>
+                              <text value="Простой"/>
+                            </properties>
+                          </component>
+                        </children>
+                      </grid>
+                    </children>
+                  </grid>
+                </children>
+              </grid>
+            </children>
+          </grid>
+        </children>
+      </grid>
+      <grid id="1e193" layout-manager="GridLayoutManager" row-count="3" 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>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <minimum-size width="300" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+        <border type="none" title="Превью"/>
+        <children>
+          <grid id="c4ea7" layout-manager="GridLayoutManager" row-count="1" 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>
+              <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <grid id="b8c0b" binding="panelBaseColor" 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">
+                    <minimum-size width="-1" height="50"/>
+                    <maximum-size width="-1" height="50"/>
+                  </grid>
+                </constraints>
+                <properties/>
+                <border type="line"/>
+                <children>
+                  <component id="b477" class="javax.swing.JLabel">
+                    <constraints>
+                      <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>
+                      <font size="16"/>
+                      <horizontalAlignment value="0"/>
+                      <text value="Цвет"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
+              <grid id="e2d48" binding="panelDopColor" 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="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                    <minimum-size width="-1" height="50"/>
+                    <maximum-size width="-1" height="50"/>
+                  </grid>
+                </constraints>
+                <properties/>
+                <border type="line"/>
+                <children>
+                  <component id="13ad3" class="javax.swing.JLabel">
+                    <constraints>
+                      <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>
+                      <font size="16"/>
+                      <horizontalAlignment value="0"/>
+                      <text value="Доп. цвет"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
+            </children>
+          </grid>
+          <grid id="74d53" binding="panelDraw" layout-manager="CardLayout" hgap="0" vgap="0">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                <minimum-size width="-1" height="300"/>
+              </grid>
+            </constraints>
+            <properties/>
+            <border type="line"/>
+            <children/>
+          </grid>
+          <component id="14b28" class="javax.swing.JButton" binding="buttonAdd">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Добавить"/>
+            </properties>
+          </component>
+          <component id="7f448" class="javax.swing.JButton" binding="buttonCancel">
+            <constraints>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Отмена"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+    </children>
+  </grid>
+</form>

FormAircraftConfig.java

@@ -0,0 +1,171 @@
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.function.Consumer;
+
+public class FormAircraftConfig implements Form {
+    private JPanel mainPane;
+    private JSpinner spinnerSpeed;
+    private JSpinner spinnerWeight;
+    private JPanel colorsPane;
+    private JCheckBox checkboxDopWings;
+    private JCheckBox checkboxRockets;
+    private JSpinner spinnerEnginesCount;
+    private JButton buttonAdd;
+    private JButton buttonCancel;
+    private JPanel panelRed;
+    private JPanel panelYellow;
+    private JPanel panelGreen;
+    private JPanel panelBlue;
+    private JPanel panelWhite;
+    private JPanel panelGray;
+    private JPanel panelBlack;
+    private JPanel panelPurple;
+    private JPanel panelBaseColor;
+    private JPanel panelDopColor;
+    private JPanel panelDraw;
+    private JLabel labelBase;
+    private JLabel labelAdvanced;
+    private JLabel labelTruncatedEngine;
+    private JLabel labelWavyEngine;
+    private JLabel labelBaseEngine;
+
+    private JFrame jframe = getFrame();
+    private DrawingAircraft aircraft;
+    private boolean isMousePressed = false;
+    private Canvas canv = new Canvas(this);
+    private ArrayList<Consumer<DrawingAircraft>> listeners = new ArrayList<>();
+
+    private JFrame getFrame() {
+        JFrame frame = new JFrame();
+        frame.setVisible(true);
+        frame.setBounds(300, 100, 800, 500);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        return frame;
+    }
+
+    public void addListener(Consumer<DrawingAircraft> l) {
+        listeners.add(l);
+    }
+
+    public void run() {
+        jframe.add(mainPane);
+        panelDraw.add(canv);
+
+        buttonAdd.addActionListener(e -> {
+            jframe.dispose();
+            for(var l : listeners) l.accept(aircraft);
+        });
+
+        buttonCancel.addActionListener(e -> jframe.dispose());
+
+        MouseAdapter mouseHandler = new MouseAdapter() {
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                super.mouseEntered(e);
+                jframe.setCursor(new Cursor(Cursor.HAND_CURSOR));
+            }
+
+            @Override
+            public void mouseExited(MouseEvent e) {
+                super.mouseExited(e);
+                if(!isMousePressed) jframe.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+            }
+
+            @Override
+            public void mousePressed(MouseEvent e) {
+                super.mousePressed(e);
+                isMousePressed = true;
+                jframe.setCursor(new Cursor(Cursor.HAND_CURSOR));
+            }
+
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                super.mouseReleased(e);
+                isMousePressed = false;
+                jframe.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+                drop((JComponent) e.getSource());
+                canv.repaint();
+            }
+        };
+
+        spinnerSpeed.setModel(new SpinnerNumberModel(100, 70, 200, 1));
+        spinnerWeight.setModel(new SpinnerNumberModel(700, 600, 1500, 1));
+        spinnerEnginesCount.setModel(new SpinnerNumberModel(4, 2, 6, 2));
+
+        panelRed.addMouseListener(mouseHandler);
+        panelYellow.addMouseListener(mouseHandler);
+        panelGreen.addMouseListener(mouseHandler);
+        panelBlue.addMouseListener(mouseHandler);
+        panelWhite.addMouseListener(mouseHandler);
+        panelGray.addMouseListener(mouseHandler);
+        panelBlack.addMouseListener(mouseHandler);
+        panelPurple.addMouseListener(mouseHandler);
+
+        labelBase.addMouseListener(mouseHandler);
+        labelAdvanced.addMouseListener(mouseHandler);
+
+        labelTruncatedEngine.addMouseListener(mouseHandler);
+        labelWavyEngine.addMouseListener(mouseHandler);
+        labelBaseEngine.addMouseListener(mouseHandler);
+    }
+
+    private void drop(JComponent elem) {
+        if(elem instanceof JPanel panel) {
+            if(aircraft == null) return;
+            if(panelBaseColor.getMousePosition() != null) {
+                aircraft.setColor(panel.getBackground());
+                aircraft.getEngines().setColor(panel.getBackground());
+            }
+
+            if(panelDopColor.getMousePosition() != null && aircraft instanceof DrawingModernAircraft advanced) {
+                advanced.setDopColor(panel.getBackground());
+            }
+        }
+
+        Point test = panelDraw.getMousePosition();
+
+        if(elem instanceof JLabel label && test != null) {
+            int speed = (int)spinnerSpeed.getValue();
+            int weight = (int)spinnerWeight.getValue();
+            int enginesCount = (int)spinnerEnginesCount.getValue();
+
+            if(label == labelBase) {
+                aircraft = new DrawingAircraft(speed, weight, Color.WHITE);
+                aircraft.SetPosition(20, 40, canv.getWidth(), canv.getHeight());
+
+                aircraft.getEngines().setCount(enginesCount);
+                aircraft.getEngines().setColor(Color.WHITE);
+            }
+
+            if(label == labelAdvanced) {
+                aircraft = new DrawingModernAircraft(speed, weight, Color.WHITE, Color.BLACK,
+                        checkboxDopWings.isSelected(), checkboxRockets.isSelected());
+
+                aircraft.SetPosition(10, 10, canv.getWidth(), canv.getHeight());
+                aircraft.getEngines().setCount(enginesCount);
+                aircraft.getEngines().setColor(Color.WHITE);
+            }
+
+            if(aircraft == null) return;
+
+            if(label == labelBaseEngine) {
+                aircraft.setEngines(new DrawingEngines(enginesCount, aircraft.getColor()));
+            }
+            if(label == labelTruncatedEngine) {
+                aircraft.setEngines(new DrawingTruncatedEngines(enginesCount, aircraft.getColor()));
+            }
+            if(label == labelWavyEngine) {
+                aircraft.setEngines(new DrawingWavyEngines(enginesCount, aircraft.getColor()));
+            }
+        }
+    }
+
+    @Override
+    public void Draw(Graphics2D g) {
+        if(aircraft == null) return;
+        aircraft.DrawTransport(g);
+    }
+}

FormMapWithSetAircrafts.form

@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="MainPane" layout-manager="GridLayoutManager" row-count="1" 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="500" height="400"/>
+      <xy x="20" y="20" width="662" height="590"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -16,7 +16,7 @@
         <border type="none"/>
         <children/>
       </grid>
-      <grid id="e9a63" layout-manager="GridLayoutManager" row-count="8" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="e9a63" layout-manager="GridLayoutManager" row-count="14" 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="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
@@ -26,9 +26,9 @@
         <properties/>
         <border type="none"/>
         <children>
-          <component id="f23ee" class="javax.swing.JButton" binding="buttonAdd">
+          <component id="f23ee" class="javax.swing.JButton" binding="buttonAddAircraft">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" 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="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Добавить"/>
@@ -36,7 +36,7 @@
           </component>
           <component id="2e61e" class="javax.swing.JComboBox" binding="comboBoxSelectorMap">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <model>
@@ -45,9 +45,9 @@
               </model>
             </properties>
           </component>
-          <component id="5c428" class="javax.swing.JButton" binding="buttonRemove">
+          <component id="5c428" class="javax.swing.JButton" binding="buttonRemoveAircraft">
             <constraints>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Удалить"/>
@@ -55,7 +55,7 @@
           </component>
           <component id="e24b9" class="javax.swing.JButton" binding="buttonShowStorage">
             <constraints>
-              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Посмотреть Хранилище"/>
@@ -63,7 +63,7 @@
           </component>
           <component id="ac087" class="javax.swing.JButton" binding="buttonShowOnMap">
             <constraints>
-              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Посмотреть карту"/>
@@ -72,7 +72,7 @@
           <grid id="2821b" layout-manager="GridLayoutManager" row-count="2" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
-              <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+              <grid row="13" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
                 <minimum-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -145,17 +145,64 @@
           </grid>
           <vspacer id="b833e">
             <constraints>
-              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+              <grid row="12" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
             </constraints>
           </vspacer>
           <component id="181ac" class="javax.swing.JTextField" binding="textBoxPosition">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
             <properties/>
           </component>
+          <component id="55673" class="javax.swing.JTextField" binding="textBoxNewMapName">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="204a1" class="javax.swing.JButton" binding="buttonAddMap">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Добавить карту"/>
+            </properties>
+          </component>
+          <component id="113db" class="javax.swing.JList" binding="listBoxMaps">
+            <constraints>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                <minimum-size width="-1" height="100"/>
+                <preferred-size width="150" height="50"/>
+                <maximum-size width="-1" height="100"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="694cc" class="javax.swing.JButton" binding="buttonDeleteMap">
+            <constraints>
+              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Удалить карту"/>
+            </properties>
+          </component>
+          <vspacer id="e3260">
+            <constraints>
+              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+            </constraints>
+          </vspacer>
+          <component id="8891" class="javax.swing.JButton" binding="buttonShowDeleted">
+            <constraints>
+              <grid row="11" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Показать удаленные"/>
+            </properties>
+          </component>
         </children>
       </grid>
     </children>

FormMapWithSetAircrafts.java

@@ -1,16 +1,15 @@
 import javax.swing.*;
-import javax.swing.text.DefaultFormatterFactory;
-import javax.swing.text.MaskFormatter;
+import javax.swing.filechooser.FileNameExtensionFilter;
 import java.awt.*;
-import java.text.ParseException;
-import java.util.Objects;
+import java.util.*;
+import java.util.List;
 
 public class FormMapWithSetAircrafts implements Form {
     private JPanel MainPane;
-    private JButton buttonAdd;
+    private JButton buttonAddAircraft;
     private JComboBox comboBoxSelectorMap;
     private JTextField textBoxPosition;
-    private JButton buttonRemove;
+    private JButton buttonRemoveAircraft;
     private JButton buttonShowStorage;
     private JButton buttonShowOnMap;
     private JButton upButton;
@@ -18,10 +17,21 @@ public class FormMapWithSetAircrafts implements Form {
     private JButton rightButton;
     private JButton downButton;
     private JPanel drawPanel;
+    private JTextField textBoxNewMapName;
+    private JList listBoxMaps;
+    private JButton buttonAddMap;
+    private JButton buttonDeleteMap;
+    private JButton buttonShowDeleted;
 
+    private JMenuBar menu;
 
-    private MapWithSetAircraftsGeneric<DrawingObjectAircraft, AbstractMap> _mapCarsCollectionGeneric;
+    private MapsCollection _mapsCollection;
+    private HashMap<String, AbstractMap> _mapsDict = new HashMap<>(){{
+            put( "Простая карта", new SimpleMap() );
+            put( "Моя карта", new MyMap() );
+    }};
     private Canvas canv = new Canvas(this);
+    private Queue<IDrawingObject> deletedAircrafts = new ArrayDeque<>();
 
     JFrame jFrame = getFrame();
     Image img;
@@ -29,70 +39,182 @@ public class FormMapWithSetAircrafts implements Form {
     private JFrame getFrame() {
         JFrame frame = new JFrame();
         frame.setVisible(true);
-        frame.setBounds(300, 100, 800, 600);
+        frame.setBounds(300, 50, 1000, 750);
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         return frame;
     }
 
+    private void ReloadMaps()
+    {
+        int index = listBoxMaps.getSelectedIndex();
+        List<String> items = _mapsCollection.getKeys();
+        listBoxMaps.setListData(items.toArray());
+        if (items.size() > 0 && (index == -1 || index >= items.size()))
+        {
+            listBoxMaps.setSelectedIndex(0);
+        }
+        else if (items.size() > 0 && index > -1 && index < items.size())
+        {
+            listBoxMaps.setSelectedIndex(index);
+        }
+    }
 
     public void run() {
         jFrame.add(MainPane);
         drawPanel.add(canv);
 
+        jFrame.revalidate();
+
+        menu = new JMenuBar();
+        JMenu fileActions = new JMenu("Файл");
+
+        menu.add(fileActions);
+        jFrame.setJMenuBar(menu);
+
+        JMenuItem saveItem = new JMenuItem("Сохранить");
+        JMenuItem loadItem = new JMenuItem("Загрузить");
+        JMenuItem saveMapItem = new JMenuItem("Сохранить карту");
+        JMenuItem loadMapItem = new JMenuItem("Загрузить карту");
+
+        fileActions.add(saveItem);
+        fileActions.add(loadItem);
+        fileActions.add(saveMapItem);
+        fileActions.add(loadMapItem);
+
+        saveItem.addActionListener(e -> {
+            JFileChooser chooser = new JFileChooser();
+            chooser.setFileFilter(new FileNameExtensionFilter("TXT format", "txt"));
+            chooser.showSaveDialog(jFrame);
+
+            if(chooser.getSelectedFile() == null) return;
+
+            String path = chooser.getSelectedFile().getAbsolutePath();
+
+            if(_mapsCollection.SaveData(path)) {
+                JOptionPane.showMessageDialog(jFrame, "Сохранение прошло успешно");
+            } else JOptionPane.showMessageDialog(jFrame, "Не сохранилось");
+
+        });
+
+        loadItem.addActionListener(e -> {
+            JFileChooser chooser = new JFileChooser();
+            chooser.setFileFilter(new FileNameExtensionFilter("TXT format", "txt"));
+            chooser.showOpenDialog(jFrame);
+
+            if(chooser.getSelectedFile() == null) return;
+
+            String path = chooser.getSelectedFile().getAbsolutePath();
+            if(_mapsCollection.LoadData(path)) {
+                JOptionPane.showMessageDialog(jFrame, "Загрузка прошла успешно");
+                ReloadMaps();
+            } else JOptionPane.showMessageDialog(jFrame, "Не загрузилось");
+        });
+
+        saveMapItem.addActionListener(e -> {
+           if(_mapsCollection == null) return;
+           if(listBoxMaps.getSelectedValue() == null) return;
+
+            JFileChooser chooser = new JFileChooser();
+            chooser.setFileFilter(new FileNameExtensionFilter("TXT format", "txt"));
+            chooser.showSaveDialog(jFrame);
+
+            if(chooser.getSelectedFile() == null) return;
+
+            String path = chooser.getSelectedFile().getAbsolutePath();
+
+            if(_mapsCollection.SaveMap(path, listBoxMaps.getSelectedValue().toString())) {
+                JOptionPane.showMessageDialog(jFrame, "Сохранение прошло успешно");
+            } else JOptionPane.showMessageDialog(jFrame, "Не сохранилось");
+
+        });
+
+        loadMapItem.addActionListener(e -> {
+            JFileChooser chooser = new JFileChooser();
+            chooser.setFileFilter(new FileNameExtensionFilter("TXT format", "txt"));
+            chooser.showOpenDialog(jFrame);
+
+            if(chooser.getSelectedFile() == null) return;
+
+            String path = chooser.getSelectedFile().getAbsolutePath();
+            if(_mapsCollection.LoadMap(path)) {
+                JOptionPane.showMessageDialog(jFrame, "Загрузка прошла успешно");
+                ReloadMaps();
+            } else JOptionPane.showMessageDialog(jFrame, "Не загрузилось");
+        });
+
+        _mapsCollection = new MapsCollection(canv.getSize().width, canv.getSize().height);
+        comboBoxSelectorMap.removeAllItems();
+
+        _mapsDict.keySet().forEach(elem -> {
+            comboBoxSelectorMap.addItem(elem);
+        });
+
         comboBoxSelectorMap.setSelectedIndex(-1);
 
-        comboBoxSelectorMap.addActionListener(e -> {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.getSelectedItem().toString())
+        listBoxMaps.addListSelectionListener(e -> {
+            if(listBoxMaps.getSelectedValue() == null) return;
+            img = _mapsCollection.getMap(listBoxMaps.getSelectedValue().toString()).ShowSet();
+            canv.repaint();
+        });
+
+        buttonAddMap.addActionListener(e -> {
+            if (comboBoxSelectorMap.getSelectedIndex() == -1 || textBoxNewMapName.getText() == "")
             {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Моя карта":
-                    map = new MyMap();
-                    break;
+                JOptionPane.showMessageDialog(jFrame, "Не все данные заполнены");
+                return;
             }
-            if (map != null)
+            if (!_mapsDict.containsKey(comboBoxSelectorMap.getSelectedItem().toString()))
             {
-                Dimension canvSize = canv.getSize();
-                _mapCarsCollectionGeneric = new MapWithSetAircraftsGeneric<DrawingObjectAircraft, AbstractMap>(
-                        canvSize.width, canvSize.height, map);
+                JOptionPane.showMessageDialog(jFrame, "Нет такой карты");
+                return;
             }
-            else
+            _mapsCollection.AddMap(textBoxNewMapName.getText(),
+                    _mapsDict.get(comboBoxSelectorMap.getSelectedItem().toString()));
+            ReloadMaps();
+        });
+
+        buttonDeleteMap.addActionListener(e -> {
+            if (listBoxMaps.getSelectedIndex() == -1)
             {
-                _mapCarsCollectionGeneric = null;
+                return;
+            }
+
+            String mapName = listBoxMaps.getSelectedValue().toString();
+            if (JOptionPane.showConfirmDialog(jFrame, "Удалить карту " + mapName,
+                    "Удаление", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)
+            {
+                _mapsCollection.DelMap(mapName);
+                ReloadMaps();
             }
         });
 
-        buttonAdd.addActionListener(e -> {
-            if (_mapCarsCollectionGeneric == null) return;
-
-            FormAircraft dialog = new FormAircraft();
-            dialog.run();
-            dialog.setSize(800, 500);
-            dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
-            dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-
-            dialog.setVisible(true);
-
-            if (dialog.getSelectedAircraft() == null) return;
-
-            DrawingObjectAircraft aircraft = new DrawingObjectAircraft(dialog.getSelectedAircraft());
-            if (_mapCarsCollectionGeneric.addAircraft(aircraft) != -1)
+        buttonAddAircraft.addActionListener(e -> {
+            if (listBoxMaps.getSelectedIndex() == -1)
             {
-                JOptionPane.showMessageDialog(jFrame, "Объект добавлен");
-                img = _mapCarsCollectionGeneric.ShowSet();
-                canv.repaint();
-            }
-            else
-            {
-                JOptionPane.showMessageDialog(jFrame, "Не удалось добавить объект");
+                return;
             }
+
+            FormAircraftConfig formConfig = new FormAircraftConfig();
+            formConfig.run();
+
+            formConfig.addListener(drawingAircraft -> {
+                if(drawingAircraft == null) return;
+
+                DrawingObjectAircraft aircraft = new DrawingObjectAircraft(drawingAircraft);
+                if (_mapsCollection.getMap(listBoxMaps.getSelectedValue().toString()).addAircraft(aircraft) != -1)
+                {
+                    JOptionPane.showMessageDialog(jFrame, "Объект добавлен");
+                    img = _mapsCollection.getMap(listBoxMaps.getSelectedValue().toString()).ShowSet();
+                    canv.repaint();
+                }
+                else
+                {
+                    JOptionPane.showMessageDialog(jFrame, "Не удалось добавить объект");
+                }
+            });
         });
 
-        buttonRemove.addActionListener(e -> {
-            if(_mapCarsCollectionGeneric == null) return;
-
+        buttonRemoveAircraft.addActionListener(e -> {
             String text = textBoxPosition.getText();
             if(text.isEmpty()) return;
 
@@ -110,9 +232,13 @@ public class FormMapWithSetAircrafts implements Form {
             }
             pos = Integer.parseInt(text);
 
-            if(_mapCarsCollectionGeneric.removeAircraft(pos) != null) {
+            String mapName = listBoxMaps.getSelectedValue().toString();
+            IDrawingObject deleted = _mapsCollection.getMap(mapName).removeAircraft(pos);
+
+            if(deleted != null) {
                 JOptionPane.showMessageDialog(jFrame, "Объект удален");
-                img = _mapCarsCollectionGeneric.ShowSet();
+                img = _mapsCollection.getMap(mapName).ShowSet();
+                deletedAircrafts.add(deleted);
                 canv.repaint();
             } else {
                 JOptionPane.showMessageDialog(jFrame, "Не удалось удалить объект");
@@ -120,47 +246,63 @@ public class FormMapWithSetAircrafts implements Form {
         });
 
         buttonShowStorage.addActionListener(e -> {
-            if (_mapCarsCollectionGeneric == null)
-            {
-                return;
-            }
+            if(listBoxMaps.getSelectedValue() == null) return;
 
-            img = _mapCarsCollectionGeneric.ShowSet();
+            img = _mapsCollection.getMap(listBoxMaps.getSelectedValue().toString()).ShowSet();
             canv.repaint();
         });
 
         buttonShowOnMap.addActionListener(e -> {
-            if (_mapCarsCollectionGeneric == null)
+            if(listBoxMaps.getSelectedValue() == null) return;
+
+            img = _mapsCollection.getMap(listBoxMaps.getSelectedValue().toString()).ShowOnMap();
+            canv.repaint();
+        });
+
+        buttonShowDeleted.addActionListener(e -> {
+            if (listBoxMaps.getSelectedIndex() == -1)
             {
                 return;
             }
 
-            img = _mapCarsCollectionGeneric.ShowOnMap();
-            canv.repaint();
+            if(deletedAircrafts.size() == 0) {
+                JOptionPane.showMessageDialog(jFrame, "Очередь пуста");
+                return;
+            }
+
+            DrawingObjectAircraft deleted = (DrawingObjectAircraft) deletedAircrafts.peek();
+
+            FormAircraft dialog = new FormAircraft(deleted.getAircraft());
+            deletedAircrafts.remove();
+            dialog.run();
+            dialog.setSize(800, 500);
+            dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
+            dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+
+            dialog.setVisible(true);
         });
 
         leftButton.addActionListener(e -> {
-            if(_mapCarsCollectionGeneric == null) return;
-            img = _mapCarsCollectionGeneric.MoveObject(Direction.Left);
+            if(listBoxMaps.getSelectedValue() == null) return;
+            img = _mapsCollection.getMap(listBoxMaps.getSelectedValue().toString()).MoveObject(Direction.Left);
                     canv.repaint();
         });
 
         rightButton.addActionListener(e -> {
-            if(_mapCarsCollectionGeneric == null) return;
-            img = _mapCarsCollectionGeneric.MoveObject(Direction.Right);
+            if(listBoxMaps.getSelectedValue() == null) return;
+            img = _mapsCollection.getMap(listBoxMaps.getSelectedValue().toString()).MoveObject(Direction.Right);
             canv.repaint();
         });
 
         upButton.addActionListener(e -> {
-            if(_mapCarsCollectionGeneric == null) return;
-            img = _mapCarsCollectionGeneric.MoveObject(Direction.Up);
+            if(listBoxMaps.getSelectedValue() == null) return;
+            img = _mapsCollection.getMap(listBoxMaps.getSelectedValue().toString()).MoveObject(Direction.Up);
             canv.repaint();
         });
 
         downButton.addActionListener(e -> {
-
-            if(_mapCarsCollectionGeneric == null) return;
-            img = _mapCarsCollectionGeneric.MoveObject(Direction.Down);
+            if(listBoxMaps.getSelectedValue() == null) return;
+            img = _mapsCollection.getMap(listBoxMaps.getSelectedValue().toString()).MoveObject(Direction.Down);
             canv.repaint();
         });
 

IDrawingEngines.java

@@ -2,5 +2,8 @@ import java.awt.*;
 
 public interface IDrawingEngines {
     void setCount(int count);
+    void setColor(Color color);
+    int getCount();
+    Color getColor();
     void draw(Graphics2D g, int x, int y);
 }

IDrawingObject.java

@@ -8,4 +8,5 @@ public interface IDrawingObject
     void DrawningObject(Graphics2D g);
     Point GetLeftTop();
     Point GetRightBottom();
+    String GetInfo();
 }

Main.java

@@ -1,5 +1,5 @@
 public class Main {
     public static void main(String[] args) {
-        new formAircraftGenerator().run();
+        new FormMapWithSetAircrafts().run();
     }
 }

MapWithSetAircraftsGeneric.java

@@ -1,5 +1,6 @@
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.util.ListIterator;
 
 public class MapWithSetAircraftsGeneric<T extends IDrawingObject, U extends AbstractMap>
 {
@@ -7,27 +8,53 @@ public class MapWithSetAircraftsGeneric<T extends IDrawingObject, U extends Abst
     private int _pictureHeight;
     private int _placeSizeWidth = 210;
     private int _placeSizeHeight = 170;
-    private SetAircraftsGeneric<T> _setCars;
+    private SetAircraftsGeneric<T> _setAircrafts;
     private U _map;
 
     public MapWithSetAircraftsGeneric(int picWidth, int picHeight, U map)
     {
         int width = picWidth / _placeSizeWidth;
         int height = picHeight / _placeSizeHeight;
-        _setCars = new SetAircraftsGeneric<T>(width * height);
+        _setAircrafts = new SetAircraftsGeneric<T>(width * height);
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _map = map;
     }
 
+    public U getMap() {
+        return _map;
+    }
+
+    public String GetData(char separatorType, char separatorData)
+    {
+        String data = _map.getClass().getName() + "" + separatorType;
+        ListIterator<T> iter =  _setAircrafts.GetElems();
+        while (iter.hasNext())
+        {
+            data += iter.next().GetInfo() + separatorData;
+        }
+        return data;
+    }
+
+    public void ClearMap() {
+        _setAircrafts.Clear();
+    }
+
+    public void LoadData(String[] records) {
+        for (String rec : records)
+        {
+            _setAircrafts.Insert((T)DrawingObjectAircraft.Create(rec));
+        }
+    }
+
     public int addAircraft(T aircraft)
     {
-        return _setCars.Insert(aircraft);
+        return _setAircrafts.Insert(aircraft);
     }
 
     public T removeAircraft(int position)
     {
-        return _setCars.Remove(position);
+        return _setAircrafts.Remove(position);
     }
 
     public Image ShowSet()
@@ -47,9 +74,9 @@ public class MapWithSetAircraftsGeneric<T extends IDrawingObject, U extends Abst
         Graphics2D g = (Graphics2D) img.getGraphics();
 
         Shaking();
-        for (int i = 0; i < _setCars.getCount(); i++)
+        for (int i = 0; i < _setAircrafts.getCount(); i++)
         {
-            var car = _setCars.Get(i);
+            var car = _setAircrafts.Get(i);
             if (car != null)
             {
                 _map.CreateMap(_pictureWidth, _pictureHeight, car);
@@ -74,20 +101,24 @@ public class MapWithSetAircraftsGeneric<T extends IDrawingObject, U extends Abst
         return img;
     }
 
+    public ListIterator<T> getAircraftsIter() {
+        return _setAircrafts.GetElems();
+    }
+
     private void Shaking()
     {
-        int j = _setCars.getCount() - 1;
-        for (int i = 0; i < _setCars.getCount(); i++)
+        int j = _setAircrafts.getCount() - 1;
+        for (int i = 0; i < _setAircrafts.getCount(); i++)
         {
-            if (_setCars.Get(i) == null)
+            if (_setAircrafts.Get(i) == null)
             {
                 for (; j > i; j--)
                 {
-                    var car = _setCars.Get(j);
+                    var car = _setAircrafts.Get(j);
                     if (car != null)
                     {
-                        _setCars.Insert(car, i);
-                        _setCars.Remove(j);
+                        _setAircrafts.Insert(car, i);
+                        _setAircrafts.Remove(j);
                         break;
                     }
                 }
@@ -137,12 +168,12 @@ public class MapWithSetAircraftsGeneric<T extends IDrawingObject, U extends Abst
     {
         int width = _pictureWidth / _placeSizeWidth;
 
-        for (int i = 0; i < _setCars.getCount(); i++)
+        for (int i = 0; i < _setAircrafts.getCount(); i++)
         {
             int x = i % width;
             int y = i / width;
 
-            T current =_setCars.Get(i);
+            T current =_setAircrafts.Get(i);
 
             if(current == null) continue;
 

MapsCollection.java

@@ -0,0 +1,177 @@
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.ListIterator;
+
+public class MapsCollection
+{
+    public LinkedHashMap<String, MapWithSetAircraftsGeneric<DrawingObjectAircraft, AbstractMap>> _mapStorages;
+    private int _pictureWidth;
+    private int _pictureHeight;
+
+    private char separatorDict = '|';
+    private char separatorData = ';';
+
+    public List<String> getKeys() { return _mapStorages.keySet().stream().toList(); }
+
+    public MapsCollection(int pictureWidth, int pictureHeight)
+    {
+        _mapStorages = new LinkedHashMap<>();
+        _pictureWidth = pictureWidth;
+        _pictureHeight = pictureHeight;
+    }
+
+    public boolean SaveData(String filename)
+    {
+        File file = new File(filename);
+        if (file.exists()) file.delete();
+
+        try {
+            file.createNewFile();
+
+            FileWriter writer = new FileWriter(file);
+            writer.append("MapsCollection\n");
+
+            for(String key : _mapStorages.keySet()) {
+                String record = key + separatorDict + _mapStorages.get(key).GetData(separatorDict, separatorData) + "\n";
+                writer.append(record);
+            }
+
+            writer.flush();
+            writer.close();
+        } catch(Exception err) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public boolean LoadData(String filename)
+    {
+        File file = new File(filename);
+        if (!file.exists()) return false;
+
+        try {
+            BufferedReader reader = new BufferedReader(new FileReader(file));
+            String current = reader.readLine();
+
+            if (!current.equals("MapsCollection")) return false;
+            _mapStorages.clear();
+
+            while ((current = reader.readLine()) != null)
+            {
+                String elem[] = current.split("\\" + separatorDict);
+                AbstractMap map = null;
+                switch (elem[1])
+                {
+                    case "SimpleMap":
+                        map = new SimpleMap();
+                        break;
+                    case "MyMap":
+                        map = new MyMap();
+                        break;
+                }
+                _mapStorages.put(elem[0], new MapWithSetAircraftsGeneric<DrawingObjectAircraft, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                _mapStorages.get(elem[0]).LoadData(elem[2].split(separatorData + ""));
+            }
+
+            reader.close();
+        } catch(Exception err) {
+            return false;
+        }
+
+        return true;
+    }
+
+
+    public boolean SaveMap(String filename, String key) {
+        File file = new File(filename);
+        if(file.exists()) file.delete();
+
+        MapWithSetAircraftsGeneric<DrawingObjectAircraft, AbstractMap> item = _mapStorages.getOrDefault(key, null);
+        if(item == null) return false;
+
+        try {
+            file.createNewFile();
+            FileWriter writer = new FileWriter(file);
+
+            writer.append("Map\n");
+            writer.append(key + "\n");
+            writer.append(item.getMap().getClass().getName() + "\n");
+            ListIterator<DrawingObjectAircraft> iter = item.getAircraftsIter();
+            while(iter.hasNext()) {
+                writer.append(AircraftFactory.getDataForSave(iter.next().getAircraft()) + "\n");
+            }
+
+            writer.flush();
+            writer.close();
+        } catch(Exception err) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public boolean LoadMap(String filename) {
+        File file = new File(filename);
+        if (!file.exists()) return false;
+
+        try {
+            BufferedReader reader = new BufferedReader(new FileReader(file));
+            String format = reader.readLine();
+            if (!format.equals("Map")) return false;
+
+            String key = reader.readLine();
+            String mapStr = reader.readLine();
+
+            AbstractMap map = null;
+
+            switch (mapStr)
+            {
+                case "SimpleMap":
+                    map = new SimpleMap();
+                    break;
+                case "MyMap":
+                    map = new MyMap();
+                    break;
+            }
+
+            if(_mapStorages.containsKey(key)) _mapStorages.get(key).ClearMap();
+            else _mapStorages.put(key, new MapWithSetAircraftsGeneric<>(_pictureWidth, _pictureHeight, map));
+
+            String current = null;
+            while ((current = reader.readLine()) != null)
+            {
+                _mapStorages.get(key).addAircraft(DrawingObjectAircraft.Create(current));
+            }
+            reader.close();
+        } catch(Exception err) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public void AddMap(String name, AbstractMap map)
+    {
+        // TODO Прописать логику для добавления
+        boolean check = _mapStorages.containsKey(name);
+        if (check) return;
+
+        _mapStorages.put(name, new MapWithSetAircraftsGeneric(_pictureWidth, _pictureHeight, map));
+    }
+
+    public void DelMap(String name)
+    {
+        // TODO Прописать логику для удаления
+        _mapStorages.remove(name);
+    }
+
+    public MapWithSetAircraftsGeneric<DrawingObjectAircraft, AbstractMap> getMap(String name)
+    {
+        return _mapStorages.getOrDefault(name, null);
+    }
+}

SetAircraftsGeneric.java

@@ -1,50 +1,50 @@
+import java.util.ArrayList;
+import java.util.ListIterator;
+
 public class SetAircraftsGeneric<T>
 {
-    private T[] _places;
-
+    private ArrayList<T> _places;
+    private int _maxCount;
     public int getCount() {
-        return _places.length;
+        return _places.size();
     }
 
     public SetAircraftsGeneric(int count)
     {
-        _places = (T[])(new Object[count]);
+        _places = new ArrayList<>();
+        _maxCount = count;
     }
-    public int Insert(T car)
+    public int Insert(T aircraft)
     {
-        for(int i = 0; i < _places.length; i++)
-        {
-            if (_places[i] == null)
-            {
-                _places[i] = car;
-                return i;
-            }
-        }
-        return -1;
+        if (_places.size() == _maxCount) return -1;
+        _places.add(0, aircraft);
+        return 0;
     }
-    public int Insert(T car, int position)
+    public int Insert(T aircraft, int position)
     {
-        int index = position;
-
-        while (_places[index] != null && index < _places.length) index++;
-
-        if (index == _places.length) return -1;
-        for (int i = index; i > position; --i) _places[i] = _places[i - 1];
-
-        _places[position] = car;
+        if (_places.size() == _maxCount) return -1;
+        _places.add(position, aircraft);
         return position;
     }
 
     public T Remove(int position)
     {
-        if(position >= _places.length) return null;
-        T res = _places[position];
-        _places[position] = null;
+        if(position > _maxCount || position < 0) return null;
+        T res = _places.get(position);
+        _places.remove(res);
         return res;
     }
 
+    public ListIterator<T> GetElems() {
+        return _places.listIterator();
+    }
+
+    public void Clear() {
+        _places.clear();
+    }
+
     public T Get(int position)
     {
-        return _places[position];
+        return _places.get(position);
     }
 }