Готовая Лабораторная 4

Tank/.gitignore

@@ -0,0 +1,29 @@
+### IntelliJ IDEA ###
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

Tank/.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

Tank/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="19" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

Tank/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Tank.iml" filepath="$PROJECT_DIR$/Tank.iml" />
+    </modules>
+  </component>
+</project>

Tank/.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

Tank/Tank.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

Tank/src/AbstractStrategy.java

@@ -0,0 +1,93 @@
+public abstract class AbstractStrategy {
+    // Перемещаемый объект
+    private IMoveableObject _moveableObject;
+
+    // Статус перемещения
+    private Status _state = Status.NotInit;
+
+    // Ширина поля
+    protected int FieldWidth;
+
+    // Высота поля
+    protected int FieldHeight;
+
+    // Статус перемещения
+    public Status GetStatus() {
+        return _state;
+    }
+
+    // Установка данных
+    public void SetData(IMoveableObject moveableObject, int width, int height) {
+        if (moveableObject == null) {
+            _state = Status.NotInit;
+            return;
+        }
+        _state = Status.InProgress;
+        _moveableObject = moveableObject;
+        FieldWidth = width;
+        FieldHeight = height;
+    }
+
+    // Шаг перемещения
+    public void MakeStep() {
+        if (_state != Status.InProgress) {
+            return;
+        }
+        if (IsTargetDestination()) {
+            _state = Status.Finish;
+            return;
+        }
+        MoveToTarget();
+    }
+
+    // Перемещение влево
+    protected boolean MoveLeft() {
+        return MoveTo(Direction.Left);
+    }
+
+    // Перемещение вправо
+    protected boolean MoveRight() {
+        return MoveTo(Direction.Right);
+    }
+
+    // Перемещение вверх
+    protected boolean MoveUp() {
+        return MoveTo(Direction.Up);
+    }
+
+    // Перемещение вниз
+    protected boolean MoveDown() {
+        return MoveTo(Direction.Down);
+    }
+
+    // Параметры объекта
+    protected ObjectParameters GetObjectParameters() {
+        return _moveableObject.GetObjectPosition();
+    }
+
+    // Шаг объекта
+    protected int GetStep() {
+        if (_state != Status.InProgress) {
+            return 0;
+        }
+        return _moveableObject.GetStep();
+    }
+
+    // Перемещение к цели
+    protected abstract void MoveToTarget();
+
+    // Достигнута ли цель
+    protected abstract boolean IsTargetDestination();
+
+    // Попытка перемещения в требуемом направлении
+    private boolean MoveTo(Direction Direction) {
+        if (_state != Status.InProgress) {
+            return false;
+        }
+        if (_moveableObject.CheckCanMove(Direction)) {
+            _moveableObject.MoveObject(Direction);
+            return true;
+        }
+        return false;
+    }
+}

Tank/src/CountWheels.java

@@ -0,0 +1,13 @@
+public enum CountWheels {
+    Two(2),
+    Three(3),
+    Four(4),
+    Five(5);
+    private final int Value;
+    CountWheels(int Count){
+        Value = Count;
+    }
+    public int getCountWheels(){
+        return Value;
+    }
+}

Tank/src/Direction.java

@@ -0,0 +1,6 @@
+public enum Direction {
+    Up,
+    Left,
+    Down,
+    Right
+}

Tank/src/DoubleParametrized.java

@@ -0,0 +1,42 @@
+import java.util.ArrayList;
+import java.util.Random;
+
+public class DoubleParametrized<T extends EntityArmoVehicle, U extends IOrnamentForm> {
+    ArrayList<T> Tanks;
+    ArrayList<U> Wheels;
+
+    public DoubleParametrized() {
+        Tanks = new ArrayList<>();
+        Wheels = new ArrayList<>();
+    }
+
+    public void Add(T tanks) {
+        Tanks.add(tanks);
+    }
+
+    public void Add(U wheels) {
+        Wheels.add(wheels);
+    }
+
+    public DrawingArmoVehicle GenerateTank(int pictureWidth, int pictureHeight) {
+        Random rand = new Random();
+        if(Tanks.isEmpty()) {
+            return null;
+        }
+
+        T tanks = Tanks.get(rand.nextInt(Tanks.size()));
+        U wheel = null;
+
+        if(!Wheels.isEmpty()){
+            wheel = Wheels.get(rand.nextInt(Wheels.size()));
+        }
+
+        DrawingArmoVehicle drawingArmoVehicle;
+        if (tanks instanceof EntityTank) {
+            drawingArmoVehicle = new DrawingTank((EntityTank) tanks, wheel, pictureWidth, pictureHeight);
+        } else {
+            drawingArmoVehicle = new DrawingArmoVehicle(tanks, wheel, pictureWidth, pictureHeight);
+        }
+        return drawingArmoVehicle;
+    }
+}

Tank/src/DrawingArmoVehicle.java

@@ -0,0 +1,132 @@
+import java.awt.*;
+import java.util.Random;
+
+public class DrawingArmoVehicle {
+    protected IOrnamentForm OrnamentsForm;
+    public EntityArmoVehicle ArmoVehicle;
+    protected int _pictureWidth;
+    protected int _pictureHeight;
+    protected int _startPosX;
+    protected int _startPosY;
+    protected int _TankWidth = 160;
+    protected int _TankHeight = 55;
+    public IMoveableObject GetMoveableObject() {
+        return new DrawingObjectTank(this);
+    }
+
+    public DrawingArmoVehicle(int speed, double weight, Color bodyColor, int _numWheel, int width, int height) {
+        _pictureWidth = width;
+        _pictureHeight = height;
+        if (_pictureHeight < _TankHeight || _pictureWidth < _TankWidth)
+            return;
+        ArmoVehicle = new EntityArmoVehicle(speed, weight, bodyColor, _numWheel);
+
+        Random random = new Random();
+        switch(random.nextInt(0, 3)) {
+            case 0:
+                OrnamentsForm = new DrawingWheelsCombination();
+                break;
+            case 1:
+                OrnamentsForm = new DrawingStarOrnament();
+                break;
+            case 2:
+                OrnamentsForm = new DrawingSuspensionOrnament();
+                break;
+            default:
+                OrnamentsForm = new DrawingWheelsCombination();
+                break;
+        }
+        OrnamentsForm.setDigit(_numWheel);
+    }
+
+    protected DrawingArmoVehicle(EntityArmoVehicle vehicle, IOrnamentForm ornamentsForm, int width, int height) {
+        if (height < _pictureHeight || width < _pictureWidth)
+            return;
+        _pictureWidth = width;
+        _pictureHeight = height;
+        ArmoVehicle = vehicle;
+        OrnamentsForm = ornamentsForm;
+        OrnamentsForm.setDigit(ArmoVehicle.numWheel);
+    }
+
+    public void SetPosition(int x, int y) {
+        _startPosX = Math.min(x, _pictureWidth - _TankWidth);
+        _startPosY = Math.min(y, _pictureHeight - _TankHeight);
+    }
+
+    public int GetPosX () {
+        return _startPosX;
+    }
+
+    public int GetPosY () {
+        return _startPosY;
+    }
+
+    public int GetWidth () {
+        return _TankWidth;
+    }
+
+    public int GetHeight () {
+        return _TankHeight;
+    }
+
+    public boolean CanMove(Direction direction) {
+        if (ArmoVehicle == null) {
+            return false;
+        }
+        switch (direction) {
+            case Left:
+                return _startPosX - ArmoVehicle.Step > 0;
+            case Right:
+                return _startPosX + _TankWidth + ArmoVehicle.Step < _pictureWidth;
+            case Up:
+                return _startPosY - ArmoVehicle.Step > 0;
+            case Down:
+                return _startPosY + _TankHeight + ArmoVehicle.Step < _pictureHeight;
+            default:
+                return false;
+        }
+    }
+
+    public void MoveTransport(Direction direction) {
+        if (!CanMove(direction) || ArmoVehicle == null) {
+            return;
+        }
+        switch (direction) {
+            //влево
+            case Left:
+                _startPosX -= (int)ArmoVehicle.Step;
+                break;
+            //вверх
+            case Up:
+                _startPosY -= (int)ArmoVehicle.Step;
+                break;
+            // вправо
+            case Right:
+                _startPosX += (int)ArmoVehicle.Step;
+                break;
+            //вниз
+            case Down:
+                _startPosY += (int)ArmoVehicle.Step;
+                break;
+        }
+    }
+
+    // Прорисовка объекта
+    public void DrawTransport(Graphics2D g) {
+        if (ArmoVehicle == null) {
+            return;
+        }
+
+        // body
+        g.setColor(ArmoVehicle.BodyColor);
+        int[] xPoints = {_startPosX + 5, _startPosX + 140, _startPosX + 130, _startPosX + 12};
+        int[] yPoints = {_startPosY + 30, _startPosY + 30, _startPosY + 42, _startPosY + 42};
+        int nPoints = xPoints.length;
+        g.drawPolygon(xPoints, yPoints, nPoints);
+        g.fillPolygon(xPoints, yPoints, nPoints);
+
+        //wheels
+        OrnamentsForm.Draw(g, _startPosX, _startPosY);
+    }
+}

Tank/src/DrawingObjectTank.java

@@ -0,0 +1,17 @@
+public class DrawingObjectTank implements IMoveableObject {
+    private DrawingArmoVehicle _drawingArmoVehicle = null;
+    public DrawingObjectTank(DrawingArmoVehicle drawingTank)
+    {
+        _drawingArmoVehicle = drawingTank;
+    }
+    public ObjectParameters GetObjectPosition() {
+        if (_drawingArmoVehicle == null || _drawingArmoVehicle.ArmoVehicle == null) {
+            return null;
+        }
+        return new ObjectParameters(_drawingArmoVehicle.GetPosX(),_drawingArmoVehicle.GetPosY(),
+                _drawingArmoVehicle.GetWidth(), _drawingArmoVehicle.GetHeight());
+    }
+    public int GetStep(){ return (int)_drawingArmoVehicle.ArmoVehicle.Step; }
+    public boolean CheckCanMove(Direction direction) { return _drawingArmoVehicle.CanMove(direction);}
+    public void MoveObject(Direction direction) { _drawingArmoVehicle.MoveTransport(direction); }
+}

Tank/src/DrawingStarOrnament.java

@@ -0,0 +1,85 @@
+import java.awt.*;
+
+public class DrawingStarOrnament implements IOrnamentForm {
+    private CountWheels wheels;
+    private Color StarColor;
+    public CountWheels getNumWheel() {
+        return wheels;
+    }
+
+    public void setDigit(int number) {
+        switch(number){
+            case 2:
+                wheels = CountWheels.Two;
+                break;
+            case 3:
+                wheels = CountWheels.Three;
+                break;
+            case 4:
+                wheels = CountWheels.Four;
+                break;
+            default:
+                wheels = CountWheels.Two;
+                break;
+        }
+    }
+
+    public void CaterpillarStar(Graphics g, int _startPosX, int _startPosY) {
+        StarColor = Color.RED;
+        g.setColor(StarColor);
+        int xPontsStar[] = {_startPosX + 15, _startPosX + 18, _startPosX + 21, _startPosX + 18, _startPosX + 19, _startPosX + 16, _startPosX + 12, _startPosX + 12, _startPosX + 11, _startPosX + 15, _startPosX + 16};
+        int yPontsStar[] = {_startPosY + 35, _startPosY + 38, _startPosY + 38, _startPosY + 42, _startPosY + 45, _startPosY + 42, _startPosY + 45, _startPosY + 41, _startPosY + 38, _startPosY + 38, _startPosY + 35};
+        g.drawPolygon(xPontsStar, yPontsStar, xPontsStar.length);
+        g.fillPolygon(xPontsStar, yPontsStar, xPontsStar.length);
+    }
+
+    public void DrawWheels(Graphics g, int _startPosX, int _startPosY){
+        g.setColor(Color.BLACK);
+        g.fillOval(10 + _startPosX, 42 + _startPosY, 20, 20);
+    }
+    public void Draw(Graphics g, int _startPosX, int _startPosY) {
+        if (wheels == CountWheels.Two){
+            DrawWheels(g,_startPosX, _startPosY);
+            DrawWheels(g,_startPosX + 100, _startPosY);
+
+            CaterpillarStar(g,_startPosX + 5, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 105, _startPosY + 12);
+        }
+
+        if (wheels == CountWheels.Three) {
+            DrawWheels(g,_startPosX, _startPosY);
+            DrawWheels(g,_startPosX + 50, _startPosY);
+            DrawWheels(g,_startPosX + 100, _startPosY);
+
+            CaterpillarStar(g,_startPosX + 5, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 55, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 105, _startPosY + 12);
+        }
+
+        if (wheels == CountWheels.Four) {
+            DrawWheels(g,_startPosX, _startPosY);
+            DrawWheels(g,_startPosX + 25, _startPosY);
+            DrawWheels(g,_startPosX + 50, _startPosY);
+            DrawWheels(g,_startPosX + 100, _startPosY);
+
+            CaterpillarStar(g,_startPosX + 5, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 30, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 55, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 105, _startPosY + 12);
+        }
+
+        if(wheels == CountWheels.Five) {
+            DrawWheels(g,_startPosX, _startPosY);
+            DrawWheels(g,_startPosX + 25, _startPosY);
+            DrawWheels(g,_startPosX + 50, _startPosY);
+            DrawWheels(g,_startPosX + 75, _startPosY);
+            DrawWheels(g,_startPosX + 100, _startPosY);
+
+            CaterpillarStar(g,_startPosX + 5, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 30, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 55, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 80, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 105, _startPosY + 12);
+        }
+    }
+}

Tank/src/DrawingSuspensionOrnament.java

@@ -0,0 +1,70 @@
+import java.awt.*;
+
+public class DrawingSuspensionOrnament implements IOrnamentForm {
+    private CountWheels wheels;
+    private Color SuspensionColor;
+    public CountWheels getNumWheel() {
+        return wheels;
+    }
+
+    public void setDigit(int number) {
+        switch(number){
+            case 2:
+                wheels = CountWheels.Two;
+                break;
+            case 3:
+                wheels = CountWheels.Three;
+                break;
+            case 4:
+                wheels = CountWheels.Four;
+                break;
+            default:
+                wheels = CountWheels.Two;
+                break;
+        }
+    }
+
+    public void DrawWheels(Graphics g, int _startPosX, int _startPosY) {
+        g.setColor(Color.BLACK);
+        g.fillOval(10 + _startPosX, 42 + _startPosY, 20, 20);
+    }
+
+    public void DrawSuspension(Graphics g, int _startPosX, int _startPosY) {
+        SuspensionColor = Color.BLUE;
+        g.setColor(SuspensionColor);
+        g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3);
+    }
+
+    public void Draw(Graphics g, int _startPosX, int _startPosY) {
+        if (wheels == CountWheels.Two) {
+            DrawWheels(g,_startPosX, _startPosY);
+            DrawWheels(g,_startPosX + 100, _startPosY);
+
+            DrawSuspension(g, _startPosX, _startPosY);
+            DrawSuspension(g,_startPosX + 73, _startPosY);
+        }
+
+        if (wheels == CountWheels.Three) {
+            DrawWheels(g,_startPosX, _startPosY);
+            DrawWheels(g,_startPosX + 50, _startPosY);
+            DrawWheels(g,_startPosX + 100, _startPosY);
+
+            DrawSuspension(g, _startPosX, _startPosY);
+            DrawSuspension(g,_startPosX + 24, _startPosY);
+            DrawSuspension(g,_startPosX + 73, _startPosY);
+        }
+
+        if (wheels == CountWheels.Four) {
+            DrawWheels(g,_startPosX, _startPosY);
+            DrawWheels(g,_startPosX + 25, _startPosY);
+            DrawWheels(g,_startPosX + 50, _startPosY);
+            DrawWheels(g,_startPosX + 75, _startPosY);
+            DrawWheels(g,_startPosX + 100, _startPosY);
+
+            DrawSuspension(g, _startPosX, _startPosY);
+            DrawSuspension(g,_startPosX + 24, _startPosY);
+            DrawSuspension(g,_startPosX + 53, _startPosY);
+            DrawSuspension(g,_startPosX + 73, _startPosY);
+        }
+    }
+}

Tank/src/DrawingTank.java

@@ -0,0 +1,70 @@
+import java.awt.*;
+
+public class DrawingTank extends DrawingArmoVehicle {
+    protected IOrnamentForm OrnamentsForm;
+    private boolean OrnamentAdd;
+
+    // Конструктор (Инициализация характеристик)
+    public DrawingTank(int speed, double weight, Color bodyColor, int _numWheel, Color additionalColor, boolean bodyKit, boolean caterpillar, boolean tower, int width, int height, boolean ornamentAdd) {
+        super(speed, weight, bodyColor, _numWheel, width, height);
+        ArmoVehicle = new EntityTank(speed, weight, bodyColor, _numWheel, additionalColor, bodyKit, caterpillar, tower);
+        _TankWidth = ((EntityTank)ArmoVehicle).BodyKit ? 169 : 83;
+
+        this.OrnamentAdd = ornamentAdd;
+    }
+
+    // Ещё один конструктор
+    public DrawingTank(EntityTank tank, IOrnamentForm _wheelDrawing, int width, int height) {
+        super(tank, _wheelDrawing, width, height);
+        if (height < _pictureHeight || width < _pictureWidth)
+            return;
+    }
+
+    // Установка позиции
+    public void SetPosition(int x, int y) {
+        _startPosX = Math.min(x, _pictureWidth-_TankWidth);
+        _startPosY = Math.min(y, _pictureHeight-_TankHeight);
+    }
+
+    private boolean setOrnamentAdd() {
+        return OrnamentAdd;
+    }
+
+    // Прорисовка объекта
+    public void DrawTransport(Graphics2D g) {
+        if (ArmoVehicle == null) {
+            return;
+        }
+        super.DrawTransport(g);
+
+        g.setColor(((EntityTank) ArmoVehicle).AdditionalColor);
+        if (((EntityTank) ArmoVehicle).BodyKit) {
+            int[] xPointsBody = {_startPosX + 52, _startPosX + 52, _startPosX + 40, _startPosX + 15, _startPosX + 15, _startPosX + 60, _startPosX + 90, _startPosX + 120, _startPosX + 100, _startPosX + 95, _startPosX + 90};
+            int[] yPointsBody = {_startPosY + 30, _startPosY + 27, _startPosY + 23, _startPosY + 18, _startPosY + 15, _startPosY + 11, _startPosY + 11, _startPosY + 20, _startPosY + 25, _startPosY + 27, _startPosY + 30};
+            int nPointsBody = 11;
+
+            g.drawPolygon(xPointsBody, yPointsBody, nPointsBody);
+            g.fillPolygon(xPointsBody, yPointsBody, nPointsBody);
+        }
+
+        if (((EntityTank) ArmoVehicle).Caterpillar) {
+            // Гусеница
+            g.drawOval(_startPosX + 10, _startPosY + 30, 120, 30);
+        }
+
+        if (((EntityTank) ArmoVehicle).Tower) {
+            // Орудие
+            g.drawRect(_startPosX + 112, _startPosY + 17, 60, 4);
+            g.fillRect(_startPosX + 112, _startPosY + 17, 60, 4);
+
+            // Зенитное орудие
+            int[] xPointsGun = {_startPosX + 45, _startPosX + 45, _startPosX + 41, _startPosX + 41, _startPosX + 42, _startPosX + 41, _startPosX + 44, _startPosX + 50, _startPosX + 52, _startPosX + 53, _startPosX + 58};
+            int[] yPointsGun = {_startPosY + 12, _startPosY + 10, _startPosY + 8, _startPosY + 7, _startPosY + 5, _startPosY + 4, _startPosY + 3, _startPosY + 3, _startPosY + 5, _startPosY + 7, _startPosY + 10};
+            int nPointsGun = 11;
+
+            g.fillRect(_startPosX + 50, _startPosY + 5, 20, 2);
+            g.drawPolygon(xPointsGun, yPointsGun, nPointsGun);
+            g.fillPolygon(xPointsGun, yPointsGun, nPointsGun);
+        }
+    }
+}

Tank/src/DrawingWheelsCombination.java

@@ -0,0 +1,109 @@
+import java.awt.*;
+
+public class DrawingWheelsCombination implements IOrnamentForm {
+    private CountWheels wheels;
+    private Color CombinationColor;
+    public CountWheels getNumWheel() {
+        return wheels;
+    }
+
+    public void setDigit(int number) {
+        switch(number) {
+            case 2:
+                wheels = CountWheels.Two;
+                break;
+            case 3:
+                wheels = CountWheels.Three;
+                break;
+            case 4:
+                wheels = CountWheels.Four;
+                break;
+            default:
+                wheels = CountWheels.Two;
+                break;
+        }
+    }
+
+    public void CaterpillarStar(Graphics g, int _startPosX, int _startPosY) {
+        CombinationColor = Color.RED;
+        g.setColor(CombinationColor);
+        int xPontsStar[] = {_startPosX + 15, _startPosX + 18, _startPosX + 21, _startPosX + 18, _startPosX + 19, _startPosX + 16, _startPosX + 12, _startPosX + 13, _startPosX + 12, _startPosX + 15, _startPosX + 16};
+        int yPontsStar[] = {_startPosY + 35, _startPosY + 38, _startPosY + 38, _startPosY + 42, _startPosY + 45, _startPosY + 42, _startPosY + 45, _startPosY + 41, _startPosY + 38, _startPosY + 38, _startPosY + 35};
+        g.drawPolygon(xPontsStar, yPontsStar, xPontsStar.length);
+        g.fillPolygon(xPontsStar, yPontsStar, xPontsStar.length);
+    }
+
+    public void DrawSuspension(Graphics g, int _startPosX, int _startPosY) {
+        CombinationColor = Color.BLUE;
+        g.setColor(CombinationColor);
+        g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3);
+    }
+
+    public void DrawWheels(Graphics g, int _startPosX, int _startPosY){
+        g.setColor(Color.BLACK);
+        g.fillOval(10 + _startPosX, 42 + _startPosY, 20, 20);
+    }
+
+    public void Draw(Graphics g, int _startPosX, int _startPosY) {
+        if (wheels == CountWheels.Two){
+            DrawWheels(g,_startPosX, _startPosY);
+            DrawWheels(g,_startPosX + 100, _startPosY);
+
+            DrawSuspension(g, _startPosX, _startPosY);
+            DrawSuspension(g,_startPosX + 73, _startPosY);
+
+            CaterpillarStar(g,_startPosX + 5, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 105, _startPosY + 12);
+        }
+
+        if (wheels == CountWheels.Three) {
+            DrawWheels(g,_startPosX, _startPosY);
+            DrawWheels(g,_startPosX + 50, _startPosY);
+            DrawWheels(g,_startPosX + 100, _startPosY);
+
+            DrawSuspension(g, _startPosX, _startPosY);
+            DrawSuspension(g,_startPosX + 24, _startPosY);
+            DrawSuspension(g,_startPosX + 73, _startPosY);
+
+            CaterpillarStar(g,_startPosX + 5, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 55, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 105, _startPosY + 12);
+        }
+
+        if (wheels == CountWheels.Four) {
+            DrawWheels(g,_startPosX, _startPosY);
+            DrawWheels(g,_startPosX + 25, _startPosY);
+            DrawWheels(g,_startPosX + 50, _startPosY);
+            DrawWheels(g,_startPosX + 100, _startPosY);
+
+            DrawSuspension(g, _startPosX, _startPosY);
+            DrawSuspension(g,_startPosX + 24, _startPosY);
+            DrawSuspension(g,_startPosX + 53, _startPosY);
+            DrawSuspension(g,_startPosX + 73, _startPosY);
+
+            CaterpillarStar(g,_startPosX + 5, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 30, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 55, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 105, _startPosY + 12);
+        }
+
+        if(wheels == CountWheels.Five) {
+            DrawWheels(g,_startPosX, _startPosY);
+            DrawWheels(g,_startPosX + 25, _startPosY);
+            DrawWheels(g,_startPosX + 50, _startPosY);
+            DrawWheels(g,_startPosX + 75, _startPosY);
+            DrawWheels(g,_startPosX + 100, _startPosY);
+
+            DrawSuspension(g, _startPosX, _startPosY);
+            DrawSuspension(g,_startPosX + 24, _startPosY);
+            DrawSuspension(g,_startPosX + 53, _startPosY);
+            DrawSuspension(g,_startPosX + 73, _startPosY);
+
+            CaterpillarStar(g,_startPosX + 5, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 30, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 55, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 80, _startPosY + 12);
+            CaterpillarStar(g,_startPosX + 105, _startPosY + 12);
+        }
+    }
+}

Tank/src/EntityArmoVehicle.java

@@ -0,0 +1,20 @@
+import java.awt.*;
+
+public class EntityArmoVehicle {
+    public int Speed;
+    public double Weight;
+    public double getWeight() {
+        return Weight;
+    }
+    public Color BodyColor;
+    public double Step;
+    public int numWheel;
+
+    public EntityArmoVehicle(int speed, double weight, Color bodyColor, int _numWheel) {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
+        numWheel = _numWheel;
+        Step = (double) Speed * 200 / Weight;
+    }
+}

Tank/src/EntityTank.java

@@ -0,0 +1,19 @@
+import java.awt.*;
+
+public class EntityTank extends EntityArmoVehicle {
+    public Color AdditionalColor;
+    public boolean BodyKit;
+    public boolean Caterpillar;
+    public boolean Tower;
+
+    public EntityTank(int speed, double weight, Color bodyColor, int _numWheel, Color additionalColor, boolean bodyKit, boolean caterpillar, boolean tower) {
+        super(speed, weight, bodyColor, _numWheel);
+        AdditionalColor = additionalColor;
+        BodyKit = bodyKit;
+        Caterpillar = caterpillar;
+        Tower = tower;
+    }
+}
+
+
+

Tank/src/FormTank.java

@@ -0,0 +1,221 @@
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Random;
+
+public class FormTank {
+    private class Canvas extends JComponent {
+        public Canvas() {
+        }
+
+        public void paintComponent(Graphics g) {
+            if (_drawingVehicle == null) {
+                return;
+            }
+            super.paintComponents(g);
+            Graphics2D g2d = (Graphics2D) g;
+            _drawingVehicle.DrawTransport(g2d);
+            super.repaint();
+        }
+    }
+
+    public DrawingArmoVehicle SelectedVehicle;
+    public boolean DialogResult = false;
+    public DrawingArmoVehicle _drawingVehicle;
+    private AbstractStrategy abstractStrategy;
+    Canvas canv;
+    static int pictureBoxWidth = 980;
+    static int pictureBoxHeight = 560;
+    public JButton buttonSelectTank;
+    public JFrame Frame;
+
+    public void Draw() {
+        canv.repaint();
+    }
+
+    public FormTank() {
+        SelectedVehicle = null;
+        Frame = new JFrame("Tank");
+        JButton buttonCreateArmoVehicle = new JButton("Добавить бронетехнику");
+        JButton buttonCreateTank = new JButton("Добавить танк");
+        JButton buttonStrategysStep = new JButton("Шаг");
+        buttonSelectTank = new JButton("Добавить");
+
+        JComboBox<String> ComboBoxStrategy = new JComboBox<String>(
+                new String[]{
+                        "к центру",
+                        "к краю",
+                });
+        JButton up = new JButton();
+        up.setName("up");
+        ImageIcon iconUp = new ImageIcon("Resources//KeyUp.png");
+        up.setIcon(iconUp);
+
+        JButton down = new JButton();
+        down.setName("down");
+        ImageIcon iconDown = new ImageIcon("Resources//KeyDown.png");
+        down.setIcon(iconDown);
+
+        JButton left = new JButton();
+        left.setName("left");
+        ImageIcon iconLeft = new ImageIcon("Resources//KeyLeft.png");
+        left.setIcon(iconLeft);
+
+        JButton right = new JButton();
+        right.setName("right");
+        ImageIcon iconRight = new ImageIcon("Resources//KeyRight.png");
+        right.setIcon(iconRight);
+
+        buttonStrategysStep.addActionListener(
+                new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        if (_drawingVehicle == null) {
+                            return;
+                        }
+                        if (ComboBoxStrategy.isEnabled()) {
+                            switch (ComboBoxStrategy.getSelectedIndex()) {
+                                case 0:
+                                    abstractStrategy = new MoveToCenter();
+                                    break;
+                                case 1:
+                                    abstractStrategy = new MoveToBorder();
+                                    break;
+                                default:
+                                    abstractStrategy = null;
+                                    break;
+                            }
+
+                            if (abstractStrategy == null) {
+                                return;
+                            }
+                            abstractStrategy.SetData(new DrawingObjectTank(_drawingVehicle), pictureBoxWidth, pictureBoxHeight);
+                            ComboBoxStrategy.setEnabled(false);
+                        }
+                        if (abstractStrategy == null) {
+                            return;
+                        }
+                        abstractStrategy.MakeStep();
+                        Draw();
+                        if (abstractStrategy.GetStatus() == Status.Finish) {
+                            ComboBoxStrategy.setEnabled(true);
+                            abstractStrategy = null;
+                        }
+                    }
+                }
+        );
+
+        buttonCreateTank.addActionListener(
+                new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        Random random = new Random();
+                        Color color = new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256));
+                        // Вызываем диалоговое окно выбора цвета
+                        Color selectedColor = JColorChooser.showDialog(Frame, "Выберите цвет", Color.WHITE);
+                        if (selectedColor != null) {
+                            color = selectedColor;
+                        }
+                        Color coloradditional = new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256));
+                        // Вызываем диалоговое окно выбора цвета
+                        selectedColor = JColorChooser.showDialog(Frame, "Выберите цвет", Color.WHITE);
+                        if (selectedColor != null) {
+                            coloradditional = selectedColor;
+                        }
+                        _drawingVehicle = new DrawingTank(
+                                random.nextInt(100, 300),
+                                random.nextInt(1000, 3000),
+                                color,
+                                random.nextInt(2, 5),
+                                coloradditional,
+                                true,
+                                true,
+                                true,
+                                pictureBoxWidth,
+                                pictureBoxHeight,
+                                true
+                        );
+                        _drawingVehicle.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100));
+                        Draw();
+                    }
+                }
+        );
+
+        buttonCreateArmoVehicle.addActionListener(
+                new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        Random random = new Random();
+                        Color color = new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256));
+                        // Вызываем диалоговое окно выбора цвета
+                        Color selectedColor = JColorChooser.showDialog(Frame, "Выберите цвет", Color.WHITE);
+                        if (selectedColor != null) {
+                            color = selectedColor;
+                        }
+                        _drawingVehicle = new DrawingArmoVehicle(
+                                random.nextInt(100, 300),
+                                random.nextInt(1000, 3000),
+                                color,
+                                random.nextInt(2, 5),
+                                pictureBoxWidth,
+                                pictureBoxHeight
+                        );
+
+                        _drawingVehicle.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100));
+                        Draw();
+                    }
+                }
+        );
+
+        ActionListener actioListener = new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if (_drawingVehicle == null) {
+                    return;
+                }
+                switch (((JButton) (e.getSource())).getName()) {
+                    case "up":
+                        _drawingVehicle.MoveTransport(Direction.Up);
+                        break;
+                    case "down":
+                        _drawingVehicle.MoveTransport(Direction.Down);
+                        break;
+                    case "left":
+                        _drawingVehicle.MoveTransport(Direction.Left);
+                        break;
+                    case "right":
+                        _drawingVehicle.MoveTransport(Direction.Right);
+                        break;
+                }
+                Draw();
+            }
+        };
+
+        up.addActionListener(actioListener);
+        down.addActionListener(actioListener);
+        left.addActionListener(actioListener);
+        right.addActionListener(actioListener);
+
+        Frame.setSize(1000, 620);
+        Frame.setLayout(null);
+        canv = new Canvas();
+        canv.setBounds(0, 0, pictureBoxWidth, pictureBoxHeight);
+        buttonCreateArmoVehicle.setBounds(2, 520, 180, 40);
+        buttonCreateTank.setBounds(185, 520, 150, 40);
+        up.setBounds(900, 480, 40, 40);
+        down.setBounds(900, 520, 40, 40);
+        left.setBounds(860, 520, 40, 40);
+        right.setBounds(940, 520, 40, 40);
+        ComboBoxStrategy.setBounds(pictureBoxWidth - 150, 20, 150, 20);
+        buttonStrategysStep.setBounds(pictureBoxWidth - 150, 45, 150, 20);
+        buttonSelectTank.setBounds(pictureBoxWidth / 2, 530, 150, 30);
+        Frame.add(buttonSelectTank);
+        Frame.add(canv);
+        Frame.add(buttonCreateArmoVehicle);
+        Frame.add(buttonCreateTank);
+        Frame.add(up);
+        Frame.add(down);
+        Frame.add(left);
+        Frame.add(right);
+        Frame.add(ComboBoxStrategy);
+        Frame.add(buttonStrategysStep);
+        Frame.setVisible(true);
+    }
+}

Tank/src/FormTankCollection.java

@@ -0,0 +1,239 @@
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import java.util.LinkedList;
+import java.util.Queue;
+
+public class FormTankCollection {
+    private class Canvas extends JComponent {
+        public Canvas() {
+        }
+
+        public void paintComponent(Graphics g) {
+            super.paintComponent(g);
+            if (jListStorage.getSelectedIndex() == -1) {
+                return;
+            }
+            var obj = _storage.get(jListStorage.getSelectedValue());
+            if (obj == null) {
+                return;
+            }
+            if (obj.ShowTank() != null) {
+                g.drawImage(obj.ShowTank(), 0, 0, this);
+            }
+            super.repaint();
+        }
+    }
+
+    Canvas canv;
+    static int pictureBoxWidth = 700;
+    static int pictureBoxHeight = 480;
+    private TanksGenericStorage _storage;
+
+    public void Draw() {
+        canv.repaint();
+    }
+
+    private Queue<DrawingArmoVehicle> Queue;
+    private JList<String> jListStorage;
+    private DefaultListModel<String> listModel;
+
+    private void ReloadObjects() {
+        int index = jListStorage.getSelectedIndex();
+        listModel.clear();
+        for (String key : _storage.Keys()) {
+            listModel.addElement(key);
+        }
+        if (listModel.size() > 0 && (index == -1 || index >= listModel.size())) {
+            jListStorage.setSelectedIndex(0);
+        } else if (listModel.size() > 0 && index > -1 && index < listModel.size()) {
+            jListStorage.setSelectedIndex(index);
+        }
+    }
+
+    FormTankCollection() {
+        listModel = new DefaultListModel<String>();
+        jListStorage = new JList<String>(listModel);
+        canv = new Canvas();
+        JFrame Frame = new JFrame("TankCollecltion");
+        _storage = new TanksGenericStorage(pictureBoxWidth, pictureBoxHeight);
+
+        JButton ButtonAddVehicle = new JButton("Добавить технику");
+        ButtonAddVehicle.addActionListener(
+                new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        if (jListStorage.getSelectedIndex() == -1) {
+                            return;
+                        }
+                        var obj = _storage.get(jListStorage.getSelectedValue());
+                        if (obj == null) {
+                            return;
+                        }
+
+                        FormTank form = new FormTank();
+                        form.buttonSelectTank.addActionListener(
+                                new ActionListener() {
+                                    public void actionPerformed(ActionEvent e) {
+                                        if (obj.Add(form._drawingVehicle) != -1) {
+                                            JOptionPane.showMessageDialog(null, "Объект добавлен", "Информация", JOptionPane.INFORMATION_MESSAGE);
+                                            Draw();
+                                        } else {
+                                            JOptionPane.showMessageDialog(null, "Не удалось добавить объект", "Информация", JOptionPane.INFORMATION_MESSAGE);
+                                        }
+                                        form.Frame.dispose();
+                                    }
+                                }
+                        );
+                    }
+                }
+        );
+
+        Queue = new LinkedList<DrawingArmoVehicle>();
+
+        JTextField TextBoxNumber = new JTextField();
+        JButton ButtonRemoveTank = new JButton("Удалить технику");
+        ButtonRemoveTank.addActionListener(
+                new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        if (jListStorage.getSelectedIndex() == -1) {
+                            return;
+                        }
+                        var obj = _storage.get(jListStorage.getSelectedValue());
+                        if (obj == null) {
+                            return;
+                        }
+
+                        if (JOptionPane.showConfirmDialog(null, "Удалить объект?", "Удаление", JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) {
+                            return;
+                        }
+                        for (char it : TextBoxNumber.getText().toCharArray())
+                            if (it < '0' || it > '9') {
+                                JOptionPane.showMessageDialog(null, "Не удалось удалить объект", "Информация", JOptionPane.INFORMATION_MESSAGE);
+                                return;
+                            }
+                        if (TextBoxNumber.getText().length() == 0) {
+                            JOptionPane.showMessageDialog(null, "Не удалось удалить объект", "Информация", JOptionPane.INFORMATION_MESSAGE);
+                            return;
+                        }
+
+                        int pos = Integer.parseInt(TextBoxNumber.getText());
+                        var removed = obj.remove(pos);
+                        if (removed != null) {
+                            Queue.add(removed);
+                            JOptionPane.showMessageDialog(null, "Объект удален", "Информация", JOptionPane.INFORMATION_MESSAGE);
+                            Draw();
+                        } else {
+                            JOptionPane.showMessageDialog(null, "Не удалось удалить объект", "Информация", JOptionPane.INFORMATION_MESSAGE);
+                        }
+                    }
+                }
+        );
+
+        JButton buttonGetRemoved = new JButton("Извлечь");
+        buttonGetRemoved.addActionListener(
+                new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        if (Queue.size() == 0) {
+                            JOptionPane.showMessageDialog(null, "Нет удалённых", "Информация", JOptionPane.INFORMATION_MESSAGE);
+                            return;
+                        }
+                        FormTank form = new FormTank();
+                        form._drawingVehicle = Queue.peek();
+                        Queue.remove();
+                        form.Draw();
+                    }
+                }
+        );
+
+        JButton ButtonRefreshCollection = new JButton("Обновить коллекцию");
+        ButtonRefreshCollection.addActionListener(
+                new ActionListener() {
+                    public void actionPerformed(ActionEvent e){
+                        Draw();
+                    }
+                }
+        );
+
+        JButton toFormTankGenerate = new JButton("Генерировать технику");
+        toFormTankGenerate.addActionListener(
+                new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        FormTankGenerate formTankGenerate = new FormTankGenerate();
+                    }
+                }
+        );
+
+        JTextField textBoxSetName = new JTextField();
+        JButton buttonAddSet = new JButton("Добавить набор");
+        buttonAddSet.addActionListener(
+                new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        if (textBoxSetName.getText().length() == 0) {
+                            JOptionPane.showMessageDialog(null, "Не все данные заполнены", "Информация", JOptionPane.INFORMATION_MESSAGE);
+                            return;
+                        }
+                        _storage.AddSet(textBoxSetName.getText());
+                        ReloadObjects();
+                    }
+                }
+        );
+
+        jListStorage.addListSelectionListener(
+                new ListSelectionListener() {
+                    public void valueChanged(ListSelectionEvent e) {
+                        Draw();
+                    }
+                }
+        );
+
+        JButton buttonRemoveSet = new JButton("Удалить набор");
+        buttonRemoveSet.addActionListener(
+                new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        if (jListStorage.getSelectedIndex() == -1) {
+                            return;
+                        }
+                        if (JOptionPane.showConfirmDialog(null, "Удалить объект " + jListStorage.getSelectedValue() + "?", "Удаление", JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) {
+                            return;
+                        }
+                        _storage.DelSet(jListStorage.getSelectedValue());
+                        ReloadObjects();
+                    }
+                }
+        );
+
+        Frame.setSize(880, 520);
+        Frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        Frame.setLayout(null);
+        canv.setBounds(0, 0, pictureBoxWidth, pictureBoxHeight);
+        ButtonAddVehicle.setBounds(pictureBoxWidth - 10, 10, 170, 30);
+        TextBoxNumber.setBounds(pictureBoxWidth - 10, 50, 170, 30);
+        ButtonRemoveTank.setBounds(pictureBoxWidth - 10, 90, 170, 30);
+        ButtonRefreshCollection.setBounds(pictureBoxWidth - 10, 130, 170, 30);
+        toFormTankGenerate.setBounds(pictureBoxWidth - 10, 170, 170, 30);
+
+        buttonAddSet.setBounds(pictureBoxWidth - 10, 210, 170, 20);
+        textBoxSetName.setBounds(pictureBoxWidth - 10, 240, 170, 20);
+        jListStorage.setBounds(pictureBoxWidth - 10, 270, 170, 80);
+        buttonRemoveSet.setBounds(pictureBoxWidth - 10, 360, 170, 20);
+
+        buttonGetRemoved.setBounds(pictureBoxWidth - 10, 390, 170, 20);
+
+        Frame.add(canv);
+        Frame.add(ButtonAddVehicle);
+        Frame.add(ButtonRemoveTank);
+        Frame.add(ButtonRefreshCollection);
+        Frame.add(TextBoxNumber);
+        Frame.add(toFormTankGenerate);
+        Frame.add(buttonAddSet);
+        Frame.add(textBoxSetName);
+        Frame.add(jListStorage);
+        Frame.add(buttonRemoveSet);
+        Frame.add(buttonGetRemoved);
+        Frame.setVisible(true);
+    }
+}

Tank/src/FormTankGenerate.java

@@ -0,0 +1,55 @@
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class FormTankGenerate extends JFrame {
+    static int pictureBoxWidth = 560;
+    static int pictureBoxHeight = 560;
+    public DrawingArmoVehicle _drawingTank;
+    private class Canvas extends JComponent{
+        public Canvas() {
+        }
+        public void paintComponent (Graphics g){
+            if (_drawingTank == null){
+                return;
+            }
+            super.paintComponents (g) ;
+            Graphics2D g2d = (Graphics2D)g;
+            _drawingTank.SetPosition(250, 250);
+            _drawingTank.DrawTransport(g2d);
+            super.repaint();
+        }
+    }
+    DoubleParametrized<EntityArmoVehicle, IOrnamentForm> genericTankGenerate;
+    public FormTankGenerate(){
+        _drawingTank = null;
+        Canvas canv = new Canvas();
+        setSize (640, 640);
+        setLayout(null);
+        canv.setBounds(0,0,pictureBoxWidth, pictureBoxHeight);
+
+        genericTankGenerate = new DoubleParametrized<>();
+        genericTankGenerate.Add(new EntityArmoVehicle(100, 100, Color.BLUE, 2));
+        genericTankGenerate.Add(new EntityArmoVehicle(100, 100, Color.RED, 3));
+        genericTankGenerate.Add(new EntityArmoVehicle(100, 100, Color.GRAY, 4));
+        genericTankGenerate.Add(new EntityTank(100, 100, Color.BLUE, 2, Color.ORANGE, true, true, true));
+        genericTankGenerate.Add(new DrawingStarOrnament());
+        genericTankGenerate.Add(new DrawingWheelsCombination());
+
+        JButton creatButton = new JButton("Сгенерировать");
+        creatButton.addActionListener(
+            new ActionListener() {
+                public void actionPerformed(ActionEvent e){
+                    _drawingTank = genericTankGenerate.GenerateTank(pictureBoxWidth,pictureBoxHeight);
+                    canv.repaint();
+                }   
+            }
+        );
+        creatButton.setBounds(pictureBoxWidth/2 - 40, pictureBoxHeight-20, 180, 20);
+
+        add(canv);
+        add(creatButton);
+        setVisible(true);
+    }
+}

Tank/src/IMoveableObject.java

@@ -0,0 +1,13 @@
+public interface IMoveableObject {
+    // Получение координаты X объекта
+    ObjectParameters GetObjectPosition();
+
+    // Шаг объекта
+    int GetStep();
+
+    // Проверка, можно ли переместиться по нужному направлению
+    boolean CheckCanMove(Direction direction);
+
+    /// Изменение направления пермещения объекта
+    void MoveObject(Direction direction);
+}

Tank/src/IOrnamentForm.java

@@ -0,0 +1,7 @@
+import java.awt.*;
+
+public interface IOrnamentForm {
+    public CountWheels getNumWheel();
+    void setDigit(int number);
+    void Draw(Graphics g, int _startPosX, int _startPosY);
+}

Tank/src/Main.java

@@ -0,0 +1,5 @@
+public class Main {
+    public static void main(String[] args) {
+        new FormTankCollection();
+    }
+}

Tank/src/MoveToBorder.java

@@ -0,0 +1,36 @@
+public class MoveToBorder extends AbstractStrategy{
+    protected boolean IsTargetDestination() {
+        var objParams = GetObjectParameters();
+        if (objParams == null) {
+            return false;
+        }
+        return objParams.RightBorder() <= FieldWidth &&
+            objParams.RightBorder() + GetStep() >= FieldWidth &&
+            objParams.DownBorder() <= FieldHeight &&
+            objParams.DownBorder() + GetStep() >= FieldHeight;
+    }
+    protected void MoveToTarget() {
+        var objParams = GetObjectParameters();
+        if (objParams == null) {
+            return;
+        }
+        var diffX = objParams.RightBorder() - FieldWidth;
+        if (Math.abs(diffX) > GetStep()) {
+            if (diffX > 0) {
+                MoveLeft();
+            }
+            else {
+                MoveRight();
+            }
+        }
+        var diffY = objParams.DownBorder() - FieldHeight;
+        if (Math.abs(diffY) > GetStep()) {
+            if (diffY > 0) {
+                MoveUp();
+            }
+            else {
+                MoveDown();
+            }
+        }
+    }
+}

Tank/src/MoveToCenter.java

@@ -0,0 +1,35 @@
+public class MoveToCenter extends AbstractStrategy {
+    protected boolean IsTargetDestination() {
+        var objParams = GetObjectParameters();
+        if (objParams == null) {
+            return false;
+        }
+        return
+                Math.abs(objParams.ObjectMiddleHorizontal() - FieldWidth / 2) <= GetStep()
+                &&
+                Math.abs(objParams.ObjectMiddleVertical() - FieldHeight / 2) <= GetStep();
+    }
+
+    protected void MoveToTarget() {
+        var objParams = GetObjectParameters();
+        if (objParams == null) {
+            return;
+        }
+        var diffX = objParams.ObjectMiddleHorizontal() - FieldWidth / 2;
+        if (Math.abs(diffX) > GetStep()) {
+            if (diffX > 0) {
+                MoveLeft();
+            } else {
+                MoveRight();
+            }
+        }
+        var diffY = objParams.ObjectMiddleVertical() - FieldHeight / 2;
+        if (Math.abs(diffY) > GetStep()) {
+            if (diffY > 0) {
+                MoveUp();
+            } else {
+                MoveDown();
+            }
+        }
+    }
+}

Tank/src/ObjectParameters.java

@@ -0,0 +1,44 @@
+public class ObjectParameters {
+    private int _x;
+    private int _y;
+    private int _width;
+    private int _height;
+
+    // Левая граница
+    public int LeftBorder() {
+        return _x;
+    }
+
+    // Верхняя граница
+    public int TopBorder() {
+        return _y;
+    }
+
+    // Правая граница
+    public int RightBorder() {
+        return _x + _width;
+    }
+
+    // Нижняя граница
+    public int DownBorder() {
+        return _y + _height;
+    }
+
+    // Середина объекта
+    public int ObjectMiddleHorizontal() {
+        return _x + _width / 2;
+    }
+
+    // Середина объекта
+    public int ObjectMiddleVertical() {
+        return _y + _height / 2;
+    }
+
+    // Конструктор
+    public ObjectParameters(int x, int y, int width, int height) {
+        _x = x;
+        _y = y;
+        _width = width;
+        _height = height;
+    }
+}

Tank/src/SetGeneric.java

@@ -0,0 +1,89 @@
+import java.util.*;
+
+public class SetGeneric <T extends Object> {
+    // Массив объектов, которые храним
+    private final ArrayList<T> _places;
+    // Количество объектов в массиве
+     public int Count() { return _places.size(); }
+    // Максимальное количество объектов в списке
+    private final int _maxCount;
+
+    // Конструктор
+    public SetGeneric(int count) {
+        _maxCount = count;
+        _places = new ArrayList<T>(count);
+    }
+
+    // Добавление объектов в набор
+    public int Insert(T tank) {
+        if(_places.size() >= _maxCount)
+            return -1;
+        _places.add(0,tank);
+        return 0;
+    }
+
+    public boolean Insert(T tank, int position) {
+        // Проверка позиции
+        if (position < 0 || position > _places.size())
+            return false;
+
+        if (_places.size() >= _maxCount)
+            return false;
+
+        if (position == _places.size())
+            _places.add(tank);
+        else
+            _places.add(position, tank);
+
+        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 >= _places.size())
+            return null;
+        return _places.get(position);
+    }
+
+    // Проход по списку
+    public Iterable<T> GetTanks(final Integer maxTanks) {
+        return new Iterable<T>() {
+            @Override
+            public Iterator<T> iterator() {
+                return new Iterator<T>() {
+                    private int currentIndex = 0;
+                    private int count = 0;
+
+                    @Override
+                    public boolean hasNext() {
+                        return currentIndex < _places.size() && (maxTanks == null || count < maxTanks);
+                    }
+
+                    @Override
+                    public T next() {
+                        if (hasNext()) {
+                            count++;
+                            return _places.get(currentIndex++);
+                        }
+                        throw new NoSuchElementException();
+                    }
+
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
+        };
+    }
+}

Tank/src/Status.java

@@ -0,0 +1,5 @@
+public enum Status {
+    NotInit,
+    InProgress,
+    Finish
+}

Tank/src/TanksGenericCollections.java

@@ -0,0 +1,84 @@
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+
+public class TanksGenericCollections<T extends DrawingArmoVehicle, U extends IMoveableObject> {
+    // Высота и Ширина окна прорисовки
+    private int _pictureWidth;
+    private int _pictureHeight;
+
+    // Размеры занимаемого объектом места (ширина и высота)
+    private int _placeSizeWidth = 180;
+    private int _placeSizeHeight = 90;
+
+    // Набор объектов
+    private SetGeneric<T> _collection;
+
+    // Конструктор
+    public TanksGenericCollections(int pictureWidth, int pictureHeight) {
+        int width = pictureWidth / _placeSizeWidth;
+        int height = pictureHeight / _placeSizeHeight;
+        _pictureWidth = pictureWidth;
+        _pictureHeight = pictureHeight;
+        _collection = new SetGeneric<T>(width * height);
+    }
+
+    // Перегрузка оператора сложения
+    public int Add(T obj) {
+        if (obj == null) {
+            return -1;
+        }
+        return _collection.Insert(obj);
+    }
+
+    // Перегрузка оператора вычитания
+    public T remove(int pos) {
+        T obj = _collection.Get(pos);
+        if (obj != null) {
+            _collection.Remove(pos);
+        }
+        return obj;
+    }
+
+    // Получение объекта IMoveableObject
+    public U GetU(int pos) {
+        return (U) _collection.Get(pos).GetMoveableObject();
+    }
+
+    // Вывод всего набора объектов
+    public BufferedImage ShowTanks() {
+        BufferedImage bitmap = new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = bitmap.createGraphics();
+        DrawBackground(g);
+        DrawObjects(g);
+        g.dispose();
+        return bitmap;
+    }
+
+    // Метод отрисовки фона
+    private void DrawBackground(Graphics g) {
+        g.setColor(Color.BLACK);
+        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, j * _placeSizeHeight);
+            }
+            g.drawLine(i * _placeSizeWidth, 0, i * _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
+        }
+    }
+
+    // Метод прорисовки объектов
+    private void DrawObjects(Graphics g) {
+        int i = 0;
+        for (T tank : _collection.GetTanks(100)) {
+            if (tank != null) {
+                tank.SetPosition((i % (_pictureWidth / _placeSizeWidth)) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight);
+                if (tank instanceof DrawingTank)
+                    ((DrawingTank) tank).DrawTransport((Graphics2D) g);
+                else
+                    tank.DrawTransport((Graphics2D) g);
+            }
+            i++;
+        }
+    }
+}

Tank/src/TanksGenericStorage.java

@@ -0,0 +1,49 @@
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class TanksGenericStorage {
+    // Словарь (как хранилище)
+    HashMap<String, TanksGenericCollections<DrawingArmoVehicle, DrawingObjectTank>> _tankStorages;
+
+    // Возвращение списка названий наборов
+    public List<String> Keys() {
+        return _tankStorages.keySet().stream().collect(Collectors.toList());
+    }
+    // Ширина и высота отрисовки
+    private int _pictureWidth;
+    private int _pictureHeight;
+
+    // Конструктор
+    public TanksGenericStorage(int pictureWidth, int pictureHeight) {
+        _tankStorages = new HashMap<String, TanksGenericCollections<DrawingArmoVehicle, DrawingObjectTank>>();
+        _pictureWidth = pictureWidth;
+        _pictureHeight = pictureHeight;
+    }
+
+    // Добавление набора
+    public void AddSet(String name) {
+        if (_tankStorages.containsKey(name))
+            return;
+        _tankStorages.put(name, new TanksGenericCollections<DrawingArmoVehicle, DrawingObjectTank>(_pictureWidth, _pictureHeight));
+    }
+
+    // Удаление набора
+    public void DelSet(String name) {
+        if (!_tankStorages.containsKey(name))
+            return;
+        _tankStorages.remove(name);
+    }
+
+    // Доступ к набору
+    public TanksGenericCollections<DrawingArmoVehicle, DrawingObjectTank> get(String ind) {
+        if (_tankStorages.containsKey(ind))
+            return _tankStorages.get(ind);
+        return null;
+    }
+
+    public DrawingObjectTank get(String ind1, int ind2){
+        if (!_tankStorages.containsKey(ind1))
+            return null;
+        return _tankStorages.get(ind1).GetU(ind2);
+    }
+}