LabWork7::hard_part::fixes

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

@@ -0,0 +1,129 @@
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.util.Random;
+public abstract class AbstractMap {
+    private IDrawingObject _drawningObject = null;
+    protected int[][] _map = null;
+    protected int _width;
+    protected int _height;
+    protected float[] position;
+    protected float _size_x;
+    protected float _size_y;
+    protected Random _random = new Random();
+    protected int _freeRoad = 0;
+    protected int _barrier = 1;
+    public BufferedImage CreateMap(int width, int height, IDrawingObject drawningObject)
+    {
+        _width = width;
+        _height = height;
+        _drawningObject = drawningObject;
+        GenerateMap();
+        while (!SetObjectOnMap())
+        {
+            GenerateMap();
+        }
+        return DrawMapWithObject();
+    }
+    public BufferedImage MoveObject(Direction direction)
+    {
+        position = _drawningObject.GetCurrentPosition();
+        for (int i = 0; i < _map.length; ++i)
+        {
+            for (int j = 0; j < _map[i].length; ++j)
+            {
+                if (_map[i][j] == _barrier)
+                {
+                    switch (direction)
+                    {
+                        case Up:
+                            if(_size_y * (j+1) >= position[0] - _drawningObject.Step() && _size_y * (j+1) < position[0] && _size_x * (i + 1) > position[3]
+                                    && _size_x * (i + 1) <= position[1])
+                            {
+                                return DrawMapWithObject();
+                            }
+                            break;
+                        case Down:
+                            if (_size_y * j <= position[2] + _drawningObject.Step() && _size_y * j > position[2] && _size_x * (i+1) > position[3]
+                                    && _size_x * (i+1) <= position[1])
+                            {
+                                return DrawMapWithObject();
+                            }
+                            break;
+                        case Left:
+                            if (_size_x * (i+1) >= position[3] - _drawningObject.Step() && _size_x * (i + 1) < position[3] && _size_y * (j + 1) < position[2]
+                                    && _size_y * (j + 1) >= position[0])
+                            {
+                                return DrawMapWithObject();
+                            }
+                            break;
+                        case Right:
+                            if (_size_x * i <= position[1] + _drawningObject.Step() && _size_x * i > position[3] && _size_y * (j + 1) < position[2]
+                                    && _size_y * (j + 1) >= position[0])
+                            {
+                                return DrawMapWithObject();
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+        _drawningObject.MoveObject(direction);
+        return DrawMapWithObject();
+    }
+    private boolean SetObjectOnMap()
+    {
+        if (_drawningObject == null || _map == null)
+        {
+            return false;
+        }
+        int x = _random.nextInt( 10);
+        int y = _random.nextInt( 10);
+        _drawningObject.SetObject(x, y, _width, _height);
+
+        for (int i = 0; i < _map.length; ++i)
+        {
+            for (int j = 0; j < _map[0].length; ++j)
+            {
+                if (i * _size_x >= x && j * _size_y >= y &&
+                        i * _size_x <= x + _drawningObject.GetCurrentPosition()[1] &&
+                        j * _size_y <= j + _drawningObject.GetCurrentPosition()[2])
+                {
+                    if (_map[i][j] == _barrier)
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+    private BufferedImage DrawMapWithObject()
+    {
+        BufferedImage bmp = new BufferedImage(_width, _height, BufferedImage.TYPE_INT_RGB);
+        if (_drawningObject == null || _map == null)
+        {
+            return bmp;
+        }
+        Graphics gr = bmp.getGraphics();
+        for (int i = 0; i < _map.length; ++i)
+        {
+            for (int j = 0; j < _map[i].length; ++j)
+            {
+                if (_map[i][j] == _freeRoad)
+                {
+                    DrawRoadPart(gr, i, j);
+                }
+                else if (_map[i][j] == _barrier)
+                {
+                    DrawBarrierPart(gr, i, j);
+                }
+            }
+        }
+        _drawningObject.DrawingObject(gr);
+        return bmp;
+    }
+    protected abstract void GenerateMap();
+    protected abstract void DrawRoadPart(Graphics g, int i, int j);
+    protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+}

src/DrawingDeck.java

@@ -1,40 +1,48 @@
 import javax.swing.*;
 import java.awt.*;
-public class DrawingDeck extends JComponent {
+public class DrawingDeck extends JComponent implements IAdditionalDrawingObject{
     private Additional_Enum _decksEnum;
-    public void SetAddEnum(Additional_Enum addEnum) {
-        _decksEnum = addEnum;
+    @Override
+    public void SetAddEnum(int decksAmount) {
+        for(Additional_Enum item : _decksEnum.values())
+        {
+            if(item.GetAddEnum()==decksAmount)
+            {
+                _decksEnum=item;
+                return;
+            }
+        }
     }
+    @Override
+    public int GetDeckEnum()
+    {
+        return _decksEnum.GetAddEnum();
+    }
+    @Override
     public void DrawDeck(Color colorDeck, Graphics g,float _startPosX,float _startPosY)
     {
         super.paintComponent(g);
         Graphics2D g2d = (Graphics2D) g;
-        switch (_decksEnum.GetAddEnum())
+        if(_decksEnum.GetAddEnum()>=1)
         {
-            case 1:
-                g2d.setPaint(colorDeck);
-                g2d.fillRect((int)_startPosX+40, (int)_startPosY+15, 30*2, 5);
-                g2d.setPaint(Color.BLACK);
-                g2d.drawRect((int)_startPosX+40, (int)_startPosY+15, 30*2, 5);
-                break;
-            case 2:
-                g2d.setPaint(colorDeck);
-                g2d.fillRect((int)_startPosX+40, (int)_startPosY+15, 70, 5);
-                g2d.fillRect((int)_startPosX+50, (int)_startPosY+10, 60, 5);
-                g2d.setPaint(Color.BLACK);
-                g2d.drawRect((int)_startPosX+40, (int)_startPosY+15, 70, 5);
-                g2d.drawRect((int)_startPosX+50, (int)_startPosY+10, 60, 5);
-                break;
-            case 3:
-                g2d.setPaint(colorDeck);
-                g2d.fillRect((int)_startPosX+40, (int)_startPosY+15, 70, 5);
-                g2d.fillRect((int)_startPosX+50, (int)_startPosY+10, 60, 5);
-                g2d.fillRect((int)_startPosX+60, (int)_startPosY+5, 50, 5);
-                g2d.setPaint(Color.BLACK);
-                g2d.drawRect((int)_startPosX+40, (int)_startPosY+15, 70, 5);
-                g2d.drawRect((int)_startPosX+50, (int)_startPosY+10, 60, 5);
-                g2d.drawRect((int)_startPosX+60, (int)_startPosY+5, 50, 5);
-                break;
+            g2d.setPaint(colorDeck);
+            g2d.fillRect((int)_startPosX+40, (int)_startPosY+15, 70, 5);
+            g2d.setPaint(Color.BLACK);
+            g2d.drawRect((int)_startPosX+40, (int)_startPosY+15, 70, 5);
+        }
+        if(_decksEnum.GetAddEnum()>=2)
+        {
+            g2d.setPaint(colorDeck);
+            g2d.fillRect((int)_startPosX+50, (int)_startPosY+10, 60, 5);
+            g2d.setPaint(Color.BLACK);
+            g2d.drawRect((int)_startPosX+50, (int)_startPosY+10, 60, 5);
+        }
+        if(_decksEnum.GetAddEnum()>=3)
+        {
+            g2d.setPaint(colorDeck);
+            g2d.fillRect((int)_startPosX+60, (int)_startPosY+5, 50, 5);
+            g2d.setPaint(Color.BLACK);
+            g2d.drawRect((int)_startPosX+60, (int)_startPosY+5, 50, 5);
         }
     }
 }

src/DrawingEntities.java

@@ -0,0 +1,58 @@
+import java.util.Random;
+
+public class DrawingEntities <T extends  EntityShip,U extends IAdditionalDrawingObject>{
+    public Object[] _entities;
+    public Object[] _decks;
+    int entitiesCount = 0;
+    int decksCount = 0;
+    String  indx;
+    String indy;
+    public DrawingEntities(int countE,int countD)
+    {
+        _entities=new Object[countE];
+        _decks=new Object[countD];
+    }
+    public int Insert(T ship)
+    {
+        if(entitiesCount<_entities.length){
+            _entities[entitiesCount] = ship;
+            entitiesCount++;
+            return entitiesCount-1;
+        }
+        return -1;
+    }
+    public int Insert(U deck)
+    {
+        if(decksCount<_decks.length){
+            _decks[decksCount] = deck;
+            decksCount++;
+            return decksCount-1;
+        }
+        return -1;
+    }
+    public void SetIndexs(int ind1, int ind2)
+    {
+        indx=Integer.toString(ind1);
+        indy=Integer.toString(ind2);
+    }
+    public DrawingShip CreateShip()
+    {
+        Random rnd = new Random();
+        int indEnt=0;
+        int indDeck=0;
+        if(entitiesCount-1!=0 & decksCount-1!=0)
+        {
+            indDeck=rnd.nextInt(0,decksCount-1);
+            indEnt=rnd.nextInt(0,entitiesCount-1);
+        }
+        T ship=(T)_entities[indEnt];
+        U deck=(U)_decks[indDeck];
+        SetIndexs(indEnt,indDeck);
+        if(ship instanceof EntityLiner)
+        {
+            return new DrawingLiner(ship,deck);
+        }
+        return new DrawingShip(ship,deck);
+    }
+
+}

src/DrawingLiner.java

@@ -0,0 +1,62 @@
+import java.awt.*;
+
+public class DrawingLiner extends DrawingShip
+{
+    private Color dopColor;
+    public DrawingLiner(int speed, float weight, Color bodyColor,int numdeck,Color dopColor,boolean dopDeck,boolean pool)
+    {
+        super(speed,weight,bodyColor,numdeck,130,45);
+        Ship = new EntityLiner(speed, weight, bodyColor, dopColor, dopDeck, pool);
+        this.dopColor=dopColor;
+    }
+    protected DrawingLiner(EntityShip ship,IAdditionalDrawingObject deck)
+    {
+        super(ship,deck);
+        Ship=ship;
+    }
+    public void SetDopColor(Color color)
+    {
+        var temp = (EntityLiner) Ship;
+        Ship=new EntityLiner(temp.GetSpeed(),temp.GetWeight(),temp.GetBodyColor(),color,temp.DopDeck,temp.Pool);
+        dopColor=color;
+    }
+    @Override
+    public void SetColor(Color color)
+    {
+        var temp = (EntityLiner) Ship;
+        dopColor = dopColor==null? Color.WHITE : dopColor;
+        Ship=new EntityLiner(temp.GetSpeed(),temp.GetWeight(),color,dopColor,temp.DopDeck,temp.Pool);
+    }
+    @Override
+    public void DrawTransport(Graphics gr) {
+        Graphics2D g2d = (Graphics2D) gr;
+        EntityLiner liner;
+        if (!(GetShip() instanceof EntityLiner))
+        {
+            return;
+        }
+        liner= (EntityLiner) Ship;
+        _startPosX+=10;
+        _startPosY+=5;
+        super.DrawTransport(gr);
+        _startPosY -= 5;
+        _startPosX -= 10;
+        if(liner.Pool)
+        {
+            g2d.setPaint(liner.DopColor);
+            g2d.fillRect((int)_startPosX + 15, (int)_startPosY + 25, 30, 3);
+            g2d.setPaint(Color.BLACK);
+            g2d.setPaint(Color.BLACK);
+            g2d.drawRect((int)_startPosX + 15, (int)_startPosY + 25, 30, 3);
+            gr.drawLine((int)_startPosX + 45, (int)_startPosY + 25, (int)_startPosX + 45, (int)_startPosY + 20);
+            gr.drawLine((int)_startPosX + 45, (int)_startPosY + 20, (int)_startPosX + 35, (int)_startPosY + 20);
+        }
+        if(liner.DopDeck)
+        {
+            g2d.setPaint(liner.DopColor);
+            g2d.fillRect((int)_startPosX + 50, (int)_startPosY + 15, 60, 5);
+            g2d.setPaint(Color.BLACK);
+            g2d.drawRect((int)_startPosX + 50, (int)_startPosY + 15, 60, 5);
+        }
+    }
+}

src/DrawingObjectShip.java

@@ -0,0 +1,52 @@
+import java.awt.*;
+
+public class DrawingObjectShip implements IDrawingObject {
+    private DrawingShip _ship = null;
+    public DrawingObjectShip(DrawingShip ship)
+    {
+        _ship=ship;
+    }
+    @Override
+    public float Step() {
+        if (_ship!=null && _ship.Ship != null) {
+            return _ship.Ship.Step();
+        }
+        return 0;
+    }
+    @Override
+    public DrawingShip GetDrawingObjectShip() {
+        return _ship;
+    }
+    @Override
+    public void SetObject(int x, int y, int width, int height) {
+        _ship.SetPosition(x,y,width,height);
+    }
+    @Override
+    public void MoveObject(Direction direction) {
+        _ship.MoveTransport(direction);
+    }
+    @Override
+    public void DrawingObject(Graphics g) {
+        _ship.DrawTransport(g);
+    }
+    @Override
+    public float[] GetCurrentPosition() {
+        if(_ship!=null)
+            return _ship.GetCurrentPosition();
+        return null;
+    }
+    @Override
+    public String GetInfo()
+    {
+        if(_ship==null)
+        {
+            return null;
+        }
+        return ExtentionShip.GetDataForSave(_ship);
+    }
+    public static IDrawingObject Create(String data)
+    {
+        return new DrawingObjectShip(ExtentionShip.CreateDrawingShip(data));
+    }
+
+}

src/DrawingOvalDeck.java

@@ -0,0 +1,49 @@
+import javax.swing.*;
+import java.awt.*;
+
+public class DrawingOvalDeck extends JComponent implements IAdditionalDrawingObject{
+    private Additional_Enum _decksEnum;
+    @Override
+    public void SetAddEnum(int decksAmount) {
+        for(Additional_Enum item : _decksEnum.values())
+        {
+            if(item.GetAddEnum()==decksAmount)
+            {
+                _decksEnum=item;
+                return;
+            }
+        }
+    }
+    @Override
+    public int GetDeckEnum()
+    {
+        return _decksEnum.GetAddEnum();
+    }
+    @Override
+    public void DrawDeck(Color colorDeck, Graphics g, float _startPosX, float _startPosY)
+    {
+        super.paintComponent(g);
+        Graphics2D g2d = (Graphics2D) g;
+            if(_decksEnum.GetAddEnum()>=1)
+        {
+            g2d.setPaint(colorDeck);
+            g2d.fillOval((int)_startPosX+40, (int)_startPosY+15, 70, 5);
+            g2d.setPaint(Color.BLACK);
+            g2d.drawOval((int)_startPosX+40, (int)_startPosY+15, 70, 5);
+        }
+        if(_decksEnum.GetAddEnum()>=2)
+        {
+            g2d.setPaint(colorDeck);
+            g2d.fillOval((int)_startPosX+50, (int)_startPosY+10, 60, 5);
+            g2d.setPaint(Color.BLACK);
+            g2d.drawOval((int)_startPosX+50, (int)_startPosY+10, 60, 5);
+        }
+        if(_decksEnum.GetAddEnum()>=3)
+        {
+            g2d.setPaint(colorDeck);
+            g2d.fillOval((int)_startPosX+60, (int)_startPosY+5, 50, 5);
+            g2d.setPaint(Color.BLACK);
+            g2d.drawOval((int)_startPosX+60, (int)_startPosY+5, 50, 5);
+        }
+    }
+}

src/DrawingShip.java

@@ -1,36 +1,66 @@
 import javax.swing.*;
 import java.awt.*;
 import java.util.Random;
-public class DrawingShip extends JPanel {
-    private EntityShip Ship;
-    public DrawingDeck Deck;
-    public void SetEnum() {
-        Random r = new Random();
-        int numbEnum = r.nextInt(1, 4);
-        if (numbEnum == 1) {
-            Deck.SetAddEnum(Additional_Enum.One);
-        }
-        if (numbEnum == 2) {
-            Deck.SetAddEnum(Additional_Enum.Two);
-        }
-        if (numbEnum == 3) {
-            Deck.SetAddEnum(Additional_Enum.Three);
-        }
+import java.util.Set;
+
+public class DrawingShip extends JComponent{
+    protected EntityShip Ship;
+    protected IAdditionalDrawingObject Deck;
+    public void SetColor(Color color)
+    {
+        Ship=new EntityShip(Ship.GetSpeed(),Ship.GetWeight(),color);
+    }
+    public IAdditionalDrawingObject GetDeck()
+    {
+        return Deck;
+    }
+    public void SetFormEnum(int decksnum,IAdditionalDrawingObject deck)
+    {
+        Deck=deck;
+        Deck.SetAddEnum(decksnum);
+    }
+    public void SetDeck(IAdditionalDrawingObject deck)
+    {
+        Deck=deck;
     }
     public EntityShip GetShip() {
         return Ship;
     }
-    private float _startPosX;
-    private float _startPosY;
+    protected float _startPosX;
+    protected float _startPosY;
     private Integer _pictureWidth = null;
     private Integer _pictureHeight = null;
-    protected final int _ShipWidth = 120;
-    protected final int _ShipHeight = 40;
-    public void Init(int speed, float weight, Color bodycolor) {
-        Ship = new EntityShip();
-        Ship.Init(speed, weight, bodycolor);
-        Deck = new DrawingDeck();
-        SetEnum();
+    private int _ShipWidth = 120;
+    private int _ShipHeight = 40;
+
+    public DrawingShip(int speed, float weight, Color bodycolor,int numdeck) {
+        Ship = new EntityShip(speed, weight, bodycolor);
+        Deck = new DrawingTriangleDeck();
+        Random r = new Random();
+        int numbEnum = r.nextInt(1, 4);
+        if (numbEnum == 1) {
+            Deck=new DrawingDeck();
+        }
+        if (numbEnum == 2) {
+            Deck = new DrawingOvalDeck();
+        }
+        if (numbEnum == 3) {
+            Deck = new DrawingTriangleDeck();
+        }
+        Deck.SetAddEnum(numdeck);
+
+    }
+    public DrawingShip(int speed,float weight,Color bodyColor,int numdeck,int shipWidth,int shipHeight)
+    {
+        this(speed,weight,bodyColor,numdeck);
+        _ShipWidth = shipWidth;
+        _ShipHeight = shipHeight;
+
+    }
+    protected DrawingShip(EntityShip ship,IAdditionalDrawingObject deck)
+    {
+        Ship=ship;
+        Deck=deck;
     }
     public void SetPosition(int x, int y, int width, int height) {
         if (width <= _ShipWidth + x || height <= _ShipHeight + y || x < 0 || y < 0) {
@@ -70,29 +100,21 @@ public class DrawingShip extends JPanel {
                 break;
         }
     }
-    public void DrawTransport() {
-        if (_startPosX < 0 || _startPosY < 0 || _pictureWidth == null || _pictureHeight == null) {
-            return;
-        }
-        repaint();
-    }
-    @Override
-    public void paintComponent(Graphics g) {
+    public void DrawTransport(Graphics gr) {
+        Graphics2D g2d = (Graphics2D) gr;
         if (GetShip() == null) {
             return;
         }
         if (_startPosX < 0 || _startPosY < 0 || _pictureWidth == null || _pictureHeight == null) {
             return;
         }
-        super.paintComponent(g);
-        Graphics2D g2d = (Graphics2D) g;
         g2d.setPaint(Ship.GetBodyColor());
         int xValues[]={(int) _startPosX,(int) _startPosX + 60 * 2,(int) _startPosX + 100,(int) _startPosX + 20};
         int yValues[]={(int) _startPosY + 20,(int) _startPosY + 20,(int) _startPosY + 20 * 2,(int) _startPosY + 40};
         g2d.fillPolygon(xValues,yValues,4);
         g2d.setPaint(Color.BLACK);
         g2d.drawPolygon(xValues,yValues,4);
-        Deck.DrawDeck(Ship.GetBodyColor(), g, _startPosX, _startPosY);
+        Deck.DrawDeck(Ship.GetBodyColor(), gr, _startPosX, _startPosY);
     }
     public void ChangeBorders(int width, int height) {
         _pictureWidth = width;
@@ -109,4 +131,8 @@ public class DrawingShip extends JPanel {
             _startPosY = _pictureHeight - _ShipHeight;
         }
     }
+    public float[] GetCurrentPosition()
+    {
+        return new float[] {/*UP*/_startPosY, /*RIGHT*/ _startPosX + _ShipWidth, /*DOWN*/ _startPosY + _ShipHeight, /*LEFT*/ _startPosX};
+    }
 }

src/DrawingTriangleDeck.java

@@ -0,0 +1,54 @@
+import javax.swing.*;
+import java.awt.*;
+public class DrawingTriangleDeck extends JComponent implements IAdditionalDrawingObject{
+    private Additional_Enum _decksEnum;
+    @Override
+    public void SetAddEnum(int decksAmount) {
+        for(Additional_Enum item : _decksEnum.values())
+        {
+            if(item.GetAddEnum()==decksAmount)
+            {
+                _decksEnum=item;
+                return;
+            }
+        }
+    }
+    @Override
+    public int GetDeckEnum()
+    {
+        return _decksEnum.GetAddEnum();
+    }
+    @Override
+    public void DrawDeck(Color colorDeck, Graphics g,float _startPosX,float _startPosY)
+    {
+        super.paintComponent(g);
+        Graphics2D g2d = (Graphics2D) g;
+        if(_decksEnum.GetAddEnum()>=1)
+        {
+            g2d.setPaint(colorDeck);
+            int[] xValues={(int)_startPosX+40,(int)_startPosX+40+15,(int)_startPosX+40+45,(int)_startPosX+40+60};
+            int[] yValues={(int)_startPosY+15,(int)_startPosY+20,(int)_startPosY+20,(int)_startPosY+15};
+            g2d.fillPolygon(xValues,yValues,4);
+            g2d.setPaint(Color.BLACK);
+            g2d.drawPolygon(xValues,yValues,4);
+        }
+        if(_decksEnum.GetAddEnum()>=2)
+        {
+            g2d.setPaint(colorDeck);
+            int[] xValues2={(int)_startPosX+50,(int)_startPosX+50+15,(int)_startPosX+50+45,(int)_startPosX+50+60};
+            int[] yValues2={(int)_startPosY+10,(int)_startPosY+15,(int)_startPosY+15,(int)_startPosY+10};
+            g2d.fillPolygon(xValues2,yValues2,4);
+            g2d.setPaint(Color.BLACK);
+            g2d.drawPolygon(xValues2,yValues2,4);
+        }
+        if(_decksEnum.GetAddEnum()>=3)
+        {
+            g2d.setPaint(colorDeck);
+            int[] xValues3_3={(int)_startPosX+50,(int)_startPosX+50+15,(int)_startPosX+50+45,(int)_startPosX+50+60};
+            int[] yValues3_3={(int)_startPosY+5,(int)_startPosY+10,(int)_startPosY+10,(int)_startPosY+5};
+            g2d.fillPolygon(xValues3_3,yValues3_3,4);
+            g2d.setPaint(Color.BLACK);
+            g2d.drawPolygon(xValues3_3,yValues3_3,4);
+        }
+    }
+}

src/EntityLiner.java

@@ -0,0 +1,15 @@
+import java.awt.*;
+
+public class EntityLiner extends EntityShip {
+    public Color DopColor;
+    public boolean DopDeck;
+    public boolean Pool;
+    public EntityLiner(int speed, float weight, Color bodyColor, Color dopColor, boolean dopDeck, boolean pool)
+    {
+        super(speed,weight,bodyColor);
+        DopColor = dopColor;
+        DopDeck = dopDeck;
+        Pool = pool;
+    }
+
+}

src/EntityShip.java

@@ -16,7 +16,7 @@ public class EntityShip {
     {
             return Speed*100/Weight;
     }
-    public void Init(int speed,float weight, Color bodyColor)
+    public EntityShip(int speed,float weight, Color bodyColor)
     {
         Speed = speed;
         Weight=weight;

src/ExtentionShip.java

@@ -0,0 +1,51 @@
+import java.awt.*;
+
+public class ExtentionShip {
+    private static final char _separatorForObject=':';
+    private static IAdditionalDrawingObject CreateDeck(String str,int num)
+    {
+        IAdditionalDrawingObject Deck=null;
+        switch(str)
+        {
+            case "DrawingDeck":
+                Deck=new DrawingDeck();
+                break;
+            case "DrawingTriangleDeck":
+                Deck=new DrawingTriangleDeck();
+                break;
+            case "DrawingOvalDeck":
+                Deck=new DrawingOvalDeck();
+                break;
+        }
+        Deck.SetAddEnum(num);
+        return Deck;
+    }
+    public static  DrawingShip CreateDrawingShip(String info)
+    {
+        String[] strs = info.split(String.format("%s",_separatorForObject));
+        if(strs.length==5)
+        {
+            DrawingShip ship = new DrawingShip(Integer.parseInt(strs[0]),Integer.parseInt(strs[1]), new Color(Integer.parseInt(strs[2])),Integer.parseInt(strs[3]));
+            ship.SetDeck(CreateDeck(strs[4],Integer.parseInt(strs[3])));
+            return ship;
+
+        }
+        if(strs.length==8)
+        {
+            DrawingLiner liner=new DrawingLiner(Integer.parseInt(strs[0]),Integer.parseInt(strs[1]), new Color(Integer.parseInt(strs[2])),Integer.parseInt(strs[3]),new Color(Integer.parseInt(strs[5])),Boolean.parseBoolean(strs[6]),Boolean.parseBoolean(strs[7]));
+            liner.SetDeck(CreateDeck(strs[4],Integer.parseInt(strs[3])));
+            return liner;
+        }
+        return null;
+    }
+    public static String GetDataForSave(DrawingShip drawingShip)
+    {
+        var ship = drawingShip.Ship;
+        var str= String.format("%d%c%d%c%s%c%d%c%s",ship.GetSpeed(),_separatorForObject,(int)ship.GetWeight(),_separatorForObject,Integer.toString(ship.GetBodyColor().getRGB()),_separatorForObject,drawingShip.GetDeck().GetDeckEnum(),_separatorForObject,drawingShip.GetDeck().getClass().getSimpleName());
+        if(!(ship instanceof EntityLiner liner))
+        {
+            return str;
+        }
+        return String.format("%s%c%s%c%b%c%b",str,_separatorForObject,Integer.toString(liner.DopColor.getRGB()),_separatorForObject,liner.DopDeck,_separatorForObject,liner.Pool);
+    }
+}

src/FormMapWithSetShipsGeneric.form

@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormMapWithSetShipsGeneric">
+  <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"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="9bb5a" binding="pictureBoxShip" layout-manager="BorderLayout" hgap="0" vgap="0">
+        <constraints>
+          <grid row="2" column="0" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <minimum-size width="600" height="400"/>
+            <preferred-size width="600" height="400"/>
+            <maximum-size width="600" height="400"/>
+          </grid>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children/>
+      </grid>
+      <hspacer id="b305e">
+        <constraints>
+          <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">
+        <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"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <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"/>
+            </constraints>
+            <properties>
+              <text value="Добавить корабль"/>
+            </properties>
+          </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">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </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"/>
+            </constraints>
+            <properties>
+              <text value="Удалить корабль"/>
+            </properties>
+          </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"/>
+            </constraints>
+            <properties>
+              <text value="Показать хранилище"/>
+            </properties>
+          </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"/>
+            </constraints>
+            <properties>
+              <text value="Показать карту"/>
+            </properties>
+          </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">
+                <minimum-size width="30" height="30"/>
+                <preferred-size width="30" height="30"/>
+                <maximum-size width="30" height="30"/>
+              </grid>
+            </constraints>
+            <properties>
+              <text value=""/>
+            </properties>
+          </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">
+                <minimum-size width="30" height="30"/>
+                <preferred-size width="30" height="30"/>
+                <maximum-size width="30" height="30"/>
+              </grid>
+            </constraints>
+            <properties>
+              <text value=""/>
+            </properties>
+          </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">
+                <minimum-size width="30" height="30"/>
+                <preferred-size width="30" height="30"/>
+                <maximum-size width="30" height="30"/>
+              </grid>
+            </constraints>
+            <properties>
+              <text value=""/>
+            </properties>
+          </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">
+                <minimum-size width="30" height="30"/>
+                <preferred-size width="30" height="30"/>
+                <maximum-size width="30" height="30"/>
+              </grid>
+            </constraints>
+            <properties>
+              <text value=""/>
+            </properties>
+          </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"/>
+            </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">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="1" row-span="2" 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="124b6" 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>
+          <vspacer id="3ed0f">
+            <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="95ba3" class="javax.swing.JComboBox" binding="ComboBoxSelectorMap">
+            <constraints>
+              <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>
+                <item value="Простая карта"/>
+                <item value="Карта море"/>
+              </model>
+            </properties>
+          </component>
+          <component id="fb777" 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="a358a" 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>
+          <component id="e221" class="javax.swing.JList" binding="ListBoxMaps" custom-create="true">
+            <constraints>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="2" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="50"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+        </children>
+      </grid>
+      <grid id="e57df" class="javax.swing.JMenuBar" binding="MenuBar" 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="8737a" class="javax.swing.JMenu" binding="MenuFile" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="1">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Файл"/>
+            </properties>
+            <border type="none"/>
+            <children>
+              <grid id="3edfc" class="javax.swing.JMenu" binding="MenuMap" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="1">
+                <constraints/>
+                <properties>
+                  <text value="Карта"/>
+                </properties>
+                <border type="none"/>
+                <children>
+                  <component id="d9dfb" class="javax.swing.JMenuItem" binding="SaveToolStripMap">
+                    <constraints/>
+                    <properties>
+                      <text value="Сохранить"/>
+                    </properties>
+                  </component>
+                  <component id="510d5" class="javax.swing.JMenuItem" binding="LoadToolStripMap">
+                    <constraints/>
+                    <properties>
+                      <text value="Загрузить"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
+              <component id="c2d9b" class="javax.swing.JMenuItem" binding="SaveToolStripMenu">
+                <constraints/>
+                <properties>
+                  <text value="Сохранить"/>
+                  <verticalAlignment value="0"/>
+                </properties>
+              </component>
+              <component id="8b9ff" class="javax.swing.JMenuItem" binding="LoadToolStripMenu">
+                <constraints/>
+                <properties>
+                  <text value="Загрузить"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+        </children>
+      </grid>
+    </children>
+  </grid>
+</form>

src/FormMapWithSetShipsGeneric.java

@@ -0,0 +1,419 @@
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.apache.log4j.*;
+
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+public class FormMapWithSetShipsGeneric extends JFrame{
+    public JPanel Mainpanel;
+    private JPanel pictureBoxShip;
+    private JPanel GroupBoxTools;
+    private JComboBox ComboBoxSelectorMap;
+    private JButton ButtonAddShip;
+    private JButton ButtonDeleteShip;
+    private JButton ButtonShowStorage;
+    private JButton ButtonShowMap;
+    private JButton ButtonLeft;
+    private JButton ButtonDown;
+    private JButton ButtonUp;
+    private JButton ButtonRight;
+    private JTextField maskedTextBoxPosition;
+    private JTextField textBoxNewMapName;
+    private final int picWidth=600;
+    private final int picHeight=400;
+    private JButton ButtonAddMap;
+    private JList ListBoxMaps;
+    private JButton ButtonDeleteMap;
+    private JPanel GroupBoxMaps;
+    private JButton ButtonCheckDel;
+    private JMenuBar MenuBar;
+    private JMenu MenuFile;
+    private JMenuItem SaveToolStripMenu;
+    private JMenuItem LoadToolStripMenu;
+    private JMenu MenuMap;
+    private JMenuItem SaveToolStripMap;
+    private JMenuItem LoadToolStripMap;
+    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();
+        JLabel imageWithMapAndObject = new JLabel();
+        imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
+        imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
+        imageWithMapAndObject.setIcon(new ImageIcon(bmp));
+        pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
+        pictureBoxShip.revalidate();
+    }
+    private void ReloadMaps(){
+        int index = ListBoxMaps.getSelectedIndex();
+        DefaultListModel<String> model1 = (DefaultListModel<String>) ListBoxMaps.getModel();
+        model1.removeAllElements();
+        for(int i=0;i<_mapsCollection.Keys().size();i++)
+        {
+            model1.addElement(_mapsCollection.Keys().get(i));
+        }
+        if (ListBoxMaps.getModel().getSize() > 0 && (index == -1 || index >= ListBoxMaps.getModel().getSize()))
+        {
+            ListBoxMaps.setSelectedIndex(0);
+        }
+        else if (ListBoxMaps.getModel().getSize() > 0 && index > -1 && index < ListBoxMaps.getModel().getSize())
+        {
+            ListBoxMaps.setSelectedIndex(index);
+        }
+    }
+    public FormMapWithSetShipsGeneric()
+    {
+        _mapsCollection = new MapsCollection(picWidth, picHeight);
+        ComboBoxSelectorMap.removeAllItems();
+        for (String elem : _mapsDict.keySet()) {
+            ComboBoxSelectorMap.addItem(elem);
+        }
+        try {
+            Image img = ImageIO.read(FormShip.class.getResource("Images/4.png"));
+            ButtonUp.setIcon(new ImageIcon(img));
+            img = ImageIO.read(FormShip.class.getResource("Images/2.png"));
+            ButtonDown.setIcon(new ImageIcon(img));
+            img = ImageIO.read(FormShip.class.getResource("Images/1.png"));
+            ButtonLeft.setIcon(new ImageIcon(img));
+            img = ImageIO.read(FormShip.class.getResource("Images/3.png"));
+            ButtonRight.setIcon(new ImageIcon(img));
+        } catch (Exception ex) {
+            System.out.println(ex);
+        }
+
+        ButtonAddShip.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                FormShipConfig formShipConfig = new FormShipConfig();
+                formShipConfig.AddEvent(newShip -> {
+                    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);
+            }
+        });
+        ListBoxMaps.addListSelectionListener(new ListSelectionListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                if (ListBoxMaps.getSelectedIndex() == -1)
+                    return;
+                UpdateWindow(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).ShowSet());
+                _logger.log(Level.INFO, "Переход на карту: "+ListBoxMaps.getSelectedValue().toString());
+            }
+        });
+        ButtonDeleteShip.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (maskedTextBoxPosition.getText().isEmpty())
+                {
+                    return;
+                }
+                int result = JOptionPane.showConfirmDialog(null,"Удалить объект?","Удаление",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE);
+                if(result==JOptionPane.NO_OPTION)
+                {
+                    return;
+                }
+                int pos=Integer.parseInt(maskedTextBoxPosition.getText());
+                try
+                {
+                    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());
+                }
+            }
+        });
+        ButtonShowStorage.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (ListBoxMaps.getSelectedIndex() == -1)
+                {
+                    return;
+                }
+                UpdateWindow(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).ShowSet());
+            }
+        });
+        ButtonShowMap.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (ListBoxMaps.getSelectedIndex() == -1)
+                {
+                    return;
+                }
+                UpdateWindow(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).ShowOnMap());
+            }
+        });
+        ButtonUp.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (ListBoxMaps.getSelectedIndex() == -1)
+                {
+                    return;
+                }
+                pictureBoxShip.removeAll();
+                JLabel imageWithMapAndObject = new JLabel();
+                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
+                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
+                imageWithMapAndObject.setIcon(new ImageIcon(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).MoveObject(Direction.Up)));
+                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
+                pictureBoxShip.revalidate();
+                pictureBoxShip.repaint();
+            }
+        });
+        ButtonDown.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (ListBoxMaps.getSelectedIndex() == -1)
+                {
+                    return;
+                }
+                pictureBoxShip.removeAll();
+                JLabel imageWithMapAndObject = new JLabel();
+                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
+                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
+                imageWithMapAndObject.setIcon(new ImageIcon(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).MoveObject(Direction.Down)));
+                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
+                pictureBoxShip.revalidate();
+                pictureBoxShip.repaint();
+            }
+        });
+        ButtonRight.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (ListBoxMaps.getSelectedIndex() == -1)
+                {
+                    return;
+                }
+                pictureBoxShip.removeAll();
+                JLabel imageWithMapAndObject = new JLabel();
+                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
+                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
+                imageWithMapAndObject.setIcon(new ImageIcon(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).MoveObject(Direction.Right)));
+                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
+                pictureBoxShip.revalidate();
+                pictureBoxShip.repaint();
+            }
+        });
+        ButtonLeft.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (ListBoxMaps.getSelectedIndex() == -1)
+                {
+                    return;
+                }
+                pictureBoxShip.removeAll();
+                JLabel imageWithMapAndObject = new JLabel();
+                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
+                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
+                imageWithMapAndObject.setIcon(new ImageIcon(_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).MoveObject(Direction.Left)));
+                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
+                pictureBoxShip.revalidate();
+                pictureBoxShip.repaint();
+
+            }
+        });
+        maskedTextBoxPosition.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyTyped(KeyEvent e) {
+                char c = e.getKeyChar();
+                if ( ((c < '0') || (c > '9')) || maskedTextBoxPosition.getText().length() >= 2) {
+                    e.consume();
+                }
+            }
+        });
+        ButtonAddMap.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                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();
+            }
+        });
+        ButtonDeleteMap.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (ListBoxMaps.getSelectedIndex() == -1)
+                {
+                    return;
+                }
+                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();
+                }
+            }
+        });
+        ButtonCheckDel.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (ListBoxMaps.getSelectedIndex() == -1)
+                {
+                    return;
+                }
+                IDrawingObject ship=_mapsCollection.Get(ListBoxMaps.getSelectedValue().toString()).GetShipsDeleted();
+                if(ship==null)
+                {
+                    JOptionPane.showMessageDialog(null,"Коллекция пуста","Ошибка",JOptionPane.ERROR_MESSAGE);
+                    return;
+                }
+                FormShip formShip=new FormShip(ship);
+                formShip.setSize(1000,800);
+                formShip.setVisible(true);
+            }
+        });
+        SaveToolStripMenu.addActionListener(new ActionListener(){
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                JFileChooser fc= new JFileChooser();
+                int returnVal = fc.showSaveDialog(null);
+                if(returnVal==JFileChooser.APPROVE_OPTION)
+                {
+                    try {
+                        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());
+                    }
+                }
+            }
+        });
+        LoadToolStripMenu.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                JFileChooser fc= new JFileChooser();
+                int returnVal = fc.showOpenDialog(null);
+                if(returnVal==JFileChooser.APPROVE_OPTION)
+                {
+                    try {
+                        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());
+                    }
+                }
+            }
+        });
+        SaveToolStripMap.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if(ListBoxMaps.getSelectedIndex()==-1)
+                {
+                    return;
+                }
+                JFileChooser fc= new JFileChooser();
+                int returnVal = fc.showSaveDialog(null);
+
+                if(returnVal==JFileChooser.APPROVE_OPTION)
+                {
+                    try {
+                        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());
+                    }
+                }
+            }
+        });
+        LoadToolStripMap.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                JFileChooser fc= new JFileChooser();
+                int returnVal = fc.showOpenDialog(null);
+                if(returnVal==JFileChooser.APPROVE_OPTION)
+                {
+                    try {
+                        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());
+                    }
+                }
+            }
+        });
+    }
+
+    private void createUIComponents() {
+        DefaultListModel<String> dlm = new DefaultListModel<String>();
+        ListBoxMaps = new JList(dlm);
+    }
+}

src/FormParam.form

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormParam">
+  <grid id="27dc6" binding="MainPanel" layout-manager="GridLayoutManager" row-count="4" 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"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="7700e" binding="pictureBoxShip" layout-manager="BorderLayout" hgap="0" vgap="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>
+      <component id="b960b" class="javax.swing.JButton" binding="ButtonCreate">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Создать"/>
+        </properties>
+      </component>
+      <component id="a44b0" class="javax.swing.JButton" binding="ButtonCreateModif">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Модификация"/>
+        </properties>
+      </component>
+      <hspacer id="56304">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </hspacer>
+      <component id="31e01" class="javax.swing.JLabel" binding="LabelInfo">
+        <constraints>
+          <grid row="2" column="1" 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>
+      <toolbar id="7a0ba" binding="StatusStrip">
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="-1" height="20"/>
+          </grid>
+        </constraints>
+        <properties>
+          <enabled value="false"/>
+        </properties>
+        <border type="none"/>
+        <children/>
+      </toolbar>
+    </children>
+  </grid>
+</form>

src/FormParam.java

@@ -0,0 +1,113 @@
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
+import java.util.Random;
+import java.util.Set;
+
+public class FormParam extends JFrame{
+    public JPanel MainPanel;
+    private JPanel pictureBoxShip;
+    private JButton ButtonCreate;
+    private JButton ButtonCreateModif;
+    private JToolBar StatusStrip;
+    private JLabel LabelInfo;
+    private JLabel JLabelSpeed = new JLabel();
+    private JLabel JLabelWeight = new JLabel();
+    private JLabel JLabelColor = new JLabel();
+    private DrawingEntities<EntityShip,IAdditionalDrawingObject> _drawingEntities;
+    private IAdditionalDrawingObject SetData()
+    {
+        Random random=new Random();
+        int r = random.nextInt(3);
+        if(r==0)
+        {
+            return new DrawingTriangleDeck();
+        }
+        if(r==1)
+        {
+            return new DrawingDeck();
+        }
+        else
+        {
+            return new  DrawingOvalDeck();
+        }
+
+    }
+    private void Draw(DrawingShip _ship) {
+        pictureBoxShip.removeAll();
+        Random random = new Random();
+        BufferedImage bmp = new BufferedImage(pictureBoxShip.getWidth(), pictureBoxShip.getHeight(),BufferedImage.TYPE_INT_RGB);
+        Graphics gr = bmp.getGraphics();
+        gr.setColor(new Color(238, 238, 238));
+        gr.fillRect(0, 0, pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
+        if (_ship != null) {
+            _ship.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100),
+                    pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
+            _ship.DrawTransport(gr);
+            JLabelSpeed.setText("Cкорость: " + _ship.GetShip().GetSpeed() + " ");
+            JLabelWeight.setText("Вес: " + _ship.GetShip().GetWeight() + " ");
+            JLabelColor.setText(("Цвет: " + _ship.GetShip().GetBodyColor() + " "));
+            JLabel imageOfLoco = new JLabel();
+            imageOfLoco.setPreferredSize(pictureBoxShip.getSize());
+            imageOfLoco.setMinimumSize(new Dimension(1, 1));
+            imageOfLoco.setIcon(new ImageIcon(bmp));
+            pictureBoxShip.add(imageOfLoco,BorderLayout.CENTER);
+        }
+        validate();
+    }
+    public FormParam()
+    {
+        Box LabelBox = Box.createHorizontalBox();
+        LabelBox.setMinimumSize(new Dimension(1, 20));
+        LabelBox.add(JLabelSpeed);
+        LabelBox.add(JLabelWeight);
+        LabelBox.add(JLabelColor);
+        StatusStrip.add(LabelBox);
+        _drawingEntities=new DrawingEntities<>(10,10);
+        ButtonCreate.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e){
+                Random random = new Random();
+                Color colorFirst = JColorChooser.showDialog(null, "Цвет", null);
+                EntityShip ship=new EntityShip(random.nextInt(100,300), random.nextInt(1000,2000),colorFirst);
+                IAdditionalDrawingObject deck = SetData();
+                int DecksCount=random.nextInt(1,4);
+                deck.SetAddEnum(DecksCount);
+                if((_drawingEntities.Insert(ship)!=-1) & (_drawingEntities.Insert(deck)!=-1))
+                {
+                    JOptionPane.showMessageDialog(null,"Объект добавлен");
+                    Draw(_drawingEntities.CreateShip());
+                    LabelInfo.setText(_drawingEntities.indx+ " " + _drawingEntities.indy);
+                }
+                else
+                {
+                    JOptionPane.showMessageDialog(null, "Не удалось добавить объект");
+                }
+            }
+        });
+        ButtonCreateModif.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                Random random = new Random();
+                Color colorFirst = JColorChooser.showDialog(null, "Цвет", null);
+                Color colorSecond = JColorChooser.showDialog(null, "Цвет", null);
+                EntityLiner _ship=new EntityLiner(random.nextInt(100, 300), random.nextInt(1000, 2000), colorFirst,colorSecond,random.nextBoolean(),random.nextBoolean());
+                IAdditionalDrawingObject deck = SetData();
+                int DecksCount=random.nextInt(1,4);
+                deck.SetAddEnum(DecksCount);
+                if((_drawingEntities.Insert(_ship)!=-1) & (_drawingEntities.Insert(deck)!=-1))
+                {
+                    JOptionPane.showMessageDialog(null,"Объект добавлен");
+                    Draw(_drawingEntities.CreateShip());
+                    LabelInfo.setText(_drawingEntities.indx+ " " + _drawingEntities.indy);
+                }
+                else
+                {
+                    JOptionPane.showMessageDialog(null, "Не удалось добавить объект");
+                }
+            }
+        });
+    }
+}

src/FormShip.form

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormShip">
-  <grid id="27dc6" binding="Mainpanel" layout-manager="GridLayoutManager" row-count="4" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="Mainpanel" layout-manager="GridLayoutManager" row-count="4" column-count="9" 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"/>
@@ -10,7 +10,7 @@
     <children>
       <component id="2ea16" class="javax.swing.JButton" binding="ButtonDown">
         <constraints>
-          <grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="2" column="7" 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"/>
@@ -22,7 +22,7 @@
       </component>
       <component id="4f60a" class="javax.swing.JButton" binding="ButtonLeft">
         <constraints>
-          <grid row="2" 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="2" column="6" 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"/>
@@ -34,7 +34,7 @@
       </component>
       <component id="4eb88" class="javax.swing.JButton" binding="ButtonRight">
         <constraints>
-          <grid row="2" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="2" column="8" 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"/>
@@ -45,15 +45,9 @@
           <text value=""/>
         </properties>
       </component>
-      <component id="9f55" class="DrawingShip" binding="PictureBoxShip">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="5" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-      </component>
       <component id="fb937" class="javax.swing.JButton" binding="ButtonUp">
         <constraints>
-          <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="1" column="7" 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"/>
@@ -65,7 +59,7 @@
       </component>
       <toolbar id="e747d" binding="StatusStrip">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="5" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
+          <grid row="3" column="0" row-span="1" col-span="9" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
             <minimum-size width="-1" height="20"/>
             <preferred-size width="-1" height="20"/>
             <maximum-size width="-1" height="20"/>
@@ -77,11 +71,19 @@
         <border type="none"/>
         <children/>
       </toolbar>
-      <hspacer id="d6bea">
+      <hspacer id="d86ff">
         <constraints>
-          <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="1" row-span="1" col-span="5" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
+      <grid id="6b0b8" binding="pictureBoxShip" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="1">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="9" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children/>
+      </grid>
       <component id="9e2ce" class="javax.swing.JButton" binding="ButtonCreate">
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
@@ -90,11 +92,27 @@
           <text value="Создать"/>
         </properties>
       </component>
-      <hspacer id="d86ff">
+      <component id="86a62" class="javax.swing.JButton" binding="ButtonCreateModif">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Модификация"/>
+        </properties>
+      </component>
+      <hspacer id="9abb1">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="4" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
+      <component id="8005c" class="javax.swing.JButton" binding="ButtonSelect">
+        <constraints>
+          <grid row="1" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Выбрать"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>

src/FormShip.java

@@ -1,30 +1,68 @@
 import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
 import java.util.Random;
-public class FormShip {
+public class FormShip extends JDialog{
     public JPanel Mainpanel;
+    private Random random = new Random();
     private JButton ButtonCreate;
     private JButton ButtonLeft;
     private JButton ButtonUp;
     private JButton ButtonDown;
     private JButton ButtonRight;
-    protected DrawingShip PictureBoxShip;
+    private JButton ButtonCreateModif;
+    protected DrawingShip _ship;
+    private JPanel pictureBoxShip;
     private JToolBar StatusStrip;
+    private JButton ButtonSelect;
     private JLabel JLabelSpeed = new JLabel();
     private JLabel JLabelWeight = new JLabel();
     private JLabel JLabelColor = new JLabel();
-    public void Draw() {
-        if (PictureBoxShip.GetShip() == null) {
-            return;
-        }
-        PictureBoxShip.DrawTransport();
+    protected DrawingShip SelectedShip;
+    public DrawingShip GetSelectedShip()
+    {
+        return SelectedShip;
     }
-    public FormShip() {
+    public int SetEnum() {
+        Random r = new Random();
+        int numbEnum = r.nextInt(1, 4);
+        return  numbEnum;
+    }
+    public void Draw(DrawingShip _ship) {
+        pictureBoxShip.removeAll();
+        BufferedImage bmp = new BufferedImage(pictureBoxShip.getWidth(), pictureBoxShip.getHeight(),BufferedImage.TYPE_INT_RGB);
+        Graphics gr = bmp.getGraphics();
+        gr.setColor(new Color(238, 238, 238));
+        gr.fillRect(0, 0, pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
+        if (_ship != null) {
+            _ship.DrawTransport(gr);
+            JLabel imageOfLoco = new JLabel();
+            imageOfLoco.setPreferredSize(pictureBoxShip.getSize());
+            imageOfLoco.setMinimumSize(new Dimension(1, 1));
+            imageOfLoco.setIcon(new ImageIcon(bmp));
+            pictureBoxShip.add(imageOfLoco,BorderLayout.CENTER);
+        }
+        validate();
+    }
+    public FormShip(IDrawingObject ship)
+    {
+        super(new Frame("Лайнер"));
+        CreateWindow();
+        setModal(true);
+        _ship=ship.GetDrawingObjectShip();
+        getContentPane().add(Mainpanel);
+    }
+    public FormShip()
+    {
+        super(new Frame("Лайнер"));
+        CreateWindow();
+        setModal(true);
+        getContentPane().add(Mainpanel);
+    }
+    public void CreateWindow() {
+        setModal(true);
         Box LabelBox = Box.createHorizontalBox();
         LabelBox.setMinimumSize(new Dimension(1, 20));
         LabelBox.add(JLabelSpeed);
@@ -43,52 +81,85 @@ public class FormShip {
         } catch (Exception ex) {
             System.out.println(ex);
         }
+        SelectedShip=_ship;
         ButtonCreate.addActionListener(new ActionListener() {
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(ActionEvent e){
                 Random random = new Random();
-                PictureBoxShip.Init(random.nextInt(100, 300), random.nextInt(1000, 2000), new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
-                PictureBoxShip.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100), PictureBoxShip.getWidth(), PictureBoxShip.getHeight());
-                JLabelSpeed.setText("Cкорость: " + PictureBoxShip.GetShip().GetSpeed() + " ");
-                JLabelWeight.setText("Вес: " + PictureBoxShip.GetShip().GetWeight() + " ");
-                JLabelColor.setText(("Цвет: " + PictureBoxShip.GetShip().GetBodyColor() + " "));
-                Draw();
+                Color colorFirst = JColorChooser.showDialog(null, "Цвет", null);
+                _ship=new DrawingShip(random.nextInt(100, 300), random.nextInt(1000, 2000), colorFirst,SetEnum());
+                _ship.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100), pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
+                JLabelSpeed.setText("Cкорость: " + _ship.GetShip().GetSpeed() + " ");
+                JLabelWeight.setText("Вес: " + _ship.GetShip().GetWeight() + " ");
+                JLabelColor.setText(("Цвет: " + _ship.GetShip().GetBodyColor() + " "));
+                Draw(_ship);
             }
         });
-        PictureBoxShip.addComponentListener(new ComponentAdapter() {
+        pictureBoxShip.addComponentListener(new ComponentAdapter() {
             @Override
             public void componentResized(ComponentEvent e) {
                 super.componentResized(e);
-                PictureBoxShip.ChangeBorders(PictureBoxShip.getWidth(), PictureBoxShip.getHeight());
-                Draw();
+                if(_ship!=null)
+                {
+                    _ship.ChangeBorders(pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
+                    pictureBoxShip.revalidate();
+                    Draw(_ship);
+                }
+
             }
         });
         ButtonUp.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                PictureBoxShip.MoveTransport(Direction.Up);
-                Draw();
+                _ship.MoveTransport(Direction.Up);
+                pictureBoxShip.revalidate();
+                Draw(_ship);
             }
         });
         ButtonDown.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                PictureBoxShip.MoveTransport(Direction.Down);
-                Draw();
+                _ship.MoveTransport(Direction.Down);
+                pictureBoxShip.revalidate();
+                Draw(_ship);
             }
         });
         ButtonRight.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                PictureBoxShip.MoveTransport(Direction.Right);
-                Draw();
+                _ship.MoveTransport(Direction.Right);
+                pictureBoxShip.revalidate();
+                Draw(_ship);
             }
         });
         ButtonLeft.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                PictureBoxShip.MoveTransport(Direction.Left);
-                Draw();
+                _ship.MoveTransport(Direction.Left);
+                pictureBoxShip.revalidate();
+                Draw(_ship);
+            }
+        });
+        ButtonCreateModif.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                Random random = new Random();
+                Color colorFirst = JColorChooser.showDialog(null, "Цвет", null);
+                Color colorSecond = JColorChooser.showDialog(null, "Цвет", null);
+                _ship=new DrawingLiner(random.nextInt(100, 300), random.nextInt(1000, 2000), colorFirst,SetEnum(),colorSecond,random.nextBoolean(),random.nextBoolean());
+                _ship.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100), pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
+                JLabelSpeed.setText("Cкорость: " + _ship.GetShip().GetSpeed() + " ");
+                JLabelWeight.setText("Вес: " + _ship.GetShip().GetWeight() + " ");
+                JLabelColor.setText(("Цвет: " + _ship.GetShip().GetBodyColor() + " "));
+                Draw(_ship);
+            }
+        });
+
+        ButtonSelect.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                SelectedShip=_ship;
+                dispose();
             }
         });
     }

src/FormShipConfig.form

@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormShipConfig">
+  <grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="2" 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>
+      <xy x="20" y="20" width="805" height="235"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="a93c3" binding="groupBoxConfig" layout-manager="GridLayoutManager" row-count="6" column-count="7" 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="20c7b" class="javax.swing.JLabel" binding="labelSpeed">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Скорость:"/>
+            </properties>
+          </component>
+          <component id="71d6d" class="javax.swing.JLabel" binding="labelWeight">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Вес:"/>
+            </properties>
+          </component>
+          <component id="86605" class="javax.swing.JLabel" binding="labelDecks">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Кол-во палуб"/>
+            </properties>
+          </component>
+          <component id="fafb1" class="javax.swing.JSpinner" binding="numericUpDownWeight">
+            <constraints>
+              <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="d10b0" class="javax.swing.JSpinner" binding="numericUpDownSpeed">
+            <constraints>
+              <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="1d879" class="javax.swing.JCheckBox" binding="checkBoxPool">
+            <constraints>
+              <grid row="3" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Признак наличия бассейна"/>
+            </properties>
+          </component>
+          <component id="260be" class="javax.swing.JCheckBox" binding="checkBoxDopDeck">
+            <constraints>
+              <grid row="4" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <selected value="false"/>
+              <text value="Признак наличия доп. палубы"/>
+            </properties>
+          </component>
+          <component id="16924" class="javax.swing.JSpinner" binding="numericUpDownDecks">
+            <constraints>
+              <grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+          </component>
+          <grid id="84403" binding="groupBoxColors" 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="0" column="4" row-span="5" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <grid id="d0af" 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="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                    <minimum-size width="50" height="50"/>
+                    <preferred-size width="50" height="50"/>
+                    <maximum-size width="50" height="50"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <background color="-65536"/>
+                </properties>
+                <border type="none"/>
+                <children/>
+              </grid>
+              <grid id="82d65" 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="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="50" height="50"/>
+                    <preferred-size width="50" height="50"/>
+                    <maximum-size width="50" height="50"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <background color="-16776961"/>
+                </properties>
+                <border type="none"/>
+                <children/>
+              </grid>
+              <grid id="4dbde" 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="0" 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="50" height="50"/>
+                    <preferred-size width="50" height="50"/>
+                    <maximum-size width="50" height="50"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <background color="-1"/>
+                </properties>
+                <border type="none"/>
+                <children/>
+              </grid>
+              <grid id="ceff3" 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="3" 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="50" height="50"/>
+                    <preferred-size width="50" height="50"/>
+                    <maximum-size width="50" height="50"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <background color="-256"/>
+                </properties>
+                <border type="none"/>
+                <children/>
+              </grid>
+              <grid id="3f75a" 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="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="50" height="50"/>
+                    <preferred-size width="50" height="50"/>
+                    <maximum-size width="50" height="50"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <background color="-16777216"/>
+                </properties>
+                <border type="none"/>
+                <children/>
+              </grid>
+              <grid id="f0c28" 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="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="50" height="50"/>
+                    <preferred-size width="50" height="50"/>
+                    <maximum-size width="50" height="50"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <background color="-16711936"/>
+                </properties>
+                <border type="none"/>
+                <children/>
+              </grid>
+              <grid id="a5386" 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="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="50" height="50"/>
+                    <preferred-size width="50" height="50"/>
+                    <maximum-size width="50" height="50"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <background color="-8388480"/>
+                </properties>
+                <border type="none"/>
+                <children/>
+              </grid>
+              <grid id="6dfcb" binding="PanelCyan" 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="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                    <minimum-size width="50" height="50"/>
+                    <preferred-size width="50" height="50"/>
+                    <maximum-size width="50" height="50"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <background color="-16711681"/>
+                </properties>
+                <border type="none"/>
+                <children/>
+              </grid>
+            </children>
+          </grid>
+          <component id="f7d3d" class="javax.swing.JLabel" binding="labelOvalDeck">
+            <constraints>
+              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Овальные"/>
+            </properties>
+          </component>
+          <component id="b2419" class="javax.swing.JLabel" binding="labelSimpleDeck">
+            <constraints>
+              <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Прямоугольные"/>
+            </properties>
+          </component>
+          <component id="f794a" class="javax.swing.JLabel" binding="labelTriangleDeck">
+            <constraints>
+              <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Треугольные"/>
+            </properties>
+          </component>
+          <component id="25253" class="javax.swing.JLabel" binding="LabelSimple">
+            <constraints>
+              <grid row="5" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Простой"/>
+            </properties>
+          </component>
+          <component id="a676a" class="javax.swing.JLabel" binding="LabelModif">
+            <constraints>
+              <grid row="5" column="6" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Модифицированный"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+      <grid id="a4b06" binding="groupBoxPicture" layout-manager="GridLayoutManager" row-count="3" 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="1" 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>
+          <component id="1ef24" class="javax.swing.JLabel" binding="LabelBaseColor">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false">
+                <minimum-size width="60" height="40"/>
+                <preferred-size width="60" height="40"/>
+                <maximum-size width="60" height="40"/>
+              </grid>
+            </constraints>
+            <properties>
+              <horizontalAlignment value="0"/>
+              <horizontalTextPosition value="0"/>
+              <text value="Цвет"/>
+            </properties>
+          </component>
+          <component id="a449a" class="javax.swing.JLabel" binding="LabelDecksForm">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false">
+                <minimum-size width="60" height="40"/>
+                <preferred-size width="60" height="40"/>
+                <maximum-size width="60" height="40"/>
+              </grid>
+            </constraints>
+            <properties>
+              <horizontalAlignment value="0"/>
+              <horizontalTextPosition value="0"/>
+              <text value="Форма"/>
+            </properties>
+          </component>
+          <component id="54f48" class="javax.swing.JLabel" binding="LabelDopColor">
+            <constraints>
+              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false">
+                <minimum-size width="60" height="40"/>
+                <preferred-size width="60" height="40"/>
+                <maximum-size width="60" height="40"/>
+              </grid>
+            </constraints>
+            <properties>
+              <horizontalAlignment value="0"/>
+              <horizontalTextPosition value="0"/>
+              <text value="Доп. цвет"/>
+            </properties>
+          </component>
+          <hspacer id="22645">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="1" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+          </hspacer>
+          <grid id="d89ad" binding="pictureBox" layout-manager="BorderLayout" hgap="0" vgap="0">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children/>
+          </grid>
+        </children>
+      </grid>
+      <hspacer id="5f509">
+        <constraints>
+          <grid row="1" 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>
+      <component id="838d1" class="javax.swing.JButton" binding="buttonAdd">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Добавить"/>
+        </properties>
+      </component>
+      <component id="2e1d9" class="javax.swing.JButton" binding="buttonCancel">
+        <constraints>
+          <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Отмена"/>
+        </properties>
+      </component>
+    </children>
+  </grid>
+</form>

src/FormShipConfig.java

@@ -0,0 +1,247 @@
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+
+import java.util.function.Consumer;
+
+public class FormShipConfig extends JFrame {
+    public JPanel mainPanel;
+    DrawingShip _ship;
+    Consumer<DrawingShip> EventAddShip;
+    private JPanel groupBoxConfig;
+    private JLabel labelSpeed;
+    private JSpinner numericUpDownSpeed;
+    private JLabel labelWeight;
+    private JSpinner numericUpDownWeight;
+    private JCheckBox checkBoxPool;
+    private JCheckBox checkBoxDopDeck;
+    private JPanel groupBoxColors;
+    private JPanel PanelRed;
+    private JPanel PanelBlue;
+    private JPanel PanelWhite;
+    private JPanel PanelYellow;
+    private JPanel PanelBlack;
+    private JPanel PanelGreen;
+    private JPanel PanelPurple;
+    private JPanel PanelCyan;
+    private JLabel LabelSimple;
+    private JLabel LabelModif;
+    private JLabel LabelBaseColor;
+    private JLabel LabelDopColor;
+    private JPanel pictureBox;
+    private JButton buttonAdd;
+    private JButton buttonCancel;
+    private JSpinner numericUpDownDecks;
+    private JLabel labelDecks;
+    private JLabel labelOvalDeck;
+    private JLabel labelTriangleDeck;
+    private JLabel labelSimpleDeck;
+    private JLabel LabelDecksForm;
+    private JPanel groupBoxPicture;
+    Object ObjFDnD = null;
+    Object TargetObjFDnD = null;
+    public FormShipConfig()
+    {
+        super("Лайнер");
+        CreateWindow();
+
+    }
+    public void Draw(DrawingShip _ship)
+    {
+        pictureBox.removeAll();
+        BufferedImage bmp = new BufferedImage(pictureBox.getWidth(), pictureBox.getHeight(),BufferedImage.TYPE_INT_RGB);
+        Graphics gr = bmp.getGraphics();
+        gr.setColor(new Color(238, 238, 238));
+        gr.fillRect(0, 0, pictureBox.getWidth(), pictureBox.getHeight());
+        if (_ship != null) {
+            _ship.DrawTransport(gr);
+            JLabel imageOfLoco = new JLabel();
+            imageOfLoco.setPreferredSize(pictureBox.getSize());
+            imageOfLoco.setMinimumSize(new Dimension(1, 1));
+            imageOfLoco.setIcon(new ImageIcon(bmp));
+            pictureBox.add(imageOfLoco,BorderLayout.CENTER);
+        }
+        revalidate();
+    }
+    public void AddEvent(Consumer<DrawingShip> ev){EventAddShip = ev;}
+    public void CreateWindow() {
+        setPreferredSize(new Dimension(720, 200));
+        getContentPane().add(mainPanel);
+        PanelBlack.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        PanelBlue.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        PanelRed.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        PanelYellow.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        PanelCyan.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        PanelPurple.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        PanelWhite.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        PanelGreen.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        LabelSimple.setText("Простой");
+        LabelModif.setText("Модифицированный");
+        LabelSimple.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        LabelModif.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        LabelBaseColor.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        LabelDopColor.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        labelSimpleDeck.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        labelTriangleDeck.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        labelOvalDeck.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        LabelDecksForm.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        numericUpDownSpeed.setModel(new SpinnerNumberModel(100, 100, 1000, 1));
+        numericUpDownWeight.setModel(new SpinnerNumberModel(100, 100, 1000, 1));
+        numericUpDownDecks.setModel(new SpinnerNumberModel(1, 1, 3, 1));
+        MouseAdapter drag = new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {
+                setCursor(new Cursor(Cursor.HAND_CURSOR));
+            }
+
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+                Drop((JComponent) e.getSource());
+            }
+        };
+        MouseAdapter defCursor = new MouseAdapter() {
+            @Override
+            public void mouseExited(MouseEvent e) {
+                setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+            }
+        };
+        AdditDeckDropObject(labelOvalDeck);
+        AdditDeckDropObject(labelSimpleDeck);
+        AdditDeckDropObject(labelTriangleDeck);
+        AdditDeckDropTarget(LabelDecksForm);
+        pictureBox.addMouseListener(defCursor);
+        LabelBaseColor.addMouseListener(defCursor);
+        LabelDopColor.addMouseListener(defCursor);
+        PanelRed.addMouseListener(drag);
+        PanelBlack.addMouseListener(drag);
+        PanelBlue.addMouseListener(drag);
+        PanelYellow.addMouseListener(drag);
+        PanelCyan.addMouseListener(drag);
+        PanelWhite.addMouseListener(drag);
+        PanelPurple.addMouseListener(drag);
+        PanelGreen.addMouseListener(drag);
+        LabelSimple.addMouseListener(drag);
+        LabelModif.addMouseListener(drag);
+        buttonAdd.addActionListener(e -> {
+            EventAddShip.accept(_ship);
+            dispose();
+        });
+        buttonCancel.addActionListener(e -> dispose());
+    }
+    void AdditDeckDropTarget(JComponent obj){
+        obj.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseEntered(MouseEvent e) {super.mouseEntered(e);
+                Deck_DragEnter(obj);
+            }
+            @Override
+            public void mouseExited(MouseEvent e) {super.mouseExited(e);
+                DragExit();
+            }
+        });
+    }
+    void AdditDeckDropObject(JComponent obj){
+        obj.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {super.mousePressed(e);
+                Deck_MouseDown(obj);
+            }
+            @Override
+            public void mouseReleased(MouseEvent e) {super.mouseReleased(e);
+                Deck_DragDrop();
+            }
+        });
+    }
+    public void Drop(JComponent dropditem)
+    {
+        if(dropditem==null)
+        {
+            return;
+        }
+        if(dropditem instanceof  JPanel panel)
+        {
+            if(_ship == null)
+            {
+                return;
+            }
+            if(LabelBaseColor.getMousePosition()!=null)
+            {
+                _ship.SetColor(panel.getBackground());
+                Draw(_ship);
+                revalidate();
+            }
+            if(LabelDopColor.getMousePosition()!=null && _ship instanceof DrawingLiner liner)
+            {
+                liner.SetDopColor(panel.getBackground());
+                Draw(_ship);
+                revalidate();
+            }
+        }
+        if(dropditem instanceof  JLabel jLabel && pictureBox.getMousePosition()!=null)
+        {
+            int speed = (int)numericUpDownSpeed.getValue();
+            int weight=(int)numericUpDownWeight.getValue();
+            int NumDecks=(int)numericUpDownDecks.getValue();
+            boolean dopdeck=checkBoxDopDeck.isSelected();
+            boolean pool=checkBoxPool.isSelected();
+
+            if(jLabel == LabelSimple)
+            {
+                _ship=new DrawingShip(speed,weight,Color.WHITE,NumDecks);
+                Draw(_ship);
+                revalidate();
+            }
+            else if(jLabel==LabelModif)
+            {
+                _ship=new DrawingLiner(speed,weight,Color.WHITE,NumDecks,Color.WHITE,dopdeck,pool);
+                Draw(_ship);
+                revalidate();
+            }
+            if(_ship != null)
+            {
+                _ship.SetPosition(20,50,pictureBox.getWidth(),pictureBox.getHeight());
+                Draw(_ship);
+                revalidate();
+            }
+        }
+    }
+    void Deck_MouseDown(Object sender) {
+        IAdditionalDrawingObject Deck;
+        switch (((JLabel)sender).getText()){
+            case "Овальные":
+                Deck = new DrawingOvalDeck();
+                break;
+            case "Треугольные":
+                Deck = new DrawingTriangleDeck();
+                break;
+            case "Прямоугольные":
+                Deck = new DrawingDeck();
+                break;
+            default:
+                return;
+        }
+        Deck.SetAddEnum((int)numericUpDownDecks.getValue());
+        ObjFDnD  = Deck;
+    }
+    void Deck_DragEnter(Object sender){
+        if(ObjFDnD!=null&& IAdditionalDrawingObject.class.isAssignableFrom(ObjFDnD.getClass())){
+            setCursor(new Cursor(Cursor.HAND_CURSOR));
+            TargetObjFDnD = sender;
+        }
+    }
+    void Deck_DragDrop(){
+        if(TargetObjFDnD==null) {return;}
+        _ship.SetFormEnum((int)numericUpDownDecks.getValue(),(IAdditionalDrawingObject)ObjFDnD);
+        DragExit();
+        ObjFDnD = null;
+    }
+    void DragExit(){
+        if(ObjFDnD!=null&&TargetObjFDnD!=null) {
+            setCursor(Cursor.getDefaultCursor());
+            Draw(_ship);
+            TargetObjFDnD = null;
+        }
+    }
+}

src/IAdditionalDrawingObject.java

@@ -0,0 +1,7 @@
+import java.awt.*;
+
+public interface IAdditionalDrawingObject {
+    void SetAddEnum(int decksAmount);
+    int GetDeckEnum();
+    void DrawDeck(Color colorDeck, Graphics g, float _startPosX, float _startPosY);
+}

src/IDrawingObject.java

@@ -0,0 +1,12 @@
+import java.awt.*;
+
+public interface IDrawingObject {
+    public float Step();
+    void SetObject(int x, int y,int width,int height);
+    void MoveObject(Direction direction);
+    void DrawingObject(Graphics g);
+    float[] GetCurrentPosition();
+    public DrawingShip GetDrawingObjectShip();
+    String GetInfo();
+
+}

src/Main.java

@@ -3,11 +3,11 @@ import javax.swing.*;
 public class Main {
     public static void main(String[] args) {
         JFrame frame = new JFrame("Лайнер");
-        frame.setContentPane(new FormShip().Mainpanel);
+        frame.setContentPane(new FormMapWithSetShipsGeneric().Mainpanel);
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setLocation(500, 200);
         frame.pack();
-        frame.setSize(500, 500);
+        frame.setSize(800, 500);
         frame.setVisible(true);
     }
 }

src/MapWithSetShipsGeneric.java

@@ -0,0 +1,179 @@
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.util.LinkedList;
+
+public class MapWithSetShipsGeneric<T extends IDrawingObject, U extends  AbstractMap> {
+    private final int _pictureWidth;
+    private final int _pictureHeight;
+    private final int _placeSizeWidth = 170;
+    private final int _placeSizeHeight = 90;
+    private final SetShipsGeneric<T> _setShips;
+    private final U _map;
+    private LinkedList<T> _deletedShips;
+    public MapWithSetShipsGeneric(int picWidth, int picHeight, U map)
+    {
+        _deletedShips=new LinkedList<>();
+        int width = picWidth / _placeSizeWidth;
+        int height = picHeight / _placeSizeHeight;
+        _setShips = new SetShipsGeneric<T>(width * height);
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _map = map;
+    }
+    public int Add(T ship) throws StorageOverflowException {
+        return _setShips.Insert(ship);
+    }
+    public T Delete(int position) throws ShipNotFoundException {
+        T ship=_setShips.Remove(position);
+        _deletedShips.add(ship);
+        return ship;
+    }
+    public void Clear()
+    {
+        _setShips.Clear();
+    }
+    public BufferedImage ShowSet()
+    {
+        BufferedImage bmp = new BufferedImage(_pictureWidth,_pictureHeight,BufferedImage.TYPE_INT_RGB);
+        Graphics gr = bmp.getGraphics();
+        DrawBackground(gr);
+        DrawShips(gr);
+        return bmp;
+    }
+    public BufferedImage ShowOnMap(){
+        Shaking();
+        for(var ship : _setShips)
+        {
+            return _map.CreateMap(_pictureWidth,_pictureHeight,ship);
+        }
+        return new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_RGB);
+    }
+    public BufferedImage MoveObject(Direction direction)
+    {
+        if (_map != null)
+        {
+            return _map.MoveObject(direction);
+        }
+        return new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_RGB);
+    }
+    private void Shaking(){
+        int j = _setShips.Count() - 1;
+        for (int i = 0; i < _setShips.Count(); i++)
+        {
+            if (_setShips.Get(i) == null)
+            {
+                for (; j > i; j--)
+                {
+                    var ship = _setShips.Get(j);
+                    if (ship != null)
+                    {
+                        try {
+                            _setShips.Insert(ship, i);
+                        } catch (StorageOverflowException e) {
+                            throw new RuntimeException(e);
+                        }
+                        try {
+                            _setShips.Remove(j);
+                        } catch (ShipNotFoundException e) {
+                            throw new RuntimeException(e);
+                        }
+                        break;
+                    }
+                }
+                if (j <= i)
+                {
+                    return;
+                }
+            }
+        }
+    }
+    private void DrawBackground(Graphics gr)
+    {
+        Graphics2D g = (Graphics2D) gr;
+        g.setColor(Color.BLUE);
+        g.fillRect( 0, 0, _pictureWidth, _pictureHeight);
+        Color c = new Color(89,51,5);
+        g.setStroke(new BasicStroke(2));
+        g.setColor(c);
+        for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+        {
+            for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+            {
+                g.drawLine(i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2 + 40, j * _placeSizeHeight);
+            }
+            g.drawLine(i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            g.drawLine(i * _placeSizeWidth - 4, 0, i * _placeSizeWidth - 4, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+        }
+    }
+    private void DrawShips(Graphics g)
+    {
+        int widthEl = _pictureWidth / _placeSizeWidth;
+        int heightEl = _pictureHeight / _placeSizeHeight;
+        int curWidth = 1;
+        int curHeight = 0;
+        for (int i = 0; i < _setShips.Count(); i++)
+        {
+            if(_setShips.Get(i)==null)
+            {
+                continue;
+            }
+            _setShips.Get(i).SetObject(_pictureWidth - _placeSizeWidth * curWidth - (_pictureWidth / 7),
+                    curHeight * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
+            _setShips.Get(i).DrawingObject(g);
+
+            if (curWidth < widthEl)
+                curWidth++;
+            else
+            {
+                curWidth = 1;
+                curHeight++;
+            }
+            if (curHeight > heightEl)
+            {
+                return;
+            }
+
+        }
+    }
+    public String GetDataForMap(char separatorType,char separatorData,boolean IsInfoMap)
+    {
+        if(IsInfoMap)
+        {
+            StringBuilder data=new StringBuilder(String.format("%s%c",_map.getClass().getSimpleName(),separatorType));
+            return data.toString();
+        }
+        StringBuilder data=new StringBuilder();
+        for (var ship: _setShips)
+        {
+            data.append(String.format("%s%c",ship.GetInfo(),separatorData));
+        }
+        return data.toString();
+    }
+    public String GetData(char separatorType,char separatorData)
+    {
+        StringBuilder data=new StringBuilder(String.format("%s%c",_map.getClass().getSimpleName(),separatorType));
+        for (var ship: _setShips)
+        {
+            data.append(String.format("%s%c",ship.GetInfo(),separatorData));
+        }
+        return data.toString();
+    }
+    public void LoadData(String[] records) throws StorageOverflowException {
+        for(var rec:records)
+        {
+            _setShips.Insert((T) DrawingObjectShip.Create(rec));
+        }
+    }
+    public T GetSelectedShip(int ind){
+        return _setShips.Get(ind);
+    }
+    public T GetShipsDeleted()
+    {
+        if(_deletedShips.isEmpty())
+        {
+            return null;
+        }
+        return _deletedShips.poll();
+    }
+}
+

src/MapsCollection.java

@@ -0,0 +1,168 @@
+import java.io.*;
+import java.util.AbstractCollection;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class MapsCollection {
+    private final HashMap<String,MapWithSetShipsGeneric<IDrawingObject, AbstractMap>> _mapStorages;
+    public ArrayList<String> Keys()
+    {
+        return new ArrayList<>(_mapStorages.keySet());
+    }
+    private final int _pictureWidth;
+    private final int _pictureHeight;
+    private final char separatorDict = '|';
+    private final char separatorData = ';';
+
+    public MapsCollection(int pictureWidth,int pictureHeight)
+    {
+        _mapStorages=new HashMap<>();
+        _pictureWidth=pictureWidth;
+        _pictureHeight=pictureHeight;
+    }
+    public void AddMap(String Name, AbstractMap Map)
+    {
+        if(!_mapStorages.containsKey(Name))
+        {
+            _mapStorages.put(Name,new MapWithSetShipsGeneric<>(_pictureWidth,_pictureHeight,Map));
+        }
+    }
+    public void DelMap(String name)
+    {
+        _mapStorages.remove(name);
+    }
+    public MapWithSetShipsGeneric<IDrawingObject,AbstractMap> Get(String ind)
+    {
+        if(_mapStorages.containsKey(ind))
+        {
+            return _mapStorages.get(ind);
+        }
+        return null;
+    }
+    public IDrawingObject Get(String name, int ind) {
+        if (_mapStorages.containsKey(name))
+        {
+            return _mapStorages.get(name).GetSelectedShip(ind);
+        }
+        return null;
+    }
+    public void SaveData(String filename) throws IOException {
+        File file = new File(filename);
+        if(file.exists())
+        {
+            file.delete();
+        }
+        try(BufferedWriter fw = new BufferedWriter(new FileWriter(file)))
+        {
+            fw.write(String.format("MapsCollection%s",System.lineSeparator()));
+            for(var storage:_mapStorages.keySet())
+            {
+                fw.write(String.format("%s%c%s%s",storage,separatorDict,_mapStorages.get(storage).GetData(separatorDict,separatorData),System.lineSeparator()));
+            }
+        }
+    }
+    public void LoadData(String filename) throws FileNotFoundException {
+        File file=new File(filename);
+        if(!file.exists())
+        {
+            throw new FileNotFoundException("Файл не найден");
+        }
+        try(BufferedReader fr = new BufferedReader(new FileReader(file)))
+        {
+            String str="";
+            if((str=fr.readLine())==null || !str.contains("MapsCollection"))
+            {
+                throw new IllegalArgumentException("Формат данных в файле неправильный");
+            }
+            _mapStorages.clear();
+            while((str=fr.readLine())!=null)
+            {
+                var tempElem = str.split(String.format("\\%c",separatorDict));
+                AbstractMap map =null;
+                switch (tempElem[1])
+                {
+                    case "SimpleMap":
+                        map=new SimpleMap();
+                        break;
+                    case "SeaMap":
+                        map=new SeaMap();
+                        break;
+                }
+                _mapStorages.put(tempElem[0],new MapWithSetShipsGeneric<IDrawingObject,AbstractMap>(_pictureWidth,_pictureHeight,map));
+                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);
+        }
+    }
+    public void SaveMapData(String filename,String Key)throws IOException
+    {
+        File file = new File(filename);
+        if(file.exists())
+        {
+            file.delete();
+        }
+        try(BufferedWriter fw = new BufferedWriter(new FileWriter(file)))
+        {
+            fw.write(String.format("Map_Info:%s",System.lineSeparator()));
+            var Map = _mapStorages.get(Key);
+            fw.write(String.format("%s%c%s%s",Key,separatorDict,Map.GetDataForMap(separatorDict,separatorData,true),System.lineSeparator()));
+            fw.write(String.format("Objects_In_Map_Info:%s",System.lineSeparator()));
+            fw.write(String.format("%s%s",Map.GetDataForMap(separatorDict,separatorData,false),System.lineSeparator()));
+        }
+    }
+    public void LoadMapData(String filename) throws FileNotFoundException {
+        File file=new File(filename);
+        if(!file.exists())
+        {
+            throw new FileNotFoundException("Файл не найден");
+        }
+        try(BufferedReader fr = new BufferedReader(new FileReader(file)))
+        {
+            String str="";
+            if((str=fr.readLine())==null || !str.contains("Map_Info:"))
+            {
+                throw new IllegalArgumentException("Формат данных в файле неправильный");
+            }
+            str=fr.readLine();
+            var tempElem = str.split(String.format("\\%c",separatorDict));
+
+            AbstractMap map =null;
+            switch (tempElem[1])
+            {
+                case "SimpleMap":
+                    map=new SimpleMap();
+                    break;
+                case "SeaMap":
+                    map=new SeaMap();
+                    break;
+            }
+            if(_mapStorages.containsKey(tempElem[0]))
+            {
+                MapWithSetShipsGeneric<IDrawingObject, AbstractMap> storage = _mapStorages.get(tempElem[0]);
+                storage.Clear();
+            }
+            _mapStorages.put(tempElem[0], new MapWithSetShipsGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+            String str_second=fr.readLine();
+            if(!str_second.contains("Objects_In_Map_Info:"))
+            {
+                throw new IllegalArgumentException("Формат данных в файле неправильный");
+            }
+            str_second= fr.readLine();
+            str=str+str_second;
+            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);
+        }
+    }
+}

src/SeaMap.java

@@ -0,0 +1,49 @@
+import java.awt.*;
+
+public class SeaMap extends AbstractMap{
+    private final Color barrierColor = Color.WHITE;
+    private final Color roadColor = Color.CYAN;
+    @Override
+    protected void DrawBarrierPart(Graphics g, int i, int j)
+    {
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.setPaint(barrierColor);
+        g2d.fillRect((int)(i * _size_x), (int) (j * _size_y), (int)(i * (_size_x + 1)), (int)(j * (_size_y + 1)));
+    }
+    @Override
+    protected void DrawRoadPart(Graphics g, int i, int j)
+    {
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.setPaint(roadColor);
+        g2d.fillRect((int)(i * _size_x), (int) (j * _size_y), (int)(i * (_size_x + 1)), (int)(j * (_size_y + 1)));
+    }
+    @Override
+    protected void GenerateMap()
+    {
+        _map = new int[100][100];
+        _size_x = (float)_width / _map.length;
+        _size_y = (float)_height / _map[0].length;
+        int counter = 0;
+        for (int i = 0; i < _map.length; ++i)
+        {
+            for (int j = 0; j < _map[0].length; ++j)
+            {
+                _map[i][j] = _freeRoad;
+            }
+        }
+        while (counter < 25)
+        {
+            int x = _random.nextInt(0, 97);
+            int y = _random.nextInt(0, 97);
+            if (_map[x][y] == _freeRoad)
+            {
+                _map[x][y + 1] = _barrier;
+                _map[x + 1][y + 1] = _barrier;
+                _map[x + 2][y + 1] = _barrier;
+                _map[x + 1][y] = _barrier;
+                counter++;
+            }
+        }
+    }
+}
+

src/SetShipsGeneric.java

@@ -0,0 +1,59 @@
+import java.util.ArrayList;
+import java.util.Iterator;
+public class SetShipsGeneric<T extends  Object> implements  Iterable<T>{
+    private ArrayList<T> _places;
+    private final int _maxCount;
+    public int Count()
+    {
+        return  _places.size();
+    }
+    public SetShipsGeneric(int count)
+    {
+        _maxCount=count;
+        _places = new ArrayList<>();
+    }
+    public int Insert(T ship) throws StorageOverflowException {
+        return Insert(ship, 0);
+    }
+    public int Insert(T ship, int position) throws StorageOverflowException {
+        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) throws ShipNotFoundException {
+        if (position >= Count() || position < 0)
+        {
+            throw new ShipNotFoundException(position);
+        }
+        T ship = (T) _places.get(position);
+        _places.remove(ship);
+        return ship;
+    }
+    public void Clear()
+    {
+        _places.clear();
+    }
+    public T Get(int position)
+    {
+        if (position >= Count() || position<0)
+        {
+            return null;
+        }
+        return _places.get(position);
+    }
+    public void Set(int position,T value) throws StorageOverflowException {
+        if (position < _maxCount || position >= 0)
+        {
+            Insert(value,position);
+        }
+    }
+    @Override
+    public Iterator<T> iterator() {
+        return _places.iterator();
+    }
+}
+

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/SimpleMap.java

@@ -0,0 +1,45 @@
+import java.awt.*;
+
+public class SimpleMap extends AbstractMap{
+    private final Color barrierColor = Color.black;
+    private final Color roadColor = Color.gray;
+    @Override
+    protected void DrawBarrierPart(Graphics g, int i, int j)
+    {
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.setPaint(barrierColor);
+        g2d.fillRect((int)(i * _size_x), (int) (j * _size_y), (int)(i * (_size_x + 1)), (int)(j * (_size_y + 1)));
+    }
+    @Override
+    protected void DrawRoadPart(Graphics g, int i, int j)
+    {
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.setPaint(roadColor);
+        g2d.fillRect((int)(i * _size_x), (int) (j * _size_y), (int)(i * (_size_x + 1)), (int)(j * (_size_y + 1)));
+    }
+    @Override
+    protected void GenerateMap()
+    {
+        _map = new int[100][100];
+        _size_x = (float)_width / _map.length;
+        _size_y = (float)_height / _map[0].length;
+        int counter = 0;
+        for (int i = 0; i < _map.length; ++i)
+        {
+            for (int j = 0; j < _map[0].length; ++j)
+            {
+                _map[i][j] = _freeRoad;
+            }
+        }
+        while (counter < 50)
+        {
+            int x = _random.nextInt(0, 100);
+            int y = _random.nextInt(0, 100);
+            if (_map[x][y] == _freeRoad)
+            {
+                _map[x][y] = _barrier;
+                counter++;
+            }
+        }
+    }
+}

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