AbstractMap.java

@@ -1,188 +0,0 @@
-import java.awt.*;
-import java.util.Random;
-
-public abstract class AbstractMap
-{
-    private IDrawingObject _drawningObject = null;
-    protected int[][] _map = null;
-    protected int _width;
-    protected int _height;
-    protected float _size_x;
-    protected float _size_y;
-    protected Random _random = new Random();
-    protected int _freeRoad = 0;
-    protected int _barrier = 1;
-    public void CreateMap(int width, int height, IDrawingObject drawningObject)
-    {
-        _width = width;
-        _height = height;
-        _drawningObject = drawningObject;
-        GenerateMap();
-        while (!SetObjectOnMap())
-        {
-            GenerateMap();
-        }
-    }
-
-    private Point checkBarrier(Point leftTop, Point rightBottom)
-    {
-        return checkBarrier(leftTop, rightBottom, false, false, true, false);
-    }
-    private Point checkBarrier(Point leftTop, Point rightBottom, boolean minLeft, boolean maxLeft, boolean isTop, boolean isBottom)
-    {
-        Point res = new Point(-1, -1);
-
-        for (int i = (int)(leftTop.y / _size_y); i <= (int)(rightBottom.y / _size_y) && i < _map.length; ++i)
-        {
-            for (int j = (int)(leftTop.x / _size_x); j <= (int)(rightBottom.x / _size_x) && j < _map[0].length; ++j)
-            {
-                if (j < 0) j = 0;
-                if (i < 0) i = 0;
-                if (_map[i][j] != _barrier) continue;
-
-                if (res.y == -1) res = new Point(j, i);
-                if (minLeft && res.x > j) res = new Point(j, i);
-                if (maxLeft && res.x < j) res = new Point(j, i);
-                if(isBottom) res = new Point(j, i);
-                if (isTop) return new Point(j, i);
-            }
-        }
-
-        return res;
-    }
-    public void MoveObject(Direction direction)
-    {
-        // TODO проверка, что объект может переместится в требуемом
-
-        Point leftTop = _drawningObject.GetLeftTop();
-        Point rightBottom = _drawningObject.GetRightBottom();
-
-        float drawningWidth = rightBottom.x - leftTop.x;
-        float drawningHeight = rightBottom.y - leftTop.y;
-
-        boolean minLeft = false;
-        boolean maxLeft = false;
-        boolean isTop = false;
-        boolean isBottom = false;
-
-        if (direction == Direction.Left)
-        {
-            leftTop.x -= _drawningObject.getStep();
-            maxLeft = true;
-        }
-        if (direction == Direction.Right)
-        {
-            leftTop.x += _drawningObject.getStep();
-            minLeft = true;
-        }
-        if (direction == Direction.Up) {
-            leftTop.y -= _drawningObject.getStep();
-            isTop = true;
-        }
-        if (direction == Direction.Down)
-        {
-            leftTop.y += _drawningObject.getStep();
-            isBottom = true;
-        }
-
-        rightBottom.x = leftTop.x + (int)drawningWidth;
-        rightBottom.y = leftTop.y + (int)drawningHeight;
-
-        Point currentBarrier = checkBarrier(leftTop, rightBottom, minLeft, maxLeft, isTop, isBottom);
-
-        if (currentBarrier.x == -1)
-        {
-            _drawningObject.MoveObject(direction);
-        }
-
-        else if (direction == Direction.Left)
-            leftTop.x = (int)((currentBarrier.x + 1) * _size_x) + 1;
-
-        else if (direction == Direction.Right)
-            leftTop.x = (int)(currentBarrier.x * _size_x) - (int)drawningWidth - 1;
-
-        else if (direction == Direction.Up)
-            leftTop.y = (int)((currentBarrier.y + 1) * _size_y) + 1;
-
-        else if (direction == Direction.Down)
-            leftTop.y = (int)(currentBarrier.y * _size_y) - (int)drawningHeight - 1;
-
-        if (currentBarrier.y != -1)
-            _drawningObject.SetObject(leftTop.x, leftTop.y, _width, _height);
-
-    }
-    private boolean SetObjectOnMap()
-    {
-        if (_drawningObject == null || _map == null)
-        {
-            return false;
-        }
-        int x = _random.nextInt(0, 10);
-        int y = _random.nextInt(0, 10);
-        _drawningObject.SetObject(x, y, _width, _height);
-        // TODO првоерка, что объект не "накладывается" на закрытые участки
-
-        Point leftTop = _drawningObject.GetLeftTop();
-        Point rightBottom = _drawningObject.GetRightBottom();
-
-        float drawningWidth = rightBottom.x - leftTop.x;
-        float drawningHeight = rightBottom.y - leftTop.y;
-
-        Point currentBarrier = checkBarrier(leftTop, rightBottom);
-        int minRowIndex = _map.length;
-
-        while(currentBarrier.y != -1)
-        {
-            minRowIndex = currentBarrier.y < minRowIndex ? currentBarrier.y : minRowIndex;
-
-            leftTop.x = (int)((currentBarrier.x + 1) * _size_x) + 1;
-            rightBottom.x = leftTop.x + (int)drawningWidth;
-
-            if(rightBottom.x > _width)
-            {
-                leftTop.y = (int)((minRowIndex + 1) * _size_y) + 1;
-                rightBottom.y = leftTop.y + (int)drawningHeight;
-
-                leftTop.x = 0;
-                rightBottom.x = (int)drawningWidth;
-
-                minRowIndex = _map.length;
-            }
-
-            if (rightBottom.y > _height) {
-                return false;
-            }
-
-            currentBarrier = checkBarrier(leftTop, rightBottom);
-        }
-
-        _drawningObject.SetObject((int)leftTop.x, (int)leftTop.y, _width, _height);
-
-        return true;
-    }
-    public void DrawMapWithObject(Graphics2D gr)
-    {
-        if (_drawningObject == null || _map == null)
-        {
-            return;
-        }
-        for (int i = 0; i < _map.length; ++i)
-        {
-            for (int j = 0; j < _map[0].length; ++j)
-            {
-                if (_map[i][j] == _freeRoad)
-                {
-                    DrawRoadPart(gr, i, j);
-                }
-                    else if (_map[i][j] == _barrier)
-                {
-                    DrawBarrierPart(gr, i, j);
-                }
-            }
-        }
-        _drawningObject.DrawningObject(gr);
-    }
-    protected abstract void GenerateMap();
-    protected abstract void DrawRoadPart(Graphics2D g, int i, int j);
-    protected abstract void DrawBarrierPart(Graphics2D g, int i, int j);
-}

AircraftMixer.java

@@ -1,50 +0,0 @@
-import java.util.Random;
-
-public class AircraftMixer<T extends EntityAircraft, U extends IDrawingEngines> {
-    private T[] aircrafts;
-    private U[] engines;
-
-    public AircraftMixer(int countAircrafts, int countEngines) {
-        aircrafts = (T[])(new EntityAircraft[countAircrafts]);
-        engines = (U[])(new IDrawingEngines[countEngines]);
-    }
-
-    public int add(T a) {
-        int index = 0;
-        while(index < aircrafts.length && aircrafts[index] != null) index++;
-
-        if(index == aircrafts.length) return -1;
-
-        aircrafts[index] = a;
-        return index;
-    }
-
-    public int add(U e) {
-        int index = 0;
-        while(index < engines.length && engines[index] != null) index++;
-
-        if(index == engines.length) return -1;
-
-        engines[index] = e;
-        return index;
-    }
-
-    public DrawingAircraft constructAircraft(int width, int height) {
-        Random rnd = new Random();
-
-        DrawingAircraft air;
-
-        T selectedAircraft = aircrafts[rnd.nextInt(0, aircrafts.length)];
-        U selectedEngines = engines[rnd.nextInt(0, engines.length)];
-
-        DrawingAircraft result;
-
-        if(selectedAircraft instanceof EntityModernAircraft) {
-            result = new DrawingModernAircraft(selectedAircraft, selectedEngines);
-        }
-        else result = new DrawingAircraft(selectedAircraft, selectedEngines);
-
-        result.SetPosition(10, 10, width, height);
-        return result;
-    }
-}

Canvas.java

@@ -1,16 +0,0 @@
-import javax.swing.*;
-import java.awt.*;
-
-public class Canvas extends JComponent {
-    Form form;
-    public Canvas(Form form) {
-        this.form = form;
-    }
-
-    @Override
-    public void paintComponent(Graphics g) {
-        Graphics2D g2 = (Graphics2D) g;
-
-        form.Draw(g2);
-    }
-}

Direction.java

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

DrawingAircraft.java

@@ -1,188 +0,0 @@
-import java.awt.*;
-import java.util.Random;
-
-class DrawingAircraft
-{
-    public EntityAircraft AirFighter;
-    public IDrawingEngines drawingEngines;
-
-    protected float _startPosX;
-    protected float _startPosY;
-
-    private int _pictureWidth = -1;
-    private int _pictureHeight = -1;
-
-    private int _airFighterWidth = 195;
-    private int _airFighterHeight = 166;
-
-    private void peekRandomEngines(Color color) {
-        Random rnd = new Random();
-        int randEngine = rnd.nextInt(1, 4);
-
-        switch(randEngine) {
-            case 1:
-                drawingEngines = new DrawingEngines(rnd.nextInt(1, 8), color);
-                break;
-            case 2:
-                drawingEngines = new DrawingTruncatedEngines(rnd.nextInt(1, 8), color);
-                break;
-            case 3:
-                drawingEngines = new DrawingWavyEngines(rnd.nextInt(1, 8), color);
-                break;
-        }
-    }
-
-    public DrawingAircraft(int speed, float weight, Color bodyColor)
-    {
-        AirFighter = new EntityAircraft(speed, weight, bodyColor);
-        peekRandomEngines(bodyColor);
-    }
-
-    public DrawingAircraft(EntityAircraft airFighter, IDrawingEngines engines)
-    {
-        AirFighter = airFighter;
-        this.drawingEngines = engines;
-    }
-
-    public DrawingAircraft(int speed, float weight, Color bodyColor, int airFighterWidth, int airFighterHeight)
-    {
-        this(speed, weight, bodyColor);
-        _airFighterWidth = airFighterWidth;
-        _airFighterHeight = airFighterHeight;
-    }
-
-
-    public void SetPosition(int x, int y, int width, int height)
-    {
-        if (width < _airFighterWidth || height < _airFighterHeight) return;
-
-        if (x + _airFighterWidth > width || x < 0) return;
-        if (y + _airFighterHeight > height || y < 0) return;
-
-        _startPosX = x;
-        _startPosY = y;
-
-        _pictureWidth = width;
-        _pictureHeight = height;
-    }
-
-    public void MoveTransport(Direction direction)
-    {
-        if (_pictureWidth == -1 || _pictureHeight == -1)
-        {
-            return;
-        }
-
-
-        switch (direction)
-        {
-            case Right:
-                if (_startPosX + _airFighterWidth + AirFighter.Step < _pictureWidth)
-                {
-                    _startPosX += AirFighter.Step;
-                }
-                break;
-            case Left:
-                if (_startPosX - AirFighter.Step > 0)
-                {
-                    _startPosX -= AirFighter.Step;
-                }
-                break;
-            case Up:
-                if (_startPosY - AirFighter.Step > 0)
-                {
-                    _startPosY -= AirFighter.Step;
-                }
-                break;
-            case Down:
-                if (_startPosY + _airFighterHeight + AirFighter.Step < _pictureHeight)
-                {
-                    _startPosY += AirFighter.Step;
-                }
-                break;
-        }
-
-    }
-
-    public void DrawTransport(Graphics2D g)
-    {
-        if (_pictureWidth == -1 || _pictureHeight == -1)
-        {
-            return;
-        }
-
-        g.setPaint(AirFighter.BodyColor);
-
-        Polygon front = new Polygon();
-        front.addPoint((int)(_startPosX + 160), (int)(_startPosY + 70));
-        front.addPoint((int)(_startPosX + 195), (int)(_startPosY + 83));
-        front.addPoint((int)(_startPosX + 160), (int)(_startPosY + 96));
-
-
-        Polygon tailTop = new Polygon();
-        tailTop.addPoint((int)(_startPosX), (int)(_startPosY + 30));
-        tailTop.addPoint((int)(_startPosX), (int)(_startPosY + 70));
-        tailTop.addPoint((int)(_startPosX + 25), (int)(_startPosY + 70));
-        tailTop.addPoint((int)(_startPosX + 25), (int)(_startPosY + 55));
-
-
-        Polygon tailBottom = new Polygon();
-        tailBottom.addPoint((int)(_startPosX), (int)(_startPosY + 96));
-        tailBottom.addPoint((int)(_startPosX), (int)(_startPosY + 136));
-        tailBottom.addPoint((int)(_startPosX + 25), (int)(_startPosY + 111));
-        tailBottom.addPoint((int)(_startPosX + 25), (int)(_startPosY + 96));
-
-
-        Polygon wingTop = new Polygon();
-        wingTop.addPoint((int)(_startPosX + 100), (int)(_startPosY));
-        wingTop.addPoint((int)(_startPosX + 100), (int)(_startPosY + 70));
-        wingTop.addPoint((int)(_startPosX + 75), (int)(_startPosY + 70));
-        wingTop.addPoint((int)(_startPosX + 90), (int)(_startPosY));
-
-
-
-        Polygon wingBottom = new Polygon();
-        wingBottom.addPoint((int)(_startPosX + 100), (int)(_startPosY + 96));
-        wingBottom.addPoint((int)(_startPosX + 100), (int)(_startPosY + 166));
-        wingBottom.addPoint((int)(_startPosX + 90), (int)(_startPosY + 166));
-        wingBottom.addPoint((int)(_startPosX + 75), (int)(_startPosY + 96));
-
-        g.fillPolygon(front);
-        g.drawPolygon(tailTop);
-        g.drawPolygon(tailBottom);
-        g.drawPolygon(wingTop);
-        g.drawPolygon(wingBottom);
-        g.drawRect((int)_startPosX, (int)_startPosY + 70, 160, 26);
-
-        drawingEngines.draw(g, (int)_startPosX, (int)_startPosY);
-    }
-
-    public void ChangeBorders(int width, int height)
-    {
-        _pictureWidth = width;
-        _pictureHeight = height;
-        if (_pictureWidth <= _airFighterWidth || _pictureHeight <= _airFighterHeight)
-        {
-            _pictureWidth = -1;
-            _pictureHeight = -1;
-            return;
-        }
-        if (_startPosX + _airFighterWidth > _pictureWidth)
-        {
-            _startPosX = _pictureWidth - _airFighterWidth;
-        }
-        if (_startPosY + _airFighterHeight > _pictureHeight)
-        {
-            _startPosY = _pictureHeight - _airFighterHeight;
-        }
-    }
-
-    public Point getLeftTop() {
-        return new Point((int)_startPosX, (int)_startPosY);
-    }
-
-    public Point getRightBottom() {
-        return new Point((int)_startPosX + _airFighterWidth, (int)_startPosY + _airFighterHeight);
-    }
-}
-

DrawingEngines.java

@@ -1,34 +0,0 @@
-import java.awt.*;
-
-public class DrawingEngines implements IDrawingEngines {
-    private EnginesCount enginesCount;
-    private Color color;
-
-    public DrawingEngines(int count, Color bodyColor) {
-        setCount(count);
-        color = bodyColor;
-    }
-
-    @Override
-    public void setCount(int count) {
-        if(count <= 2) enginesCount = EnginesCount.Two;
-        else if(count >= 6) enginesCount = EnginesCount.Six;
-        else enginesCount = EnginesCount.Four;
-    }
-
-    public void draw(Graphics2D g, int startPosX, int startPosY) {
-        g.setPaint(color);
-        g.fillOval(startPosX + 80, startPosY + 10, 30, 15);
-        g.fillOval(startPosX + 80, startPosY + 141, 30, 15);
-
-        if(enginesCount == EnginesCount.Two) return;
-
-        g.fillOval(startPosX + 80, startPosY + 30, 30, 15);
-        g.fillOval(startPosX + 80, startPosY + 121, 30, 15);
-
-        if(enginesCount == EnginesCount.Four) return;
-
-        g.fillOval(startPosX + 80, startPosY + 50, 30, 15);
-        g.fillOval(startPosX + 80, startPosY + 101, 30, 15);
-    }
-}

DrawingModernAircraft.java

@@ -1,83 +0,0 @@
-import java.awt.*;
-
-public class DrawingModernAircraft extends DrawingAircraft
-{
-    public DrawingModernAircraft(EntityAircraft airFighter, IDrawingEngines engines)
-    {
-        super(airFighter, engines);
-    }
-
-    public DrawingModernAircraft(int speed, float weight, Color bodyColor, Color dopColor, boolean dopWings, boolean rockets)
-    {
-        super(speed, weight, bodyColor, 195, 166);
-        AirFighter = new EntityModernAircraft(speed, weight, bodyColor, dopColor, dopWings, rockets);
-    }
-    @Override
-    public void DrawTransport(Graphics2D g)
-    {
-        if (!(AirFighter instanceof EntityModernAircraft))
-        {
-            return;
-        }
-
-        EntityModernAircraft modernAircraft = (EntityModernAircraft)AirFighter;
-
-        g.setPaint(modernAircraft.DopColor);
-
-        if (modernAircraft.DopWings)
-        {
-            Polygon topDopWing = new Polygon();
-            topDopWing.addPoint((int)_startPosX + 78, (int)_startPosY + 56);
-            topDopWing.addPoint((int)_startPosX + 75, (int)_startPosY + 70);
-            topDopWing.addPoint((int)_startPosX + 55, (int)_startPosY + 50);
-            topDopWing.addPoint((int)_startPosX + 60, (int)_startPosY + 45);
-
-            Polygon bottomDopWing = new Polygon();
-            bottomDopWing.addPoint((int)_startPosX + 78, (int)_startPosY + 110);
-            bottomDopWing.addPoint((int)_startPosX + 75, (int)_startPosY + 96);
-            bottomDopWing.addPoint((int)_startPosX + 55, (int)_startPosY + 116);
-            bottomDopWing.addPoint((int)_startPosX + 60, (int)_startPosY + 121);
-
-            g.fillPolygon(topDopWing);
-            g.fillPolygon(bottomDopWing);
-        }
-
-        if (modernAircraft.Rockets)
-        {
-            Polygon topRocket1 = new Polygon();
-            topRocket1.addPoint((int)_startPosX + 100, (int)_startPosY + 20);
-            topRocket1.addPoint((int)_startPosX + 100, (int)_startPosY + 30);
-            topRocket1.addPoint((int)_startPosX + 112, (int)_startPosY + 30);
-            topRocket1.addPoint((int)_startPosX + 120, (int)_startPosY + 25);
-            topRocket1.addPoint((int)_startPosX + 112, (int)_startPosY + 20);
-
-            Polygon topRocket2 = new Polygon();
-            topRocket2.addPoint((int)_startPosX + 100, (int)_startPosY + 35);
-            topRocket2.addPoint((int)_startPosX + 100, (int)_startPosY + 45);
-            topRocket2.addPoint((int)_startPosX + 112, (int)_startPosY + 45);
-            topRocket2.addPoint((int)_startPosX + 120, (int)_startPosY + 40);
-            topRocket2.addPoint((int)_startPosX + 112, (int)_startPosY + 35);
-
-            Polygon bottomRocket1 = new Polygon();
-            bottomRocket1.addPoint((int)_startPosX + 100, (int)_startPosY + 146);
-            bottomRocket1.addPoint((int)_startPosX + 100, (int)_startPosY + 136);
-            bottomRocket1.addPoint((int)_startPosX + 112, (int)_startPosY + 136);
-            bottomRocket1.addPoint((int)_startPosX + 120, (int)_startPosY + 141);
-            bottomRocket1.addPoint((int)_startPosX + 112, (int)_startPosY + 146);
-
-            Polygon bottomRocket2 = new Polygon();
-            bottomRocket2.addPoint((int)_startPosX + 100, (int)_startPosY + 131);
-            bottomRocket2.addPoint((int)_startPosX + 100, (int)_startPosY + 121);
-            bottomRocket2.addPoint((int)_startPosX + 112, (int)_startPosY + 121);
-            bottomRocket2.addPoint((int)_startPosX + 120, (int)_startPosY + 126);
-            bottomRocket2.addPoint((int)_startPosX + 112, (int)_startPosY + 131);
-
-            g.fillPolygon(topRocket1);
-            g.fillPolygon(topRocket2);
-            g.fillPolygon(bottomRocket1);
-            g.fillPolygon(bottomRocket2);
-        }
-
-        super.DrawTransport(g);
-    }
-}

DrawingObjectAircraft.java

@@ -1,42 +0,0 @@
-import java.awt.*;
-
-public class DrawingObjectAircraft implements IDrawingObject
-{
-    private DrawingAircraft _aircraft = null;
-    public DrawingObjectAircraft(DrawingAircraft aircraft){
-        _aircraft = aircraft;
-    }
-
-    public void MoveObject(Direction direction) {
-        if(_aircraft == null) return;
-        _aircraft.MoveTransport(direction);
-    }
-
-    @Override
-    public float getStep() {
-        if(_aircraft == null) return 0;
-        return _aircraft.AirFighter.Step;
-    }
-
-    public void SetObject(int x, int y, int width, int height)
-        {
-        _aircraft.SetPosition(x, y, width, height);
-        }
-    public void DrawningObject(Graphics2D g)
-        {
-        // TODO
-        _aircraft.DrawTransport(g);
-        }
-
-    @Override
-    public Point GetLeftTop() {
-        if(_aircraft == null) return new Point(0,0);
-        return _aircraft.getLeftTop();
-    }
-
-    @Override
-    public Point GetRightBottom() {
-        if(_aircraft == null) return new Point(0,0);
-        return _aircraft.getRightBottom();
-    }
-}

DrawingTruncatedEngines.java

@@ -1,34 +0,0 @@
-import java.awt.*;
-
-public class DrawingTruncatedEngines implements IDrawingEngines {
-    private EnginesCount enginesCount;
-    private Color color;
-
-    public DrawingTruncatedEngines(int count, Color bodyColor) {
-        setCount(count);
-        color = bodyColor;
-    }
-
-    @Override
-    public void setCount(int count) {
-        if(count <= 2) enginesCount = EnginesCount.Two;
-        else if(count >= 6) enginesCount = EnginesCount.Six;
-        else enginesCount = EnginesCount.Four;
-    }
-
-    public void draw(Graphics2D g, int startPosX, int startPosY) {
-        g.setPaint(color);
-        g.fillArc(startPosX + 90, startPosY + 10, 30, 15, 90, 180);
-        g.fillArc(startPosX + 90, startPosY + 141, 30, 15, 90, 180);
-
-        if(enginesCount == EnginesCount.Two) return;
-
-        g.fillArc(startPosX + 90, startPosY + 30, 30, 15, 90, 180);
-        g.fillArc(startPosX + 90, startPosY + 121, 30, 15, 90, 180);
-
-        if(enginesCount == EnginesCount.Four) return;
-
-        g.fillArc(startPosX + 90, startPosY + 50, 30, 15, 90, 180);
-        g.fillArc(startPosX + 90, startPosY + 101, 30, 15, 90, 180);
-    }
-}

DrawingWavyEngines.java

@@ -1,46 +0,0 @@
-import java.awt.*;
-
-public class DrawingWavyEngines implements IDrawingEngines {
-    private EnginesCount enginesCount;
-    private Color color;
-
-    public DrawingWavyEngines(int count, Color bodyColor) {
-        setCount(count);
-        color = bodyColor;
-    }
-
-    @Override
-    public void setCount(int count) {
-        if(count <= 2) enginesCount = EnginesCount.Two;
-        else if(count >= 6) enginesCount = EnginesCount.Six;
-        else enginesCount = EnginesCount.Four;
-    }
-
-    private void drawEngine(Graphics2D g, int x, int y) {
-        g.setColor(color);
-        g.fillRect(x, y, 21, 10);
-
-        g.fillArc(x, y - 4, 7, 8, 0, 180);
-        g.fillArc(x + 7, y - 4, 7, 8, 0, 180);
-        g.fillArc(x + 14, y - 4, 7, 8, 0, 180);
-
-        g.fillArc(x, y + 6, 7, 8, 180, 180);
-        g.fillArc(x + 7, y + 6, 7, 8, 180, 180);
-        g.fillArc(x + 14, y + 6, 7, 8, 180, 180);
-    }
-
-    public void draw(Graphics2D g, int startPosX, int startPosY) {
-        drawEngine(g, startPosX + 84, startPosY + 10);
-        drawEngine(g, startPosX + 84, startPosY + 146);
-
-        if(enginesCount == EnginesCount.Two) return;
-
-        drawEngine(g, startPosX + 84, startPosY + 30);
-        drawEngine(g, startPosX + 84, startPosY + 125);
-
-        if(enginesCount == EnginesCount.Four) return;
-
-        drawEngine(g, startPosX + 84, startPosY + 50);
-        drawEngine(g, startPosX + 84, startPosY + 106);
-    }
-}

EnginesCount.java

@@ -1,5 +0,0 @@
-public enum EnginesCount {
-    Two,
-    Four,
-    Six
-}

EnginesFabric.java

@@ -1,17 +0,0 @@
-import java.awt.*;
-import java.util.Random;
-
-public class EnginesFabric {
-    public static IDrawingEngines createRandom(Color color) {
-        Random rnd = new Random();
-
-        int type = rnd.nextInt(0, 3);
-
-        return switch(type) {
-            case 0 -> new DrawingEngines(rnd.nextInt(1, 7), color);
-            case 1 -> new DrawingWavyEngines(rnd.nextInt(1, 7), color);
-            case 2 -> new DrawingTruncatedEngines(rnd.nextInt(1, 7), color);
-            default -> null;
-        };
-    }
-}

EntityAircraft.java

@@ -1,22 +0,0 @@
-import java.awt.*;
-import java.util.Random;
-
-class EntityAircraft
-{
-    public int Speed;
-    public float Weight;
-    public Color BodyColor;
-
-    public float Step;
-
-    public EntityAircraft(int speed, float weight, Color bodyColor)
-    {
-        Random rnd = new Random();
-
-        Speed = speed <= 0 ? rnd.nextInt(50, 150) : speed;
-        Weight = weight <= 0 ? rnd.nextInt(50, 70) : weight;
-        BodyColor = bodyColor;
-
-        Step = Speed * 100 / Weight;
-    }
-}

EntityModernAircraft.java

@@ -1,18 +0,0 @@
-import java.awt.*;
-
-public class EntityModernAircraft extends EntityAircraft
-{
-    public Color DopColor;
-    public boolean DopWings;
-    public boolean Rockets;
-
-
-    public EntityModernAircraft(int speed, float weight, Color bodyColor, Color
-            dopColor, boolean dopWings, boolean rockets)
-    {
-        super(speed, weight, bodyColor);
-        DopColor = dopColor;
-        DopWings = dopWings;
-        Rockets = rockets;
-    }
-}

Form.java

@@ -1,5 +0,0 @@
-import java.awt.*;
-
-public interface Form {
-    void Draw(Graphics2D g);
-}

FormAircraft.form

@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormAircraft">
-  <grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="3" column-count="7" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
-    <constraints>
-      <xy x="20" y="20" width="745" height="400"/>
-    </constraints>
-    <properties/>
-    <border type="none"/>
-    <children>
-      <grid id="c3c1c" binding="DrawPlace" layout-manager="CardLayout" hgap="0" vgap="0">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="7" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children/>
-      </grid>
-      <grid id="7cdea" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="2" column="0" row-span="1" col-span="7" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
-            <minimum-size width="-1" height="20"/>
-          </grid>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="5d314" class="javax.swing.JLabel" binding="weightLabel">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Вес:  "/>
-            </properties>
-          </component>
-          <component id="fa09a" class="javax.swing.JLabel" binding="speedLabel">
-            <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Скорость:  "/>
-            </properties>
-          </component>
-          <component id="9494b" class="javax.swing.JLabel" binding="colorLabel">
-            <constraints>
-              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Цвет"/>
-            </properties>
-          </component>
-        </children>
-      </grid>
-      <grid id="b5cf" layout-manager="GridLayoutManager" row-count="2" column-count="7" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="7" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <hspacer id="eb27d">
-            <constraints>
-              <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-          </hspacer>
-          <component id="df504" class="javax.swing.JButton" binding="createButton">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="создание"/>
-            </properties>
-          </component>
-          <component id="b31a8" class="javax.swing.JButton" binding="downButton" default-binding="true">
-            <constraints>
-              <grid row="1" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <icon value="Resources/down.png"/>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="1d949" class="javax.swing.JButton" binding="leftButton" default-binding="true">
-            <constraints>
-              <grid row="1" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <icon value="Resources/left.png"/>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="527d2" class="javax.swing.JButton" binding="rightButton" default-binding="true">
-            <constraints>
-              <grid row="1" column="6" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <icon value="Resources/right.png"/>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="5bf4f" class="javax.swing.JButton" binding="upButton" default-binding="true">
-            <constraints>
-              <grid row="0" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <icon value="Resources/up.png"/>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="b6c27" class="javax.swing.JButton" binding="createModifButton">
-            <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="модификация"/>
-            </properties>
-          </component>
-          <component id="9de16" class="javax.swing.JButton" binding="selectButton">
-            <constraints>
-              <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="выбрать"/>
-            </properties>
-          </component>
-        </children>
-      </grid>
-    </children>
-  </grid>
-</form>

FormAircraft.java

@@ -1,125 +0,0 @@
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.util.Random;
-
-public class FormAircraft extends JDialog implements Form {
-    private JButton createButton;
-    private JButton upButton;
-    private JButton rightButton;
-    private JButton downButton;
-    private JButton leftButton;
-    private JPanel mainPanel;
-    private JPanel DrawPlace;
-    private JLabel speedLabel;
-    private JLabel weightLabel;
-    private JLabel colorLabel;
-    private JButton createModifButton;
-    private JButton selectButton;
-
-    DrawingAircraft _airFighter;
-    private DrawingAircraft selectedAircraft;
-
-    public DrawingAircraft getSelectedAircraft() {
-        return selectedAircraft;
-    }
-
-
-    public void run() {
-        add(mainPanel);
-        Canvas canv = new Canvas(this);
-        DrawPlace.add(canv);
-
-
-        createButton.addActionListener(e -> {
-            Dimension canvSize = canv.getSize();
-            Random rnd = new Random();
-
-            Color color = JColorChooser.showDialog(this, "Цвет", Color.BLACK);
-
-            if(color == null) color = Color.BLACK;
-
-            _airFighter = new DrawingAircraft(rnd.nextInt(100, 300), rnd.nextInt(1000, 2000), color);
-
-            _airFighter.SetPosition((int)rnd.nextInt(10, 100), (int)rnd.nextInt(10, 100), canvSize.width, canvSize.height);
-
-            Color bodyColor = _airFighter.AirFighter.BodyColor;
-            String colorString = "(" + bodyColor.getRed() + ", " + bodyColor.getGreen() + ", " + bodyColor.getBlue() + ")";
-
-            speedLabel.setText("Скорость: " + _airFighter.AirFighter.Speed + "   ");
-            weightLabel.setText("Вес: " + _airFighter.AirFighter.Weight + "   ");
-            colorLabel.setText("Цвет: " + colorString);
-
-            canv.repaint();
-        });
-
-        createModifButton.addActionListener(e -> {
-
-            Dimension canvSize = canv.getSize();
-            Random rnd = new Random();
-
-            Color color = JColorChooser.showDialog(this, "Цвет", Color.BLACK);
-            Color dopColor = JColorChooser.showDialog(this, "Цвет", Color.BLACK);
-
-            if(color == null) color = Color.BLACK;
-            if(dopColor == null) dopColor = Color.BLACK;
-
-            _airFighter = new DrawingModernAircraft(rnd.nextInt(100, 300), rnd.nextInt(1000, 2000),
-                    color, dopColor,
-                    rnd.nextInt(0, 2) == 1, rnd.nextInt(0, 2) == 1);
-
-            _airFighter.SetPosition((int)rnd.nextInt(10, 100), (int)rnd.nextInt(10, 100), canvSize.width, canvSize.height);
-
-            Color bodyColor = _airFighter.AirFighter.BodyColor;
-            String colorString = "(" + bodyColor.getRed() + ", " + bodyColor.getGreen() + ", " + bodyColor.getBlue() + ")";
-
-            speedLabel.setText("Скорость: " + _airFighter.AirFighter.Speed + "   ");
-            weightLabel.setText("Вес: " + _airFighter.AirFighter.Weight + "   ");
-            colorLabel.setText("Цвет: " + colorString);
-
-            canv.repaint();
-        });
-
-        selectButton.addActionListener(e -> {
-            selectedAircraft = _airFighter;
-            dispose();
-        });
-
-        addComponentListener(new ComponentAdapter() {
-            @Override
-            public void componentResized(ComponentEvent e) {
-                if(_airFighter == null) return;
-                _airFighter.ChangeBorders(canv.getSize().width, canv.getSize().height);
-                revalidate();
-            }
-        });
-
-        upButton.addActionListener(e -> {
-            if(_airFighter == null) return;
-            _airFighter.MoveTransport(Direction.Up);
-            canv.repaint();
-        });
-        rightButton.addActionListener(e -> {
-            if(_airFighter == null) return;
-            _airFighter.MoveTransport(Direction.Right);
-            canv.repaint();
-        });
-        downButton.addActionListener(e -> {
-            if(_airFighter == null) return;
-            _airFighter.MoveTransport(Direction.Down);
-            canv.repaint();
-        });
-        leftButton.addActionListener(e -> {
-            if(_airFighter == null) return;
-            _airFighter.MoveTransport(Direction.Left);
-            canv.repaint();
-        });
-    }
-
-    @Override
-    public void Draw(Graphics2D g) {
-        if(_airFighter == null) return;
-        _airFighter.DrawTransport(g);
-    }
-}

FormMapWithSetAircrafts.form

@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormMapWithSetAircrafts">
-  <grid id="27dc6" binding="MainPane" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
-    <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
-    </constraints>
-    <properties/>
-    <border type="none"/>
-    <children>
-      <grid id="afa3d" binding="drawPanel" layout-manager="CardLayout" hgap="0" vgap="0">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children/>
-      </grid>
-      <grid id="e9a63" layout-manager="GridLayoutManager" row-count="8" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
-            <minimum-size width="150" height="-1"/>
-          </grid>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="f23ee" class="javax.swing.JButton" binding="buttonAdd">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Добавить"/>
-            </properties>
-          </component>
-          <component id="2e61e" class="javax.swing.JComboBox" binding="comboBoxSelectorMap">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <model>
-                <item value="Простая карта"/>
-                <item value="Моя карта"/>
-              </model>
-            </properties>
-          </component>
-          <component id="5c428" class="javax.swing.JButton" binding="buttonRemove">
-            <constraints>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Удалить"/>
-            </properties>
-          </component>
-          <component id="e24b9" class="javax.swing.JButton" binding="buttonShowStorage">
-            <constraints>
-              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Посмотреть Хранилище"/>
-            </properties>
-          </component>
-          <component id="ac087" class="javax.swing.JButton" binding="buttonShowOnMap">
-            <constraints>
-              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Посмотреть карту"/>
-            </properties>
-          </component>
-          <grid id="2821b" layout-manager="GridLayoutManager" row-count="2" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-            <margin top="0" left="0" bottom="0" right="0"/>
-            <constraints>
-              <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <minimum-size width="150" height="-1"/>
-              </grid>
-            </constraints>
-            <properties/>
-            <border type="none"/>
-            <children>
-              <component id="6d803" class="javax.swing.JButton" binding="leftButton">
-                <constraints>
-                  <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                    <minimum-size width="30" height="30"/>
-                    <preferred-size width="30" height="30"/>
-                    <maximum-size width="30" height="30"/>
-                  </grid>
-                </constraints>
-                <properties>
-                  <icon value="Resources/left.png"/>
-                  <text value=""/>
-                </properties>
-              </component>
-              <component id="c0db2" class="javax.swing.JButton" binding="upButton">
-                <constraints>
-                  <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                    <minimum-size width="30" height="30"/>
-                    <preferred-size width="30" height="30"/>
-                    <maximum-size width="30" height="30"/>
-                  </grid>
-                </constraints>
-                <properties>
-                  <icon value="Resources/up.png"/>
-                  <text value=""/>
-                </properties>
-              </component>
-              <component id="ca0da" class="javax.swing.JButton" binding="downButton">
-                <constraints>
-                  <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                    <minimum-size width="30" height="30"/>
-                    <preferred-size width="30" height="30"/>
-                    <maximum-size width="30" height="30"/>
-                  </grid>
-                </constraints>
-                <properties>
-                  <icon value="Resources/down.png"/>
-                  <text value=""/>
-                </properties>
-              </component>
-              <component id="c3e45" class="javax.swing.JButton" binding="rightButton">
-                <constraints>
-                  <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                    <minimum-size width="30" height="30"/>
-                    <preferred-size width="30" height="30"/>
-                    <maximum-size width="30" height="30"/>
-                  </grid>
-                </constraints>
-                <properties>
-                  <icon value="Resources/right.png"/>
-                  <text value=""/>
-                </properties>
-              </component>
-              <hspacer id="1f200">
-                <constraints>
-                  <grid row="1" column="4" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-                </constraints>
-              </hspacer>
-              <hspacer id="f8b3b">
-                <constraints>
-                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-                </constraints>
-              </hspacer>
-            </children>
-          </grid>
-          <vspacer id="b833e">
-            <constraints>
-              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
-            </constraints>
-          </vspacer>
-          <component id="181ac" class="javax.swing.JTextField" binding="textBoxPosition">
-            <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="-1"/>
-              </grid>
-            </constraints>
-            <properties/>
-          </component>
-        </children>
-      </grid>
-    </children>
-  </grid>
-</form>

FormMapWithSetAircrafts.java

@@ -1,175 +0,0 @@
-import javax.swing.*;
-import javax.swing.text.DefaultFormatterFactory;
-import javax.swing.text.MaskFormatter;
-import java.awt.*;
-import java.text.ParseException;
-import java.util.Objects;
-
-public class FormMapWithSetAircrafts implements Form {
-    private JPanel MainPane;
-    private JButton buttonAdd;
-    private JComboBox comboBoxSelectorMap;
-    private JTextField textBoxPosition;
-    private JButton buttonRemove;
-    private JButton buttonShowStorage;
-    private JButton buttonShowOnMap;
-    private JButton upButton;
-    private JButton leftButton;
-    private JButton rightButton;
-    private JButton downButton;
-    private JPanel drawPanel;
-
-
-    private MapWithSetAircraftsGeneric<DrawingObjectAircraft, AbstractMap> _mapCarsCollectionGeneric;
-    private Canvas canv = new Canvas(this);
-
-    JFrame jFrame = getFrame();
-    Image img;
-
-    private JFrame getFrame() {
-        JFrame frame = new JFrame();
-        frame.setVisible(true);
-        frame.setBounds(300, 100, 800, 600);
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        return frame;
-    }
-
-
-    public void run() {
-        jFrame.add(MainPane);
-        drawPanel.add(canv);
-
-        comboBoxSelectorMap.setSelectedIndex(-1);
-
-        comboBoxSelectorMap.addActionListener(e -> {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.getSelectedItem().toString())
-            {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Моя карта":
-                    map = new MyMap();
-                    break;
-            }
-            if (map != null)
-            {
-                Dimension canvSize = canv.getSize();
-                _mapCarsCollectionGeneric = new MapWithSetAircraftsGeneric<DrawingObjectAircraft, AbstractMap>(
-                        canvSize.width, canvSize.height, map);
-            }
-            else
-            {
-                _mapCarsCollectionGeneric = null;
-            }
-        });
-
-        buttonAdd.addActionListener(e -> {
-            if (_mapCarsCollectionGeneric == null) return;
-
-            FormAircraft dialog = new FormAircraft();
-            dialog.run();
-            dialog.setSize(800, 500);
-            dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
-            dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-
-            dialog.setVisible(true);
-
-            if (dialog.getSelectedAircraft() == null) return;
-
-            DrawingObjectAircraft aircraft = new DrawingObjectAircraft(dialog.getSelectedAircraft());
-            if (_mapCarsCollectionGeneric.addAircraft(aircraft) != -1)
-            {
-                JOptionPane.showMessageDialog(jFrame, "Объект добавлен");
-                img = _mapCarsCollectionGeneric.ShowSet();
-                canv.repaint();
-            }
-            else
-            {
-                JOptionPane.showMessageDialog(jFrame, "Не удалось добавить объект");
-            }
-        });
-
-        buttonRemove.addActionListener(e -> {
-            if(_mapCarsCollectionGeneric == null) return;
-
-            String text = textBoxPosition.getText();
-            if(text.isEmpty()) return;
-
-            if(JOptionPane.showConfirmDialog(
-                    jFrame,
-                    "Вы действительно хотите удалить объект?",
-                    "Удаление",
-                    JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) return;
-
-            int pos;
-            try {
-                pos = Integer.parseInt(text);
-            } catch (Exception err) {
-                return;
-            }
-            pos = Integer.parseInt(text);
-
-            if(_mapCarsCollectionGeneric.removeAircraft(pos) != null) {
-                JOptionPane.showMessageDialog(jFrame, "Объект удален");
-                img = _mapCarsCollectionGeneric.ShowSet();
-                canv.repaint();
-            } else {
-                JOptionPane.showMessageDialog(jFrame, "Не удалось удалить объект");
-            }
-        });
-
-        buttonShowStorage.addActionListener(e -> {
-            if (_mapCarsCollectionGeneric == null)
-            {
-                return;
-            }
-
-            img = _mapCarsCollectionGeneric.ShowSet();
-            canv.repaint();
-        });
-
-        buttonShowOnMap.addActionListener(e -> {
-            if (_mapCarsCollectionGeneric == null)
-            {
-                return;
-            }
-
-            img = _mapCarsCollectionGeneric.ShowOnMap();
-            canv.repaint();
-        });
-
-        leftButton.addActionListener(e -> {
-            if(_mapCarsCollectionGeneric == null) return;
-            img = _mapCarsCollectionGeneric.MoveObject(Direction.Left);
-                    canv.repaint();
-        });
-
-        rightButton.addActionListener(e -> {
-            if(_mapCarsCollectionGeneric == null) return;
-            img = _mapCarsCollectionGeneric.MoveObject(Direction.Right);
-            canv.repaint();
-        });
-
-        upButton.addActionListener(e -> {
-            if(_mapCarsCollectionGeneric == null) return;
-            img = _mapCarsCollectionGeneric.MoveObject(Direction.Up);
-            canv.repaint();
-        });
-
-        downButton.addActionListener(e -> {
-
-            if(_mapCarsCollectionGeneric == null) return;
-            img = _mapCarsCollectionGeneric.MoveObject(Direction.Down);
-            canv.repaint();
-        });
-
-
-    }
-
-    @Override
-    public void Draw(Graphics2D g) {
-        if(img == null) return;
-        g.drawImage(img, 0, 0, null);
-    }
-}

IDrawingEngines.java

@@ -1,6 +0,0 @@
-import java.awt.*;
-
-public interface IDrawingEngines {
-    void setCount(int count);
-    void draw(Graphics2D g, int x, int y);
-}

IDrawingObject.java

@@ -1,11 +0,0 @@
-import java.awt.*;
-
-public interface IDrawingObject
-{
-    float getStep();
-    void SetObject(int x, int y, int width, int height);
-    void MoveObject(Direction direction);
-    void DrawningObject(Graphics2D g);
-    Point GetLeftTop();
-    Point GetRightBottom();
-}

Main.java

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

MapWithSetAircraftsGeneric.java

@@ -1,153 +0,0 @@
-import java.awt.*;
-import java.awt.image.BufferedImage;
-
-public class MapWithSetAircraftsGeneric<T extends IDrawingObject, U extends AbstractMap>
-{
-    private int _pictureWidth;
-    private int _pictureHeight;
-    private int _placeSizeWidth = 210;
-    private int _placeSizeHeight = 170;
-    private SetAircraftsGeneric<T> _setCars;
-    private U _map;
-
-    public MapWithSetAircraftsGeneric(int picWidth, int picHeight, U map)
-    {
-        int width = picWidth / _placeSizeWidth;
-        int height = picHeight / _placeSizeHeight;
-        _setCars = new SetAircraftsGeneric<T>(width * height);
-        _pictureWidth = picWidth;
-        _pictureHeight = picHeight;
-        _map = map;
-    }
-
-    public int addAircraft(T aircraft)
-    {
-        return _setCars.Insert(aircraft);
-    }
-
-    public T removeAircraft(int position)
-    {
-        return _setCars.Remove(position);
-    }
-
-    public Image ShowSet()
-    {
-        BufferedImage img = new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D gr = (Graphics2D) img.getGraphics();
-
-        DrawBackground(gr);
-        DrawCars(gr);
-
-        return img;
-    }
-
-    public Image ShowOnMap()
-    {
-        BufferedImage img = new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = (Graphics2D) img.getGraphics();
-
-        Shaking();
-        for (int i = 0; i < _setCars.getCount(); i++)
-        {
-            var car = _setCars.Get(i);
-            if (car != null)
-            {
-                _map.CreateMap(_pictureWidth, _pictureHeight, car);
-                _map.DrawMapWithObject(g);
-                return img;
-            }
-        }
-
-        return img;
-    }
-
-    public Image MoveObject(Direction direction)
-    {
-        BufferedImage img = new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = (Graphics2D) img.getGraphics();
-
-        if (_map != null)
-        {
-            _map.MoveObject(direction);
-            _map.DrawMapWithObject(g);
-        }
-        return img;
-    }
-
-    private void Shaking()
-    {
-        int j = _setCars.getCount() - 1;
-        for (int i = 0; i < _setCars.getCount(); i++)
-        {
-            if (_setCars.Get(i) == null)
-            {
-                for (; j > i; j--)
-                {
-                    var car = _setCars.Get(j);
-                    if (car != null)
-                    {
-                        _setCars.Insert(car, i);
-                        _setCars.Remove(j);
-                        break;
-                    }
-                }
-                if (j <= i)
-                {
-                    return;
-                }
-            }
-        }
-    }
-
-    private void DrawBackground(Graphics2D g)
-    {
-        Polygon angar = new Polygon();
-
-
-        angar.addPoint(0, _pictureHeight );
-        angar.addPoint(0, _pictureHeight / 4 );
-        angar.addPoint(_pictureWidth / 2 , 9);
-        angar.addPoint(_pictureWidth, _pictureHeight / 4 );
-        angar.addPoint(_pictureWidth, _pictureHeight );
-
-        g.setPaint(new Color(211, 136, 84));
-        g.fillPolygon(angar);
-
-        g.setPaint(new Color(160, 160, 160));
-        g.fillRect(_pictureWidth / 6, (_pictureHeight * 5) / 12, (_pictureWidth * 2) / 3, (_pictureHeight * 7) / 12);
-
-        g.setPaint(Color.black);
-        g.setStroke(new BasicStroke(3));
-
-        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);
-        }
-
-        g.setStroke(new BasicStroke(1));
-    }
-
-    private void DrawCars(Graphics2D g)
-    {
-        int width = _pictureWidth / _placeSizeWidth;
-
-        for (int i = 0; i < _setCars.getCount(); i++)
-        {
-            int x = i % width;
-            int y = i / width;
-
-            T current =_setCars.Get(i);
-
-            if(current == null) continue;
-
-            current.SetObject(x * _placeSizeWidth, y * _placeSizeHeight, _pictureWidth, _pictureHeight);
-            current.DrawningObject(g);
-        }
-    }
-}

MyMap.java

@@ -1,72 +0,0 @@
-import java.awt.*;
-
-public class MyMap extends AbstractMap
-{
-
-    private Color barrierColor = Color.BLACK;
-    private Color roadColor = Color.GRAY;
-
-    @Override
-    protected void DrawBarrierPart(Graphics2D g, int i, int j)
-    {
-        g.setPaint(barrierColor);
-        g.fillRect((int)(j * _size_x), (int)(i * _size_y), (int)Math.ceil(_size_x), (int)Math.ceil(_size_y));
-    }
-
-    @Override
-    protected void DrawRoadPart(Graphics2D g, int i, int j)
-    {
-        g.setPaint(roadColor);
-        g.fillRect((int)(j * _size_x), (int)(i * _size_y), (int)Math.ceil(_size_x), (int)Math.ceil(_size_y));
-    }
-
-    @Override
-    protected void GenerateMap()
-{
-    _map = new int[100][100];
-    _size_x = (float)_width / _map.length;
-    _size_y = (float)_height / _map[0].length;
-
-    for (int i = 0; i < _map.length; ++i)
-    {
-        for (int j = 0; j < _map[0].length; ++j)
-        {
-            _map[i][j] = _freeRoad;
-        }
-    }
-
-
-    for(int i = 0; i < 20; ++i)
-    {
-        int x = _random.nextInt(0, 100);
-        int y = _random.nextInt(0, 100);
-
-        GenerateMap(x, y, _random.nextInt(13, 23));
-    }
-}
-
-    private void GenerateMap(int x, int y, int depth)
-    {
-        if (depth <= 0) return;
-        boolean check = false;
-
-        while (!check)
-        {
-            int deltaX = _random.nextInt(-1, 2);
-            int deltaY = _random.nextInt(-1, 2);
-
-            if (x + deltaX < 0 || x + deltaX >= 100) continue;
-            if (y + deltaY < 0 || y + deltaY >= 100) continue;
-
-            if (_map[y + deltaY][x + deltaX] == _barrier) depth--;
-            x += deltaX;
-            y += deltaY;
-
-            _map[y][x] = _barrier;
-
-            check = true;
-        }
-
-        GenerateMap(x, y, depth - 1);
-    }
-}

SetAircraftsGeneric.java

@@ -1,50 +0,0 @@
-public class SetAircraftsGeneric<T>
-{
-    private T[] _places;
-
-    public int getCount() {
-        return _places.length;
-    }
-
-    public SetAircraftsGeneric(int count)
-    {
-        _places = (T[])(new Object[count]);
-    }
-    public int Insert(T car)
-    {
-        for(int i = 0; i < _places.length; i++)
-        {
-            if (_places[i] == null)
-            {
-                _places[i] = car;
-                return i;
-            }
-        }
-        return -1;
-    }
-    public int Insert(T car, int position)
-    {
-        int index = position;
-
-        while (_places[index] != null && index < _places.length) index++;
-
-        if (index == _places.length) return -1;
-        for (int i = index; i > position; --i) _places[i] = _places[i - 1];
-
-        _places[position] = car;
-        return position;
-    }
-
-    public T Remove(int position)
-    {
-        if(position >= _places.length) return null;
-        T res = _places[position];
-        _places[position] = null;
-        return res;
-    }
-
-    public T Get(int position)
-    {
-        return _places[position];
-    }
-}

SimpleMap.java

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

formAircraftGenerator.form

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="formAircraftGenerator">
-  <grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
-    <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
-    </constraints>
-    <properties/>
-    <border type="none"/>
-    <children>
-      <component id="b9cac" class="javax.swing.JButton" binding="generateButton">
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Сгенерировать"/>
-        </properties>
-      </component>
-      <grid id="d138" binding="drawPanel" layout-manager="CardLayout" hgap="0" vgap="0">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children/>
-      </grid>
-    </children>
-  </grid>
-</form>

formAircraftGenerator.java

@@ -1,76 +0,0 @@
-import javax.swing.*;
-import java.awt.*;
-import java.util.Random;
-
-public class formAircraftGenerator implements Form {
-    private JButton generateButton;
-    private JPanel drawPanel;
-    private JPanel mainPanel;
-    private Canvas canv = new Canvas(this);
-
-    private DrawingAircraft aircraft;
-    private AircraftMixer<EntityAircraft, IDrawingEngines> mixer = new AircraftMixer<>(10, 20);
-    private JFrame jframe = getFrame();
-
-    private JFrame getFrame() {
-        JFrame frame = new JFrame();
-        frame.setVisible(true);
-        frame.setBounds(300, 100, 400, 300);
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        return frame;
-    }
-
-    public void run() {
-        jframe.add(mainPanel);
-        drawPanel.add(canv);
-
-        Random rnd = new Random();
-
-        for(int i = 0; i < 10; ++i) {
-            if(rnd.nextBoolean()) {
-                mixer.add(new EntityAircraft(rnd.nextInt(100, 250), rnd.nextInt(1000, 2000),
-                        new Color(
-                            rnd.nextInt(0, 255),
-                            rnd.nextInt(0, 255),
-                            rnd.nextInt(0, 255)
-                        )));
-                continue;
-            }
-
-            mixer.add(new EntityModernAircraft(rnd.nextInt(100, 250), rnd.nextInt(1000, 2000),
-                    new Color(
-                        rnd.nextInt(0, 255),
-                        rnd.nextInt(0, 255),
-                        rnd.nextInt(0, 255)
-                    ),
-                    new Color(
-                        rnd.nextInt(0, 255),
-                        rnd.nextInt(0, 255),
-                        rnd.nextInt(0, 255)
-                    ),
-                    rnd.nextBoolean(), rnd.nextBoolean()
-            ));
-        }
-
-        for(int i = 0; i < 20; ++i) {
-            Color randomColor = new Color(
-                    rnd.nextInt(0, 255),
-                    rnd.nextInt(0, 255),
-                    rnd.nextInt(0, 255));
-
-            mixer.add(EnginesFabric.createRandom(randomColor));
-        }
-
-        generateButton.addActionListener(e -> {
-            Dimension canvSize = canv.getSize();
-            aircraft = mixer.constructAircraft(canvSize.width, canvSize.height);
-            canv.repaint();
-        });
-    }
-
-    @Override
-    public void Draw(Graphics2D g) {
-        if(aircraft == null) return;
-        aircraft.DrawTransport(g);
-    }
-}

formMap.form

@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="formMap">
-  <grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
-    <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
-    </constraints>
-    <properties/>
-    <border type="none"/>
-    <children>
-      <grid id="e3a5c" binding="DrawPlace" layout-manager="CardLayout" hgap="0" vgap="0">
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <toolTipText value=""/>
-        </properties>
-        <border type="none"/>
-        <children/>
-      </grid>
-      <grid id="6cd69" layout-manager="GridLayoutManager" row-count="2" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <hspacer id="73e7d">
-            <constraints>
-              <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-          </hspacer>
-          <component id="2f248" class="javax.swing.JButton" binding="createButton">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="создание"/>
-            </properties>
-          </component>
-          <component id="59723" class="javax.swing.JButton" binding="downButton" default-binding="true">
-            <constraints>
-              <grid row="1" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <icon value="Resources/down.png"/>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="c4a07" class="javax.swing.JButton" binding="leftButton" default-binding="true">
-            <constraints>
-              <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <icon value="Resources/left.png"/>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="c0037" class="javax.swing.JButton" binding="rightButton" default-binding="true">
-            <constraints>
-              <grid row="1" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <icon value="Resources/right.png"/>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="5b159" class="javax.swing.JButton" binding="upButton" default-binding="true">
-            <constraints>
-              <grid row="0" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <icon value="Resources/up.png"/>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="fb982" class="javax.swing.JButton" binding="modifiedButton">
-            <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Модификация"/>
-            </properties>
-          </component>
-        </children>
-      </grid>
-      <grid id="86a02" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
-            <minimum-size width="-1" height="20"/>
-          </grid>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="81cff" class="javax.swing.JLabel" binding="weightLabel">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Вес:  "/>
-            </properties>
-          </component>
-          <component id="e587f" class="javax.swing.JLabel" binding="speedLabel">
-            <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Скорость:  "/>
-            </properties>
-          </component>
-          <component id="ea489" class="javax.swing.JLabel" binding="colorLabel">
-            <constraints>
-              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Цвет"/>
-            </properties>
-          </component>
-        </children>
-      </grid>
-      <grid id="c8210" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="50374" class="javax.swing.JComboBox" binding="comboBoxSelectorMap">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <minimum-size width="160" height="30"/>
-                <preferred-size width="160" height="30"/>
-                <maximum-size width="160" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <model>
-                <item value="Простая карта"/>
-                <item value="Моя карта"/>
-              </model>
-              <toolTipText value=""/>
-            </properties>
-          </component>
-          <hspacer id="d5463">
-            <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-          </hspacer>
-        </children>
-      </grid>
-    </children>
-  </grid>
-</form>

formMap.java

@@ -1,119 +0,0 @@
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Random;
-
-public class formMap implements Form {
-    private JPanel DrawPlace;
-    private JLabel weightLabel;
-    private JLabel speedLabel;
-    private JLabel colorLabel;
-    private JButton createButton;
-    private JButton downButton;
-    private JButton leftButton;
-    private JButton rightButton;
-    private JButton upButton;
-    private JComboBox comboBoxSelectorMap;
-    private JPanel mainPanel;
-    private JButton modifiedButton;
-
-    private Canvas canv = new Canvas(this);
-    private DrawingAircraft _aircraft;
-    private AbstractMap _abstractMap = new SimpleMap();
-    private JFrame jframe = getFrame();
-
-    public formMap() {
-    }
-
-    private JFrame getFrame() {
-        JFrame frame = new JFrame();
-        frame.setVisible(true);
-        frame.setBounds(300, 100, 800, 600);
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        return frame;
-    }
-
-    private void SetData(DrawingAircraft aircraft)
-    {
-        Color bodyColor = _aircraft.AirFighter.BodyColor;
-        String colorString = "(" + bodyColor.getRed() + ", " + bodyColor.getGreen() + ", " + bodyColor.getBlue() + ")";
-
-        speedLabel.setText("Скорость: " + _aircraft.AirFighter.Speed + "   ");
-        weightLabel.setText("Вес: " + _aircraft.AirFighter.Weight + "   ");
-        colorLabel.setText("Цвет: " + colorString);
-
-        Dimension canvSize = canv.getSize();
-
-        _abstractMap.CreateMap(canvSize.width, canvSize.height, new DrawingObjectAircraft(aircraft));
-    }
-
-    public void run() {
-        jframe.add(mainPanel);
-        DrawPlace.add(canv);
-
-        comboBoxSelectorMap.addActionListener(e -> {
-            String selectedItem = comboBoxSelectorMap.getSelectedItem().toString();
-            switch(selectedItem) {
-                case "Простая карта":
-                    _abstractMap = new SimpleMap();
-                    break;
-                case "Моя карта":
-                    _abstractMap = new MyMap();
-                    break;
-            }
-        });
-
-        createButton.addActionListener(e -> {
-            Random rnd = new Random();
-
-            _aircraft = new DrawingAircraft(rnd.nextInt(100, 300), rnd.nextInt(1000, 2000),
-                    new Color(rnd.nextInt(0, 256), rnd.nextInt(0, 256), rnd.nextInt(0, 256)));
-
-            SetData(_aircraft);
-            canv.repaint();
-        });
-
-        modifiedButton.addActionListener(e -> {
-            Random rnd = new Random();
-
-            _aircraft = new DrawingModernAircraft(rnd.nextInt(100, 300), rnd.nextInt(1000, 2000),
-                    new Color(rnd.nextInt(0, 256), rnd.nextInt(0, 256), rnd.nextInt(0, 256)),
-                    new Color(rnd.nextInt(0, 256), rnd.nextInt(0, 256), rnd.nextInt(0, 256)),
-                    rnd.nextInt(0, 2) == 1, rnd.nextInt(0, 2) == 1);
-
-
-            SetData(_aircraft);
-            canv.repaint();
-        });
-
-        downButton.addActionListener(e -> {
-            if(_abstractMap == null) return;
-            _abstractMap.MoveObject(Direction.Down);
-            canv.repaint();
-        });
-
-        upButton.addActionListener(e -> {
-            if(_abstractMap == null) return;
-            _abstractMap.MoveObject(Direction.Up);
-            canv.repaint();
-        });
-
-        leftButton.addActionListener(e -> {
-            if(_abstractMap == null) return;
-            _abstractMap.MoveObject(Direction.Left);
-            canv.repaint();
-        });
-
-        rightButton.addActionListener(e -> {
-            if(_abstractMap == null) return;
-            _abstractMap.MoveObject(Direction.Right);
-            canv.repaint();
-        });
-    }
-
-    @Override
-    public void Draw(Graphics2D g) {
-        _abstractMap.DrawMapWithObject(g);
-    }
-}