four commit

src/AbstractStrategy.java

@@ -1,5 +1,4 @@
 import java.util.function.Supplier;
-
 public abstract class AbstractStrategy {
     private IMoveableObject moveableObject;
     private Status state = Status.NOTINIT;

src/BomberGenericCollection.java

@@ -0,0 +1,122 @@
+import java.awt.*;
+
+public class BomberGenericCollection<T extends DrawingAir, U extends IMoveableObject> {
+    /// <summary>
+    /// Ширина окна прорисовки
+    /// </summary>
+    private final int pictureWidth;
+    /// <summary>
+    /// Высота окна прорисовки
+    /// </summary>
+    private final int _pictureHeight;
+    /// <summary>
+    /// Размер занимаемого объектом места (ширина)
+    /// </summary>
+    private final int _placeSizeWidth = 170;
+    /// <summary>
+    /// Размер занимаемого объектом места (высота)
+    /// </summary>
+    private final int _placeSizeHeight = 180;
+    /// <summary>
+    /// Набор объектов
+    /// </summary>
+    private SetGeneric<T> collection;
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth"></param>
+    /// <param name="picHeight"></param>
+    public BomberGenericCollection(int picWidth, int picHeight)
+    {
+        int width = picWidth / _placeSizeWidth;
+        int height = picHeight / _placeSizeHeight;
+        pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        collection = new SetGeneric<T>(width * height);
+    }
+    public int size(){
+        return collection.getCount();
+    }
+    /// <summary>
+    /// Перегрузка оператора сложения
+    /// </summary>
+    /// <param name="collect"></param>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    public boolean Insert(T obj)
+    {
+        if (obj == null )
+            return false;
+        return collection.insert(obj);
+    }
+    /// <summary>
+    /// Перегрузка оператора вычитания
+    /// </summary>
+    /// <param name="collect"></param>
+    /// <param name="pos"></param>
+    /// <returns></returns>
+    public boolean Remove(int pos) {
+        return collection.remove(pos);
+    }
+    /// <summary>
+    /// Получение объекта IMoveableObject
+    /// </summary>
+    /// <param name="pos"></param>
+    /// <returns></returns>
+    public U GetU(int pos)
+    {
+        if(collection.Get(pos) == null)
+            return null;
+        return (U)collection.Get(pos).GetMoveableObject();
+    }
+    public T Get(int position){
+        if(position < 0 || position >= collection.getCount())
+            return null;
+        return collection.Get(position);
+    }
+    /// <summary>
+    /// Вывод всего набора объектов
+    /// </summary>
+    /// <returns></returns>
+    public void ShowPlanes(Graphics2D gr)
+    {
+        DrawBackground(gr);
+        DrawObjects(gr);
+    }
+    /// <summary>
+    /// Метод отрисовки фона
+    /// </summary>
+    /// <param name="g"></param>
+    private void DrawBackground(Graphics2D g)
+    {
+        BasicStroke pen = new BasicStroke(3);
+        g.setStroke(pen);
+        for (int i = 0; i < pictureWidth / _placeSizeWidth; i++)
+        {
+            for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+            {//линия разметки места
+                g.drawLine(i * _placeSizeWidth + 10, j * _placeSizeHeight +5,
+                        i * _placeSizeWidth + _placeSizeWidth / 2 + 50, j * _placeSizeHeight +5);
+            }
+            g.drawLine(i * _placeSizeWidth + 10, 5, i * _placeSizeWidth + 10,
+                    _pictureHeight / _placeSizeHeight * _placeSizeHeight +5);
+        }
+    }
+    /// <summary>
+    /// Метод прорисовки объектов
+    /// </summary>
+    /// <param name="g"></param>
+    private void DrawObjects(Graphics2D g)
+    {
+        for (int i = 0; i < collection.getCount(); i++)
+        {
+            DrawingAir bomber = collection.Get(i);
+            if (bomber != null)
+            {
+                int inRow = pictureWidth / _placeSizeWidth;
+                bomber.setPosition(pictureWidth - _placeSizeWidth - (i % inRow * _placeSizeWidth)-8, i / inRow * _placeSizeHeight + 20);
+                bomber.drawTransport(g);
+            }
+        }
+    }
+}

src/BomberGenericStorage.java

@@ -0,0 +1,37 @@
+import java.util.ArrayList;
+import java.util.HashMap;
+public class BomberGenericStorage {
+    final HashMap<String, BomberGenericCollection<DrawingAir, DrawingObjectPlane>> planeStorages;
+    private final int _pictureWidth;
+    private final int _pictureHeight;
+
+    public BomberGenericStorage(int pictureWidth, int pictureHeight){
+        planeStorages = new HashMap<>();
+        _pictureWidth = pictureWidth;
+        _pictureHeight = pictureHeight;
+    }
+    public ArrayList<String> Keys(){
+        return new ArrayList<>(planeStorages.keySet());
+    }
+    public void AddSet(String name){
+        if(planeStorages.containsKey(name))
+            return;
+        planeStorages.put(name, new BomberGenericCollection<>(_pictureWidth, _pictureHeight));
+    }
+
+    public void DelSet(String name){
+        if(!planeStorages.containsKey(name))
+            return;
+        planeStorages.remove(name);
+    }
+
+    public BomberGenericCollection<DrawingAir, DrawingObjectPlane> getCollection(String name){
+        if(!planeStorages.containsKey(name))
+            return null;
+        return planeStorages.get(name);
+    }
+
+    public DrawingAir getPlanes(String collectionName, int position){
+        return planeStorages.get(collectionName).Get(position);
+    }
+}

src/BomberTrashCollection.java

@@ -0,0 +1,16 @@
+import java.util.LinkedList;
+public class BomberTrashCollection<T extends DrawingAir> {
+    LinkedList<T> linkedList;
+    public BomberTrashCollection(){
+        linkedList = new LinkedList<>();
+    }
+    public void Push(T plane){
+        linkedList.push(plane);
+    }
+    public T Pop(){
+        return linkedList.pop();
+    }
+    public int GetSize(){
+        return linkedList.size();
+    }
+}

src/DrawingAir.java

@@ -2,31 +2,21 @@ import java.awt.*;
 
 public class DrawingAir {
     protected EntityAir entityAir;
-    protected void setEntityPlane(EntityAir entityPlane){
-        this.entityAir = entityAir;
-    }
-    public EntityAir getEntityPlane() {
+    protected void setEntityAir(EntityAir entityAir){this.entityAir = entityAir;}
+    public EntityAir getEntityAir() {
         return entityAir;
     }
     private IDrawEngines drawingEngines;
     private int _pictureWidth;
     private int _pictureHeight;
     protected int _startPosX;
-    public int getPosX(){
-        return _startPosX;
-    }
+    public int getPosX(){return _startPosX;}
     protected int _startPosY;
-    public int getPosY(){
-        return _startPosY;
-    }
+    public int getPosY(){return _startPosY;}
     private final int _PlaneWidth = 160;
-    public int getWidth() {
-        return _PlaneWidth;
-    }
+    public int getWidth(){return _PlaneWidth;}
     private final int _PlaneHeight = 160;
-    public int getHeight(){
-        return _PlaneHeight;
-    }
+    public int getHeight(){return _PlaneHeight;}
     public DrawingAir(int speed, double weight, Color bodyColor, int width, int height, int enginesType, int enginesNumber) {
         if (width < _PlaneWidth || height < _PlaneHeight)
             return;
@@ -35,21 +25,23 @@ public class DrawingAir {
         entityAir = new EntityAir(speed, weight, bodyColor);
         switch (enginesType){
             case 1:
-                drawingEngines = new DrawingEnginesSquare();
+                drawingEngines = new DrawingEnginesOval();
                 break;
             case 2:
                 drawingEngines = new DrawingEnginesRound();
                 break;
             default:
-                drawingEngines = new DrawingEnginesOval();
+                drawingEngines = new DrawingEnginesSquare();
                 break;
         }
         drawingEngines.setNumber(enginesNumber);
     }
-    public void setPosition(int x, int y)
-    {
-        if (x <= _pictureWidth - _PlaneWidth && x >= 0 && y <= _pictureHeight - _PlaneHeight && y >= 0)
-            x = y = 2;
+
+    public IMoveableObject GetMoveableObject() {return new DrawingObjectPlane(this);}
+
+    public void setPosition(int x, int y) {
+        if (x < 0 || y < 0 || x + _PlaneWidth > _pictureWidth || y + _PlaneHeight > _pictureHeight)
+            x = y = 0;
         _startPosX = x;
         _startPosY = y;
     }
@@ -111,33 +103,32 @@ public class DrawingAir {
             case RIGHT:
                 return _startPosX + entityAir.step.get().intValue() + _PlaneWidth < _pictureWidth;
             case DOWN:
-                return _startPosY + entityAir.step.get().intValue() + _PlaneWidth < _pictureWidth;
+                return _startPosY + entityAir.step.get().intValue() + _PlaneWidth < _pictureHeight;
             default:
                 return false;
         }
     }
     public void moveTransport(DirectionType direction)
     {
-        if (entityAir == null)
+        if (!canMove(direction) || entityAir == null)
             return;
-        int step = entityAir.step.get().intValue();
         switch (direction)
         {
+            //влево
             case LEFT:
-                if (_startPosX - step > 0)
-                    _startPosX -= step;
+                _startPosX -= entityAir.step.get().intValue();
                 break;
+            //вверх
             case UP:
-                if (_startPosY - step > 0)
-                    _startPosY -= step;
+                _startPosY -= entityAir.step.get().intValue();
                 break;
+            // вправо
             case RIGHT:
-                if (_startPosX + _PlaneWidth + step < _pictureWidth)
-                    _startPosX += step;
+                _startPosX += entityAir.step.get().intValue();
                 break;
+            //вниз
             case DOWN:
-                if (_startPosY + _PlaneHeight + step < _pictureHeight)
-                    _startPosY += step;
+                _startPosY += entityAir.step.get().intValue();
                 break;
         }
     }

src/DrawingEnginesOval.java

@@ -2,6 +2,22 @@ import java.awt.*;
 
 public class DrawingEnginesOval implements IDrawEngines{
     private EngineNumber number;
+
+    @Override
+    public int getType() {
+        return 1;
+    }
+
+    public int getNumber(){
+        int x = 0;
+        if(number == EngineNumber.TWO)
+            x = 2;
+        if(number == EngineNumber.FOUR)
+            x = 4;
+        if(number == EngineNumber.SIX)
+            x = 6;
+        return x;
+    }
     public void setNumber(int x){
         if(x <= 2)
             number = EngineNumber.TWO;
@@ -11,27 +27,15 @@ public class DrawingEnginesOval implements IDrawEngines{
             number = EngineNumber.SIX;
     }
     public void drawEngines(Graphics2D graphics2D, int _startX, int _startY){
-        graphics2D.fillOval(_startX+85, _startY+20, 20, 15);
-        graphics2D.fillRect(_startX+75, _startY+20, 20, 15);
-        graphics2D.fillOval(_startX+65, _startY+20, 20, 15);
-        graphics2D.fillOval(_startX+85, _startY+125, 20, 15);
-        graphics2D.fillRect(_startX+75, _startY+125, 20, 15);
-        graphics2D.fillOval(_startX+65, _startY+125, 20, 15);
+        graphics2D.fillRect(_startX+75, _startY+20, 15, 15);
+        graphics2D.fillRect(_startX+75, _startY+125, 15, 15);
         if (number == EngineNumber.FOUR || number == EngineNumber.SIX){
-            graphics2D.fillOval(_startX+85, _startY+40, 20, 15);
-            graphics2D.fillRect(_startX+75, _startY+40, 20, 15);
-            graphics2D.fillOval(_startX+65, _startY+40, 20, 15);
-            graphics2D.fillOval(_startX+85, _startY+105, 20, 15);
-            graphics2D.fillRect(_startX+75, _startY+105, 20, 15);
-            graphics2D.fillOval(_startX+65, _startY+105, 20, 15);
+            graphics2D.fillRect(_startX+75, _startY+40, 15, 15);
+            graphics2D.fillRect(_startX+75, _startY+105, 15, 15);
         }
         if (number == EngineNumber.SIX){
-            graphics2D.fillOval(_startX+145, _startY+50, 20, 15);
-            graphics2D.fillRect(_startX+135, _startY+50, 25, 15);
-            graphics2D.fillOval(_startX+125, _startY+50, 20, 15);
-            graphics2D.fillOval(_startX+145, _startY+95, 20, 15);
-            graphics2D.fillRect(_startX+135, _startY+95, 25, 15);
-            graphics2D.fillOval(_startX+125, _startY+95, 20, 15);
+            graphics2D.fillRect(_startX+140, _startY+50, 15, 15);
+            graphics2D.fillRect(_startX+140, _startY+95, 15, 15);
         }
     }
-}
+}

src/DrawingEnginesRound.java

@@ -1,7 +1,23 @@
 import java.awt.*;
 
-public class DrawingEnginesRound implements IDrawEngines{
+public class DrawingEnginesRound implements IDrawEngines {
     private EngineNumber number;
+
+    @Override
+    public int getType() {
+        return 2;
+    }
+
+    public int getNumber(){
+        int x = 0;
+        if(number == EngineNumber.TWO)
+            x = 2;
+        if(number == EngineNumber.FOUR)
+            x = 4;
+        if(number == EngineNumber.SIX)
+            x = 6;
+        return x;
+    }
     public void setNumber(int x){
         if(x <= 2)
             number = EngineNumber.TWO;
@@ -22,4 +38,4 @@ public class DrawingEnginesRound implements IDrawEngines{
             graphics2D.fillOval(_startX+135, _startY+95, 20, 15);
         }
     }
-}
+}

src/DrawingEnginesSquare.java

@@ -1,7 +1,23 @@
 import java.awt.*;
 
-public class DrawingEnginesSquare implements IDrawEngines{
+public class DrawingEnginesSquare implements IDrawEngines {
     private EngineNumber number;
+
+    @Override
+    public int getType() {
+        return 0;
+    }
+
+    public int getNumber(){
+        int x = 0;
+        if(number == EngineNumber.TWO)
+            x = 2;
+        if(number == EngineNumber.FOUR)
+            x = 4;
+        if(number == EngineNumber.SIX)
+            x = 6;
+        return x;
+    }
     public void setNumber(int x){
         if(x <= 2)
             number = EngineNumber.TWO;
@@ -11,15 +27,27 @@ public class DrawingEnginesSquare implements IDrawEngines{
             number = EngineNumber.SIX;
     }
     public void drawEngines(Graphics2D graphics2D, int _startX, int _startY){
-        graphics2D.fillRect(_startX+75, _startY+20, 15, 15);
-        graphics2D.fillRect(_startX+75, _startY+125, 15, 15);
+        graphics2D.fillOval(_startX+85, _startY+20, 20, 15);
+        graphics2D.fillRect(_startX+75, _startY+20, 20, 15);
+        graphics2D.fillOval(_startX+65, _startY+20, 20, 15);
+        graphics2D.fillOval(_startX+85, _startY+125, 20, 15);
+        graphics2D.fillRect(_startX+75, _startY+125, 20, 15);
+        graphics2D.fillOval(_startX+65, _startY+125, 20, 15);
         if (number == EngineNumber.FOUR || number == EngineNumber.SIX){
-            graphics2D.fillRect(_startX+75, _startY+40, 15, 15);
-            graphics2D.fillRect(_startX+75, _startY+105, 15, 15);
+            graphics2D.fillOval(_startX+85, _startY+40, 20, 15);
+            graphics2D.fillRect(_startX+75, _startY+40, 20, 15);
+            graphics2D.fillOval(_startX+65, _startY+40, 20, 15);
+            graphics2D.fillOval(_startX+85, _startY+105, 20, 15);
+            graphics2D.fillRect(_startX+75, _startY+105, 20, 15);
+            graphics2D.fillOval(_startX+65, _startY+105, 20, 15);
         }
         if (number == EngineNumber.SIX){
-            graphics2D.fillRect(_startX+140, _startY+50, 15, 15);
-            graphics2D.fillRect(_startX+140, _startY+95, 15, 15);
+            graphics2D.fillOval(_startX+145, _startY+50, 20, 15);
+            graphics2D.fillRect(_startX+135, _startY+50, 25, 15);
+            graphics2D.fillOval(_startX+125, _startY+50, 20, 15);
+            graphics2D.fillOval(_startX+145, _startY+95, 20, 15);
+            graphics2D.fillRect(_startX+135, _startY+95, 25, 15);
+            graphics2D.fillOval(_startX+125, _startY+95, 20, 15);
         }
     }
 }

src/DrawingObjectAirBomber.java

@@ -5,15 +5,15 @@ public class DrawingObjectAirBomber implements IMoveableObject{
         this.drawingAir = drawingPlane;
     }
     public ObjectParameters getObjectPosition(){
-        if(drawingAir == null || drawingAir.getEntityPlane() == null)
+        if(drawingAir == null || drawingAir.getEntityAir() == null)
             return null;
         return new ObjectParameters(drawingAir.getPosX(), drawingAir.getPosY(),
                 drawingAir.getWidth(), drawingAir.getHeight());
     }
     public int getStep(){
-        if(drawingAir.getEntityPlane() == null)
+        if(drawingAir.getEntityAir() == null)
             return 0;
-        return drawingAir.getEntityPlane().step.get().intValue();
+        return drawingAir.getEntityAir().step.get().intValue();
     }
     public boolean checkCanMove(DirectionType direction){
         if(drawingAir == null)

src/DrawingObjectPlane.java

@@ -0,0 +1,25 @@
+public class DrawingObjectPlane implements IMoveableObject{
+    private final DrawingAir drawingPlane;
+    public DrawingObjectPlane(DrawingAir drawingPlane){
+        this.drawingPlane = drawingPlane;
+    }
+    public ObjectParameters getObjectPosition(){
+        if(drawingPlane == null || drawingPlane.getEntityAir() == null)
+            return null;
+        return new ObjectParameters(drawingPlane.getPosX(), drawingPlane.getPosY(),
+                drawingPlane.getWidth(), drawingPlane.getHeight());
+    }
+    public int getStep(){
+        if(drawingPlane.getEntityAir() == null)
+            return 0;
+        return drawingPlane.getEntityAir().step.get().intValue();
+    }
+    public boolean checkCanMove(DirectionType direction){
+        if(drawingPlane == null)
+            return false;
+        return drawingPlane.canMove(direction);
+    }
+    public void moveObject(DirectionType direction){
+        drawingPlane.moveTransport(direction);
+    }
+}

src/EntityAir.java

@@ -1,21 +1,19 @@
 import java.awt.*;
 import java.util.function.Supplier;
-
 public class EntityAir {
     private int speed;
-    public int getSpeed(){
+    public int getSpeed() {
         return speed;
     }
     private double weight;
-    public double getWeight(){
+    public double getWeight() {
         return weight;
     }
     private Color bodyColor;
-    public Color getBodyColor(){
+    public Color getBodyColor() {
         return bodyColor;
     }
-    public Supplier<Double> step = () ->(double) speed * 100 / weight;
-
+    public Supplier<Double> step = () -> (double) speed * 100 / weight;
     public EntityAir(int speed, double weight, Color bodyColor){
         this.speed = speed;
         this.weight = weight;

src/EntityAirBomber.java

@@ -1,5 +1,6 @@
 import java.awt.*;
-public class EntityAirBomber extends EntityAir{
+
+public class EntityAirBomber extends EntityAir {
     private Color additionalColor;
     public Color getAdditionalColor(){
         return additionalColor;
@@ -13,7 +14,7 @@ public class EntityAirBomber extends EntityAir{
         return isBombs;
     }
     public EntityAirBomber(int speed, double weight, Color bodyColor, Color
-            additionalColor, boolean isFuel, boolean isBombs) {
+            additionalColor, boolean isBombs, boolean isFuel) {
         super(speed, weight, bodyColor);
         this.additionalColor = additionalColor;
         this.isFuel = isFuel;

src/FrameAirBomber.java

@@ -6,8 +6,14 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Random;
 public class FrameAirBomber extends JFrame {
-    private DrawingAir drawingAir;
+    private DrawingAir drawingPlane;
     private AbstractStrategy abstractStrategy;
+    public JButton selectPlaneButton;
+
+    private DrawingAir selectedPlane;
+    public DrawingAir getSelectedPlane() {
+        return selectedPlane;
+    }
     private JComboBox comboBoxStrategy;
     private final JComponent pictureBox;
     public FrameAirBomber() throws IOException {
@@ -18,8 +24,9 @@ public class FrameAirBomber extends JFrame {
         pictureBox = new JComponent(){
             public void paintComponent(Graphics graphics){
                 super.paintComponent(graphics);
+                setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
                 Graphics2D graphics2D = (Graphics2D) graphics;
-                if (drawingAir != null) drawingAir.drawTransport(graphics2D);
+                if (drawingPlane != null) drawingPlane.drawTransport(graphics2D);
                 super.repaint();
             }
         };
@@ -31,6 +38,7 @@ public class FrameAirBomber extends JFrame {
         JButton leftButton = new JButton(new ImageIcon(ImageIO.read(new File("images/left.png"))));
         JButton upButton = new JButton(new ImageIcon(ImageIO.read(new File("images/up.png"))));
         JButton downButton = new JButton(new ImageIcon(ImageIO.read(new File("images/down.png"))));
+        selectPlaneButton = new JButton("Выбрать самолет");
         pictureBox.setBounds( 0, 0, getContentPane().getWidth(), getContentPane().getHeight());
         //ActionListeners and ActionCommand addition
         createPlaneButton.addActionListener(e -> buttonCreatePlaneClick());
@@ -59,6 +67,9 @@ public class FrameAirBomber extends JFrame {
         constraints.gridx = 1;
         constraints.gridy = 0;
         createPanel.add(createAirBomberButton, constraints);
+        constraints.gridx = 2;
+        constraints.gridy = 0;
+        createPanel.add(selectPlaneButton, constraints);
         //movementPanel
         JPanel movementPanel = new JPanel(new GridBagLayout());
         rightButton.setPreferredSize(new Dimension(30,30));
@@ -98,21 +109,24 @@ public class FrameAirBomber extends JFrame {
     private void buttonCreateAirBomberClick() {
         Random random = new Random();
         pictureBox.setBounds(0,0,getContentPane().getWidth(),getContentPane().getHeight());
-        drawingAir = new DrawingAirBomber(random.nextInt(200) + 100, random.nextInt(2000) + 1000, new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),
-                new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)), random.nextBoolean(), random.nextBoolean(), pictureBox.getWidth(), pictureBox.getHeight(), random.nextInt(3),(random.nextInt(3)+1)*2);
-        drawingAir.setPosition(random.nextInt(90) + 10, random.nextInt(90) + 10);
+        Color bodyColor = JColorChooser.showDialog(null, "Choose a color", Color.RED);
+        Color additionalColor = JColorChooser.showDialog(null, "Choose a color", Color.RED);
+        drawingPlane = new DrawingAirBomber(random.nextInt(200) + 100, random.nextInt(2000) + 1000, bodyColor,
+                additionalColor, random.nextBoolean(), random.nextBoolean(), pictureBox.getWidth(), pictureBox.getHeight(), random.nextInt(3),(random.nextInt(3)+1)*2);
+        drawingPlane.setPosition(random.nextInt(90) + 10, random.nextInt(90) + 10);
         draw();
     }
     private void buttonCreatePlaneClick(){
         Random random = new Random();
         pictureBox.setBounds(0,0,getContentPane().getWidth(),getContentPane().getHeight());
-        drawingAir = new DrawingAir(random.nextInt(200) + 100, random.nextInt(2000) + 1000, new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),
+        Color bodyColor = JColorChooser.showDialog(null, "Choose a color", Color.RED);
+        drawingPlane = new DrawingAir(random.nextInt(200) + 100, random.nextInt(2000) + 1000, bodyColor,
                 pictureBox.getWidth(), pictureBox.getHeight(), random.nextInt(3),(random.nextInt(3)+1)*2);
-        drawingAir.setPosition(random.nextInt(90) + 10, random.nextInt(90) + 10);
+        drawingPlane.setPosition(random.nextInt(90) + 10, random.nextInt(90) + 10);
         draw();
     }
     private void buttonStepClick(){
-        if (drawingAir == null) {
+        if (drawingPlane == null) {
             return;
         }
         if (comboBoxStrategy.isEnabled()) {
@@ -132,7 +146,7 @@ public class FrameAirBomber extends JFrame {
             {
                 return;
             }
-            abstractStrategy.SetData(new DrawingObjectAirBomber(drawingAir), pictureBox.getWidth(),
+            abstractStrategy.SetData(new DrawingObjectPlane(drawingPlane), pictureBox.getWidth(),
                     pictureBox.getHeight());
             comboBoxStrategy.setEnabled(false);
         }
@@ -149,28 +163,41 @@ public class FrameAirBomber extends JFrame {
         }
     }
     private void buttonMoveClick(ActionEvent event) {
-        if(drawingAir == null || drawingAir.getEntityPlane() == null)
+        if(drawingPlane == null || drawingPlane.getEntityAir() == null)
             return;
         switch (event.getActionCommand())
         {
             case "left":
-                drawingAir.moveTransport(DirectionType.LEFT);
+                drawingPlane.moveTransport(DirectionType.LEFT);
                 break;
             case "right":
-                drawingAir.moveTransport(DirectionType.RIGHT);
+                drawingPlane.moveTransport(DirectionType.RIGHT);
                 break;
             case "up":
-                drawingAir.moveTransport(DirectionType.UP);
+                drawingPlane.moveTransport(DirectionType.UP);
                 break;
             case "down":
-                drawingAir.moveTransport(DirectionType.DOWN);
+                drawingPlane.moveTransport(DirectionType.DOWN);
                 break;
         }
         draw();
     }
     private void draw() {
-        if (drawingAir == null)
+        if (drawingPlane == null)
             return;
         pictureBox.repaint();
     }
+    public void select(){
+        if (drawingPlane == null) {
+            return;
+        }
+        selectedPlane = drawingPlane;
+    }
+
+    public void ChangePlane(DrawingAir newPlane){
+        drawingPlane = newPlane;
+        drawingPlane.setPosition(0,0);
+        pictureBox.setBounds(0,0,getContentPane().getWidth(),getContentPane().getHeight());
+        draw();
+    }
 }

src/FrameHard.java

@@ -0,0 +1,77 @@
+import javax.swing.*;
+import java.awt.*;
+import java.util.Random;
+
+public class FrameHard extends JFrame {
+    HardGeneric<EntityAir, IDrawEngines> generic;
+    DrawingAir drawing;
+    private JComponent pictureBox;
+    private final int pictureBoxWidth = 500;
+    private final int pictureBoxHeight = 200;
+
+    public FrameHard() {
+        setLocationRelativeTo(null);
+        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        pictureBox = new JComponent() {
+            public void paintComponent(Graphics graphics) {
+                super.paintComponent(graphics);
+                Graphics2D graphics2D = (Graphics2D) graphics;
+                if (drawing != null) drawing.drawTransport(graphics2D);
+                super.repaint();
+            }
+        };
+        pictureBox.setPreferredSize(new Dimension(pictureBoxWidth, pictureBoxHeight));
+        JButton buttonMakeObject = new JButton("Создать новый объект");
+        buttonMakeObject.setPreferredSize(new Dimension(150, 30));
+        JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
+        buttonPanel.add(buttonMakeObject);
+        Random rand = new Random();
+        int size = rand.nextInt(1, 10);
+        generic = new HardGeneric<>(size, size, pictureBoxWidth, pictureBoxHeight);
+        for (int i = 0; i < size; i++) {
+            generic.InsertPlanes(makeRandomPlane());
+            generic.InsertEngine(makeRandomEngine());
+        }
+        buttonMakeObject.addActionListener(e -> {
+            DrawingAir drawingPlane = generic.makeObject();
+            drawingPlane.setPosition(pictureBoxWidth / 2 - drawingPlane.getWidth() / 2, pictureBoxHeight / 2 - drawingPlane.getHeight() / 2);
+            drawing = drawingPlane;
+            draw();
+        });
+        setLayout(new BorderLayout());
+        add(pictureBox, BorderLayout.CENTER);
+        add(buttonPanel, BorderLayout.SOUTH);
+        pack();
+        setVisible(true);
+    }
+
+    public EntityAir makeRandomPlane() {
+        Random rand = new Random();
+        EntityAir plane;
+        switch (rand.nextInt(2)){
+            case 1 -> plane = new EntityAirBomber(rand.nextInt(100, 300), rand.nextDouble(1000, 3000),
+                    new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)),
+                    new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)),
+                    rand.nextBoolean(), rand.nextBoolean());
+            default -> plane = new EntityAir(rand.nextInt(100, 300), rand.nextDouble(1000, 3000),
+                    new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)));
+        }
+        return plane;
+    }
+
+    public IDrawEngines makeRandomEngine() {
+        Random random = new Random();
+        IDrawEngines engines;
+        switch (random.nextInt(3)) {
+            case 1 -> engines = new DrawingEnginesOval();
+            case 2 -> engines = new DrawingEnginesRound();
+            default -> engines = new DrawingEnginesSquare();
+        }
+        engines.setNumber((random.nextInt(3) + 1) * 2);
+        return engines;
+    }
+
+    void draw() {
+        pictureBox.repaint();
+    }
+}

src/FramePlaneCollection.java

@@ -0,0 +1,194 @@
+import javax.swing.*;
+import javax.swing.border.StrokeBorder;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Objects;
+
+public class FramePlaneCollection extends JFrame {
+    private BomberTrashCollection<DrawingAir> trashCollection = new BomberTrashCollection<>();
+    private final BomberGenericStorage storage;
+    private JComponent pictureBoxCollection;
+    private TextField textFieldNumber;
+    private TextField textFieldStorageName;
+    private JList<String> listStorages;
+    private DefaultListModel<String> listModel;
+    public FramePlaneCollection(){
+        super("Набор самолетов");
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        createGui();
+        pack();
+        storage = new BomberGenericStorage(pictureBoxCollection.getWidth(), pictureBoxCollection.getHeight());
+        setVisible(true);
+    }
+    private void createGui(){
+        //components initialisation
+        pictureBoxCollection = new JComponent(){
+            public void paintComponent(Graphics graphics){
+                super.paintComponent(graphics);
+                Graphics2D graphics2D = (Graphics2D) graphics;
+                if (listStorages == null || storage == null)
+                    return;
+                var collection = storage.getCollection(listStorages.getSelectedValue());
+                if (collection == null)
+                    return;
+                collection.ShowPlanes(graphics2D);
+                super.repaint();
+            }
+        };
+        pictureBoxCollection.setPreferredSize(new Dimension(700, 600));
+        JButton buttonAddPlane = new JButton("Добавить самолет");
+        textFieldNumber = new TextField();
+        JButton buttonRemovePlane = new JButton("Удалить самолет");
+        JButton buttonRefreshCollection = new JButton("Обновить коллекцию");
+        JButton buttonAddSet = new JButton("Добавить набор");
+        JButton buttonDeleteSet = new JButton("Удалить набор");
+        JButton buttonTrash = new JButton("Корзина");
+        textFieldStorageName = new TextField();
+        listModel = new DefaultListModel<>();
+        JScrollPane scrollPane = new JScrollPane();
+        listStorages= new JList<>(listModel);
+        scrollPane.setViewportView(listStorages);
+        //ActionListeners and ActionCommand addition
+        buttonAddSet.addActionListener(e -> buttonAddSet_Click());
+        buttonDeleteSet.addActionListener(e -> buttonDeleteSet_Click());
+        buttonAddPlane.addActionListener(e -> buttonAddPlaneClick());
+        buttonRemovePlane.addActionListener(e -> buttonRemovePlaneClick());
+        buttonRefreshCollection.addActionListener(e -> buttonRefreshCollectionClick());
+        buttonTrash.addActionListener(e->buttonTrashClick());
+        //panels and constraints initialisation
+        JPanel panelTools = new JPanel(new GridBagLayout());
+        panelTools.setBorder(new StrokeBorder(new BasicStroke(3)));
+        panelTools.setToolTipText("Инструменты");
+        JPanel panelSets = new JPanel(new GridBagLayout());
+        panelSets.setBorder(new StrokeBorder(new BasicStroke(3)));
+        panelSets.setToolTipText("Наборы");
+        GridBagConstraints constraints = new GridBagConstraints();
+        constraints.insets.left = constraints.insets.right = 5;
+        constraints.insets.top = constraints.insets.bottom = 5;
+        constraints.fill = GridBagConstraints.BOTH;
+        //addition to panelSets
+        constraints.gridx = 0;
+        constraints.gridy = 0;
+        panelSets.add(textFieldStorageName, constraints);
+        constraints.gridx = 0;
+        constraints.gridy = 1;
+        panelSets.add(buttonAddSet, constraints);
+        constraints.gridx = 0;
+        constraints.gridy = 2;
+        panelSets.add(scrollPane, constraints);
+        constraints.gridx = 0;
+        constraints.gridy = 3;
+        panelSets.add(buttonDeleteSet, constraints);
+        //addition to panelTools
+        constraints.gridx = 0;
+        constraints.gridy = 0;
+        panelTools.add(panelSets, constraints);
+        constraints.gridx = 0;
+        constraints.gridy = 1;
+        panelTools.add(buttonAddPlane, constraints);
+        constraints.gridx = 0;
+        constraints.gridy = 2;
+        panelTools.add(textFieldNumber, constraints);
+        constraints.gridx = 0;
+        constraints.gridy = 3;
+        panelTools.add(buttonRemovePlane, constraints);
+        constraints.gridx = 0;
+        constraints.gridy = 4;
+        panelTools.add(buttonRefreshCollection, constraints);
+        constraints.gridx = 0;
+        constraints.gridy = 5;
+        panelTools.add(buttonTrash, constraints);
+        //addition to frame
+        setLayout(new BorderLayout());
+        add(panelTools, BorderLayout.EAST);
+        add(pictureBoxCollection, BorderLayout.CENTER);
+    }
+    private void reloadObjects(){
+        int index = listStorages.getSelectedIndex();
+        listModel.clear();
+        ArrayList<String> keys = storage.Keys();
+        for (String key : keys) {
+            listModel.addElement(key);
+        }
+        if(listModel.size() > 0 && (index == -1 || index >= listModel.size()))
+            listStorages.setSelectedIndex(0);
+        else if(listModel.size() > 0)
+            listStorages.setSelectedIndex(index);
+    }
+    public void buttonAddSet_Click() {
+        if(textFieldStorageName.getText() == null ) {
+            JOptionPane.showMessageDialog(this, "Не все данные заполнены");
+            return;
+        }
+        String name = textFieldStorageName.getText();
+        if (Objects.equals(name, "")) {
+            JOptionPane.showMessageDialog(this, "Не все данные заполнены");
+            return;
+        }
+        storage.AddSet(name);
+        reloadObjects();
+    }
+    public void buttonDeleteSet_Click() {
+        if (listStorages.getSelectedIndex() == -1)
+            return;
+        storage.DelSet(listStorages.getSelectedValue());
+        reloadObjects();
+    }
+    private void buttonAddPlaneClick() {
+        if (listStorages.getSelectedIndex() == -1)
+            return;
+        var obj = storage.getCollection(listStorages.getSelectedValue());
+        if (obj == null)
+            return;
+        FrameAirBomber form;
+        try {
+            form = new FrameAirBomber();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        form.selectPlaneButton.addActionListener(e->{
+            form.select();
+            DrawingAir plane = form.getSelectedPlane();
+            form.dispose();
+            if (obj.Insert(plane)) {
+                JOptionPane.showMessageDialog(this, "Объект добавлен");
+                pictureBoxCollection.repaint();
+            }
+            else {
+                JOptionPane.showMessageDialog(this, "Не удалось добавить объект");
+            }
+        });
+    }
+    private void buttonRemovePlaneClick(){
+        if (listStorages.getSelectedIndex() == -1)
+            return;
+        var obj = storage.getCollection(listStorages.getSelectedValue());
+        if (obj == null)
+            return;
+        int pos = Integer.parseInt(textFieldNumber.getText());
+        var plane = obj.Get(pos);
+        if (obj.Remove(pos)){
+            JOptionPane.showMessageDialog(this, "Объект удален");
+            trashCollection.Push(plane);
+            pictureBoxCollection.repaint();
+        }
+        else{
+            JOptionPane.showMessageDialog(this, "Не удалось удалить объект");
+        }
+    }
+    private void buttonRefreshCollectionClick(){
+        pictureBoxCollection.repaint();
+    }
+    private void buttonTrashClick(){
+        if(trashCollection.GetSize() == 0)
+            return;
+        try {
+            FrameAirBomber form = new FrameAirBomber();
+            form.ChangePlane(trashCollection.Pop());
+        } catch (Exception e){
+            throw new RuntimeException();
+        }
+    }
+}

src/HardGeneric.java

@@ -0,0 +1,51 @@
+import java.util.Random;
+
+public class HardGeneric<T extends EntityAir, U extends IDrawEngines> {
+    T[] planes;
+    U[] engines;
+    private int planesNumber;
+    private int enginesNumber;
+    private int pictureBoxWidth;
+    private int pictureBoxHeight;
+
+    public HardGeneric(int planesCount, int enginesCount, int width, int height) {
+        planesNumber = 0;
+        enginesNumber = 0;
+        planes = (T[]) new EntityAir[planesCount];
+        engines = (U[]) new IDrawEngines[enginesCount];
+        pictureBoxHeight = height;
+        pictureBoxWidth = width;
+    }
+
+    public int InsertPlanes(T entityPlane) {
+        if (planes[planes.length - 1] != null)
+            return -1;
+        for (int i = planesNumber - 1; i >= 0; i--) {
+            planes[i + 1] = planes[i];
+        }
+        planesNumber++;
+        planes[0] = entityPlane;
+        return 0;
+    }
+
+    public int InsertEngine(U engine) {
+        if (engines[engines.length - 1] != null)
+            return -1;
+        for (int i = enginesNumber - 1; i >= 0; i--) {
+            engines[i + 1] = engines[i];
+        }
+        enginesNumber++;
+        engines[0] = engine;
+        return 0;
+    }
+
+    public DrawingAir makeObject() {
+        Random rand = new Random();
+        EntityAir entity = planes[rand.nextInt(0, planesNumber)];
+        IDrawEngines engine = engines[rand.nextInt(0, enginesNumber)];
+        if(entity instanceof EntityAirBomber)
+            return new DrawingAirBomber(entity.getSpeed(), entity.getWeight(), entity.getBodyColor(), ((EntityAirBomber) entity).getAdditionalColor(),
+                    ((EntityAirBomber) entity).getBombs(), ((EntityAirBomber) entity).getFuel(), pictureBoxWidth, pictureBoxHeight, engine.getType(), engine.getNumber());
+        return new DrawingAir(entity.getSpeed(), entity.getWeight(), entity.getBodyColor(), pictureBoxWidth, pictureBoxHeight, engine.getType(), engine.getNumber());
+    }
+}

src/IDrawEngines.java

@@ -1,6 +1,8 @@
 import java.awt.*;
 
 public interface IDrawEngines {
+    public int getType();
+    public int getNumber();
     public void setNumber(int x);
     public void drawEngines(Graphics2D graphics2D, int _startX, int _startY);
 }

src/Main.java

@@ -1,5 +1,5 @@
 import java.io.IOException;
 
 public class Main {
-    public static void main(String[] args) throws IOException { new FrameAirBomber(); }
+    public static void main(String[] args) throws IOException { new FramePlaneCollection(); }
 }

src/MoveToBorder.java

@@ -5,7 +5,7 @@ public class MoveToBorder extends AbstractStrategy{
         if(objParams == null)
             return false;
         return objParams.getRightBorder() + GetStep() >= getFieldWidth() &&
-                objParams.getDownBorder() + GetStep() >= getFieldHeight();
+        objParams.getDownBorder() + GetStep() >= getFieldHeight();
     }
     @Override
     protected void MoveToTarget() {

src/MoveToCenter.java

@@ -5,9 +5,9 @@ public class MoveToCenter extends AbstractStrategy{
         if(objParams == null)
             return false;
         return objParams.getObjectMiddleHorizontal() <= getFieldWidth() / 2 &&
-                objParams.getObjectMiddleHorizontal()+GetStep() >= getFieldWidth() / 2 &&
-                objParams.getObjectMiddleVertical() <= getFieldHeight() / 2 &&
-                objParams.getObjectMiddleVertical() + GetStep() >= getFieldHeight() / 2;
+        objParams.getObjectMiddleHorizontal()+GetStep() >= getFieldWidth() / 2 &&
+        objParams.getObjectMiddleVertical() <= getFieldHeight() / 2 &&
+        objParams.getObjectMiddleVertical() + GetStep() >= getFieldHeight() / 2;
     }
     @Override
     protected void MoveToTarget() {

src/ObjectParameters.java

@@ -1,19 +1,19 @@
 public class ObjectParameters {
-    private final int _x;
-    private final int _y;
-    private final int _width;
-    private final int _height;
-    public int getLeftBorder() {return _x;}
-    public int getTopBorder() {return _y;}
-    public int getRightBorder() {return _x + _width;}
-    public int getDownBorder() {return _y + _height;}
-    public int getObjectMiddleHorizontal() {return _x + this._width / 2;}
-    public int getObjectMiddleVertical() {return _y + this._height / 2;}
+    private final int POS_X;
+    private final int POS_Y;
+    private final int WIDTH;
+    private final int HEIGHT;
+    public int getLeftBorder() {return POS_X;}
+    public int getTopBorder() {return POS_Y;}
+    public int getRightBorder() {return POS_X + WIDTH;}
+    public int getDownBorder() {return POS_Y + HEIGHT;}
+    public int getObjectMiddleHorizontal() {return POS_X + this.WIDTH / 2;}
+    public int getObjectMiddleVertical() {return POS_Y + this.HEIGHT / 2;}
     public ObjectParameters(int x, int y, int width, int height)
     {
-        _x = x;
-        _y = y;
-        _width = width;
-        _height = height;
+        POS_X = x;
+        POS_Y = y;
+        WIDTH = width;
+        HEIGHT = height;
     }
 }

src/SetGeneric.java

@@ -0,0 +1,42 @@
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SetGeneric<T>{
+    private final ArrayList<T> places;
+    private final int maxCount;
+    public int getCount() {return places.size();}
+    public SetGeneric(int count){
+        maxCount = count;
+        places = new ArrayList<>();
+    }
+    public boolean insert(T plane){
+        return insert(plane, 0);
+    }
+    public boolean insert(T plane, int position){
+        if (!(position >= 0 && position <= places.size() && places.size() < maxCount))
+            return false;
+        places.add(position, plane);
+        return true;
+    }
+    public boolean remove(int position){
+        if(!(position >= 0 && position < places.size()))
+            return false;
+        places.remove(position);
+        return true;
+    }
+    public T Get(int position){
+        if(!(position >= 0 && position < getCount()))
+            return null;
+        return places.get(position);
+    }
+    public ArrayList<T> getPlanes(int maxPlanes){
+        ArrayList<T> toRet = new ArrayList<>();
+        for(int i = 0; i < places.size(); i++){
+            toRet.add(places.get(i));
+            if(i == maxPlanes)
+                return toRet;
+        }
+        return toRet;
+    }
+}