Merge pull request 'Mochalov D.V. Hard LabWork1' (#1) from LabWork01 into master

Reviewed-on: http://student.git.athene.tech/Danila_Mochalov/PIbd-23_Mochalov_D.V._Locomotive_Hard/pulls/1

AbstractMap.java

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

Direction.java

@@ -1,3 +1,3 @@
 public enum Direction {
-    None,Up, Down, Left, Right
+    Up, Down, Left, Right
 }

DrawningLocomotive.java

@@ -1,53 +1,28 @@
 import java.awt.*;
-import java.util.Random;
 
-public class DrawningLocomotive {
+class DrawningLocomotive {
     public EntityLocomotive Locomotive;
-    public IDrawningExtra drawningExtra;
+    public ExtraWheelsDraw extraWheelsDraw;
     /// Левая координата отрисовки локомотива
-    protected float _startPosX;
+    private float _startPosX;
     /// Верхняя координата отрисовки локомотива
-    protected float _startPosY;
+    private float _startPosY;
     /// Ширина окна отрисовки
     private Integer _pictureWidth = null;
     /// Высота окна отрисовки
     private Integer _pictureHeight = null;
     /// Ширина отрисовки локомотива
-    private int _locomotiveWidth = 110;
+    private final int _locomotiveWidth = 120;
     /// Высота отрисовки локомотива
-    private int _locomotiveHeight = 50;
+    private final int _locomotiveHeight = 50;
     /// Инициализация свойств
-    private final Random random = new Random();
+    public void Init(int speed, float weight, Color bodyColor, int wheelsNum, EntityLocomotive entity)
-    public DrawningLocomotive(int speed, float weight, Color bodyColor)
     {
-        int randExtra = random.nextInt(2);
+        Locomotive = entity;
-        switch (random.nextInt(3)){
+        extraWheelsDraw = new ExtraWheelsDraw();
-            case 0:
+        extraWheelsDraw.Init(wheelsNum, bodyColor);
-                drawningExtra = new ExtraStarWheelDraw(randExtra, bodyColor);
+        Locomotive.Init(speed, weight, bodyColor);
-                break;
-            case 1:
-                drawningExtra = new ExtraRoundWheelDraw(randExtra, bodyColor);
-                break;
-            case 2:
-                drawningExtra = new ExtraWheelsDraw(randExtra, bodyColor);
-                break;
-        }
-        Locomotive = new EntityLocomotive(speed, weight, bodyColor);
     }
-
-    public DrawningLocomotive(EntityLocomotive locomotive, IDrawningExtra extra) {
-        drawningExtra = extra;
-        Locomotive = locomotive;
-    }
-
-    // Новый конструктор
-    protected DrawningLocomotive (int speed, float weight, Color bodyColor, int locomotiveWidth, int locomotiveHeight)
-    {
-        this(speed, weight, bodyColor);
-        _locomotiveWidth = locomotiveWidth;
-        _locomotiveHeight = locomotiveHeight;
-    }
-
     /// Установка позиции локомотива
     public void SetPosition(int x, int y, int width, int height)
     {
@@ -115,18 +90,18 @@ public class DrawningLocomotive {
             return;
         }
         //тело
-        g.setColor(Locomotive.getBodyColor());
+        g.setColor(Color.BLACK);
-        g.fillRect((int)_startPosX , (int)_startPosY, 110 - 10, 50 - 10);
+        g.drawRect((int)_startPosX , (int)_startPosY, _locomotiveWidth - 20, _locomotiveHeight - 10);
         //окна
-        g.setColor(Color.BLUE);
+        g.setColor(Locomotive.getBodyColor());
         g.fillRect((int)_startPosX + 10, (int)_startPosY + 10, 10, 10);
         g.fillRect((int)_startPosX + 30, (int)_startPosY + 10, 10, 10);
         g.fillRect((int)_startPosX + 80, (int)_startPosY + 10, 10, 10);
         //дверь
         g.setColor(Color.BLACK);
-        g.fillRect( (int)_startPosX + 50, (int)_startPosY + 10, 10, 20);
+        g.drawRect( (int)_startPosX + 50, (int)_startPosY + 10, 10, 20);
-        //extra
+        //колеса
-        drawningExtra.DrawExtra((int)_startPosX, (int)_startPosY, g);
+        extraWheelsDraw.DrawWheels((int)_startPosX, (int)_startPosY, g);
         //движок
         g.setColor(Locomotive.getBodyColor());
         g.fillRect((int)_startPosX + 100, (int)_startPosY + 10, 10, 30);
@@ -151,10 +126,4 @@ public class DrawningLocomotive {
             _startPosY = _pictureHeight - _locomotiveHeight;
         }
     }
-
-    // Получение текущей позиции объекта
-    public float[] GetCurrentPosition()
-    {
-        return new float[] {/*UP*/_startPosY, /*RIGHT*/ _startPosX + _locomotiveWidth, /*DOWN*/ _startPosY + _locomotiveHeight, /*LEFT*/ _startPosX};
-    }
 }

DrawningObjectLocomotive.java

@@ -1,39 +0,0 @@
-import java.awt.*;
-
-public class DrawningObjectLocomotive implements IDrawningObject {
-    private DrawningLocomotive _locomotive = null;
-
-    public DrawningObjectLocomotive(DrawningLocomotive locomotive)
-    {
-        _locomotive = locomotive;
-    }
-    public float getStep() {
-        if (_locomotive.Locomotive != null) {
-            return _locomotive.Locomotive.Step();
-        }
-        return 0;
-    }
-
-    public void DrawningObject(Graphics g)
-    {
-        if (_locomotive != null) _locomotive.DrawTransport((Graphics2D) g);
-    }
-
-    public float[] GetCurrentPosition()
-    {
-        if (_locomotive != null) {
-            return _locomotive.GetCurrentPosition();
-        }
-        return null;
-    }
-
-    public void MoveObject(Direction direction)
-    {
-        if (_locomotive != null) _locomotive.MoveTransport(direction);
-    }
-
-    public void SetObject(int x, int y, int width, int height)
-    {
-        if (_locomotive != null) _locomotive.SetPosition(x, y, width, height);
-    }
-}

DrawningWarmlyLocomotive.java

@@ -1,44 +0,0 @@
-import java.awt.*;
-public class DrawningWarmlyLocomotive extends DrawningLocomotive{
-    public DrawningWarmlyLocomotive(int speed, float weight, Color bodyColor, Color extraColor, boolean pipe, boolean storage)
-    {
-        super(speed, weight, bodyColor,  140,  70);
-        Locomotive = new EntityWarmlyLocomotive(speed, weight, bodyColor, extraColor, pipe, storage);
-    }
-
-    public DrawningWarmlyLocomotive(EntityLocomotive locomotive, IDrawningExtra extra) {
-        super(locomotive, extra);
-        Locomotive = locomotive;
-    }
-
-    @Override
-    public void DrawTransport(Graphics2D g)
-    {
-        if (Locomotive instanceof EntityWarmlyLocomotive)
-        {
-            EntityWarmlyLocomotive warmlyLocomotive = (EntityWarmlyLocomotive) Locomotive;
-
-            g.setColor(warmlyLocomotive.ExtraColor);
-
-            if (warmlyLocomotive.Pipe)
-            {
-                g.fillRect((int)_startPosX + 10, (int)_startPosY, 30, 20);
-                g.fillRect((int)_startPosX + 60, (int)_startPosY, 20, 20);
-                g.fillRect((int)_startPosX + 60, (int)_startPosY + 10, 30, 10);
-            }
-
-            if (warmlyLocomotive.FuelStorage)
-            {
-                g.fillRect((int)_startPosX + 120, (int)_startPosY + 10, 10, 50);
-                g.fillRect((int)_startPosX + 110, (int)_startPosY + 40, 20, 20);
-                g.fillRect((int)_startPosX + 110, (int)_startPosY, 30, 10);
-            }
-
-            _startPosY += 20;
-
-            super.DrawTransport((Graphics2D)g);
-
-            _startPosY -= 20;
-        }
-    }
-}

EntityLocomotive.java

@@ -19,7 +19,7 @@ public class EntityLocomotive {
         return Speed * 100 / Weight;
     }
 
-    public EntityLocomotive(int speed, float weight, Color bodyColor)
+    public void Init(int speed, float weight, Color bodyColor)
     {
         Random rnd = new Random();
         if (speed <= 0) {

EntityWarmlyLocomotive.java

@@ -1,15 +0,0 @@
-import java.awt.*;
-
-public class EntityWarmlyLocomotive extends EntityLocomotive{
-    public final Color ExtraColor;
-    public final boolean Pipe;
-    public final boolean FuelStorage;
-    public EntityWarmlyLocomotive (int speed, float weight, Color bodyColor, Color extraColor, boolean pipe, boolean fuelStorage)
-    {
-        super(speed, weight, bodyColor);
-        ExtraColor = extraColor;
-        Pipe = pipe;
-        FuelStorage = fuelStorage;
-    }
-
-}

EntityWithExtraCreator.java

@@ -1,44 +0,0 @@
-import java.lang.reflect.Array;
-import java.util.Random;
-
-public class EntityWithExtraCreator <T extends EntityLocomotive, U extends IDrawningExtra> {
-    private final Object[] entityArr;
-    private final Object[] extraArr;
-
-    int entitiesCount = 0;
-    int extraCount = 0;
-
-    public EntityWithExtraCreator(int countEntities, int countExtra) {
-        entityArr = new Object[countEntities];
-        extraArr = new Object[countExtra];
-    }
-
-    public void Insert(T entityLocomotive) {
-        if(entitiesCount < entityArr.length) {
-            entityArr[entitiesCount] = entityLocomotive;
-            entitiesCount++;
-        }
-    }
-
-    public void Insert (U extra) {
-        if(extraCount < extraArr.length) {
-            extraArr[extraCount] = extra;
-            extraCount++;
-        }
-    }
-
-    public DrawningLocomotive getEntityWithExtra() {
-        Random random = new Random();
-        int getEntityRandomIndex = random.nextInt(entityArr.length);
-        int getExtraRandomIndex = random.nextInt(extraArr.length);
-
-        EntityLocomotive locomotive = (T)entityArr[getEntityRandomIndex];
-        IDrawningExtra extra = (U)extraArr[getExtraRandomIndex];
-
-        if (locomotive instanceof EntityWarmlyLocomotive) {
-            return  new DrawningWarmlyLocomotive(locomotive, extra);
-        }
-        return new DrawningLocomotive(locomotive, extra);
-    }
-
-}

ExtraRoundWheelDraw.java

@@ -1,43 +0,0 @@
-import java.awt.*;
-
-public class ExtraRoundWheelDraw  implements  IDrawningExtra{
-    private WheelsCount wheelsCount = WheelsCount.Two;
-    private ExtraWheelsDraw extraWheelsDraw;
-    public void setExtraNum(int num) {
-        switch (num) {
-            case 0: {
-                wheelsCount = WheelsCount.Three;
-                break;
-            }
-            case 1: {
-                wheelsCount = WheelsCount.Four;
-                break;
-            }
-            default:
-                break;
-        }
-    }
-
-    public ExtraRoundWheelDraw (int num, Color bodyColor) {
-        setExtraNum(num);
-        extraWheelsDraw = new ExtraWheelsDraw(num, bodyColor);
-    }
-
-    public void DrawExtra(int startPosX, int startPosY, Graphics2D g) {
-        extraWheelsDraw.DrawExtra(startPosX, startPosY, g);
-        g.setColor(Color.BLACK);
-        g.fillOval(startPosX + 5, startPosY + 35, 10, 10);
-        g.fillOval(startPosX + 95, startPosY + 35, 10, 10);
-        switch (wheelsCount) {
-            case Four: {
-                g.fillOval(startPosX + 75, startPosY + 35, 10, 10);
-            }
-            case Three: {
-                g.fillOval(startPosX + 25, startPosY + 35, 10, 10);
-                break;
-            }
-            default:
-                break;
-        }
-    }
-}

ExtraStarWheelDraw.java

@@ -1,50 +0,0 @@
-import java.awt.*;
-
-public class ExtraStarWheelDraw implements IDrawningExtra{
-    private WheelsCount wheelsCount = WheelsCount.Two;
-    private ExtraWheelsDraw extraWheelsDraw;
-    public void setExtraNum(int num) {
-        switch (num) {
-            case 0: {
-                wheelsCount = WheelsCount.Three;
-                break;
-            }
-            case 1: {
-                wheelsCount = WheelsCount.Four;
-                break;
-            }
-            default:
-                break;
-        }
-    }
-
-    public ExtraStarWheelDraw (int num, Color bodyColor) {
-        setExtraNum(num);
-        extraWheelsDraw = new ExtraWheelsDraw(num, bodyColor);
-    }
-
-    public void DrawExtra(int startPosX, int startPosY, Graphics2D g) {
-        extraWheelsDraw.DrawExtra(startPosX, startPosY, g);
-        DrawStarOnWheel(startPosX, startPosY + 30, g);
-        DrawStarOnWheel(startPosX + 90, startPosY + 30, g);
-        switch (wheelsCount) {
-            case Four: {
-                DrawStarOnWheel(startPosX + 70, startPosY + 30, g);
-            }
-            case Three: {
-                DrawStarOnWheel(startPosX + 20, startPosY + 30, g);
-                break;
-            }
-            default:
-                break;
-        }
-    }
-
-    private void DrawStarOnWheel(int startPosX, int startPosY, Graphics2D g) {
-        g.drawLine(startPosX + 10, startPosY, startPosX + 15, startPosY + 17);
-        g.drawLine(startPosX + 10, startPosY, startPosX + 5, startPosY + 17);
-        g.drawLine(startPosX + 15, startPosY + 17, startPosX + 2, startPosY + 8);
-        g.drawLine(startPosX + 5, startPosY + 17, startPosX + 18, startPosY + 8);
-        g.drawLine(startPosX + 2, startPosY + 8, startPosX + 18, startPosY + 8);
-    }
-}

ExtraWheelsDraw.java

@@ -1,8 +1,8 @@
 import java.awt.*;
 
-public class ExtraWheelsDraw implements IDrawningExtra{
+public class ExtraWheelsDraw {
     private WheelsCount wheelsCount = WheelsCount.Two;
-    public void setExtraNum(int num) {
+    public void setWheelsNum(int num) {
         switch (num) {
             case 0: {
                 wheelsCount = WheelsCount.Three;
@@ -18,29 +18,21 @@ public class ExtraWheelsDraw implements IDrawningExtra{
     }
     private Color color;
 
-    public ExtraWheelsDraw(int num, Color color) {
+    public void Init(int num, Color color) {
-        setExtraNum(num);
+        setWheelsNum(num);
         this.color = color;
     }
 
-    public void DrawExtra(int startPosX, int startPosY, Graphics2D g) {
+    public void DrawWheels(int startPosX, int startPosY, Graphics2D g) {
-        g.setColor(Color.BLACK);
-        g.drawOval(startPosX, startPosY + 30, 20, 20);
-        g.drawOval(startPosX + 90, startPosY + 30, 20, 20);
         g.setColor(color);
-        g.fillOval(startPosX, startPosY + 30, 20, 20);
+        g.drawOval(startPosX, startPosY + 40, 10, 10);
-        g.fillOval(startPosX + 90, startPosY + 30, 20, 20);
+        g.drawOval(startPosX + 90, startPosY + 40, 10, 10);
         switch (wheelsCount) {
             case Four: {
-                g.setColor(Color.BLACK);
+                g.drawOval(startPosX + 70, startPosY + 40, 10, 10);
-                g.drawOval(startPosX + 70, startPosY + 30, 20, 20);
-                g.setColor(color);
-                g.fillOval(startPosX + 70, startPosY + 30, 20, 20);
             }
             case Three: {
-                g.fillOval(startPosX + 20, startPosY + 30, 20, 20);
+                g.drawOval(startPosX + 20, startPosY + 40, 10, 10);
-                g.setColor(Color.BLACK);
-                g.drawOval(startPosX + 20, startPosY + 30, 20, 20);
                 break;
             }
             default:

FormEntityWithExtraGallery.java

@@ -1,87 +0,0 @@
-import javax.swing.*;
-import java.awt.*;
-import java.util.Random;
-
-public class FormEntityWithExtraGallery extends JComponent {
-    private DrawningLocomotive _locomotiveFirst;
-    private DrawningLocomotive _locomotiveSecond;
-    private DrawningLocomotive _locomotiveThird;
-    EntityWithExtraCreator<EntityLocomotive, IDrawningExtra> entityWithExtraCreator;
-
-    public FormEntityWithExtraGallery() {
-        JFrame formFrame = new JFrame("Gallery");
-        formFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-        formFrame.setSize(900, 500);
-        formFrame.setLocationRelativeTo(null);
-
-        Panel statusPanel = new Panel();
-        statusPanel.setBackground(Color.WHITE);
-        statusPanel.setLayout(new FlowLayout());
-        setLayout(new BorderLayout());
-        add(statusPanel, BorderLayout.SOUTH);
-
-        JButton showRandomEntity = new JButton("Create entity from parts");
-        showRandomEntity.addActionListener(e -> {
-
-            Random random = new Random();
-            if (entityWithExtraCreator == null) {
-                entityWithExtraCreator = new EntityWithExtraCreator<EntityLocomotive, IDrawningExtra>(20, 20);
-                for (int i = 0; i < 20; i ++) {
-                    if (random.nextBoolean()) {
-                        entityWithExtraCreator.Insert(new EntityLocomotive(random.nextInt(100), random.nextInt(100),
-                                new Color(random.nextInt(255),random.nextInt(255),random.nextInt(255))));
-                    }
-                    else {
-                        entityWithExtraCreator.Insert(new EntityWarmlyLocomotive(random.nextInt(100), random.nextInt(100),
-                                new Color(random.nextInt(255),random.nextInt(255),random.nextInt(255)),
-                                new Color(random.nextInt(255),random.nextInt(255),random.nextInt(255)),
-                                random.nextBoolean(), random.nextBoolean()));
-                    }
-                }
-                for (int i = 0; i < 20; i ++) {
-                    int extraRand = random.nextInt(3);
-                    switch (extraRand) {
-                        case 0:
-                            entityWithExtraCreator.Insert(new ExtraWheelsDraw(random.nextInt(3),
-                                    new Color(random.nextInt(255),random.nextInt(255),random.nextInt(255))));
-                            break;
-
-                        case 1:
-                            entityWithExtraCreator.Insert(new ExtraStarWheelDraw(random.nextInt(3),
-                                    new Color(random.nextInt(255),random.nextInt(255),random.nextInt(255))));
-                            break;
-
-                        case 2:
-                            entityWithExtraCreator.Insert(new ExtraRoundWheelDraw(random.nextInt(3),
-                                    new Color(random.nextInt(255),random.nextInt(255),random.nextInt(255))));
-                            break;
-                    }
-                }
-            }
-            _locomotiveFirst = entityWithExtraCreator.getEntityWithExtra();
-            _locomotiveFirst.SetPosition(200, 200, formFrame.getWidth(), formFrame.getHeight() - 75);
-
-            _locomotiveSecond = entityWithExtraCreator.getEntityWithExtra();
-            _locomotiveSecond.SetPosition(400, 200, formFrame.getWidth(), formFrame.getHeight() - 75);
-
-            _locomotiveThird = entityWithExtraCreator.getEntityWithExtra();
-            _locomotiveThird.SetPosition(600, 200, formFrame.getWidth(), formFrame.getHeight() - 75);
-            repaint();
-        });
-        statusPanel.add(showRandomEntity);
-
-        formFrame.getContentPane().add(this);
-
-        formFrame.setVisible(true);
-    }
-
-    @Override
-    protected void paintComponent(Graphics g) {
-        super.paintComponent(g);
-        Graphics2D g2 = (Graphics2D)g;
-        if (_locomotiveFirst != null) _locomotiveFirst.DrawTransport(g2);
-        if (_locomotiveSecond != null) _locomotiveSecond.DrawTransport(g2);
-        if (_locomotiveThird != null) _locomotiveThird.DrawTransport(g2);
-        super.repaint();
-    }
-}

FormLocomotive.java

@@ -1,14 +1,31 @@
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.*;
 import java.util.Random;
 
 public class FormLocomotive extends JComponent{
     private DrawningLocomotive _locomotive;
-    private DrawningLocomotive SelectedLocomotive;
+    private EntityLocomotive _entity;
-    public DrawningLocomotive getSelectedLocomotive() {
+    public FormLocomotive() {
-        return SelectedLocomotive;
+        JFrame formFrame = new JFrame("Locomotive");
-    }
+        formFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-    public FormLocomotive(JDialog caller) {
+        formFrame.setSize(800, 500);
+        formFrame.setVisible(true);
+        formFrame.setLocationRelativeTo(null);
+
+        formFrame.addComponentListener(new ComponentListener() {
+            @Override
+            public void componentResized(ComponentEvent e) {
+                if (_locomotive != null) _locomotive.ChangeBorders(formFrame.getWidth(), formFrame.getHeight());
+                repaint();
+            }
+            @Override
+            public void componentMoved(ComponentEvent e) {}
+            @Override
+            public void componentShown(ComponentEvent e) {}
+            @Override
+            public void componentHidden(ComponentEvent e) {}
+        });
 
         Panel statusPanel = new Panel();
         statusPanel.setBackground(Color.WHITE);
@@ -23,68 +40,40 @@ public class FormLocomotive extends JComponent{
         JButton createButton = new JButton("Create");
         createButton.addActionListener(e -> {
             Random rnd = new Random();
-
+            _locomotive = new DrawningLocomotive();
-            Color colorFirst = JColorChooser.showDialog(null, "Цвет", new Color(rnd.nextInt(256), rnd.nextInt(256),rnd.nextInt(256)));
+            _entity = new EntityLocomotive();
-
+            _locomotive.Init(100 + rnd.nextInt(200), 1000 + rnd.nextInt(1000), Color.getHSBColor(rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256)), rnd.nextInt(3), _entity);
-            _locomotive = new DrawningLocomotive(rnd.nextInt(200) + 100, rnd.nextInt(1000) + 1000, colorFirst);
+            _locomotive.SetPosition(10 + rnd.nextInt(90), 10 + rnd.nextInt(90), formFrame.getWidth(), formFrame.getHeight() - 75);
-            _locomotive.SetPosition(10 + rnd.nextInt(90), 10 + rnd.nextInt(90), 800, 500-75);
             speedLabel.setText("Speed: " + _locomotive.Locomotive.getSpeed());
             weightLabel.setText("Weight: " + (int)_locomotive.Locomotive.getWeight());
             colorLabel.setText("Color: " + _locomotive.Locomotive.getBodyColor().getRed() + " " +  _locomotive.Locomotive.getBodyColor().getGreen() + " " + _locomotive.Locomotive.getBodyColor().getBlue() );
             repaint();
         });
 
-        JButton modifiedButton = new JButton("Modified");
-        modifiedButton.addActionListener(e -> {
-            Random rnd = new Random();
-
-            Color colorFirst = JColorChooser.showDialog(null, "Color", new Color(rnd.nextInt(256), rnd.nextInt(256),rnd.nextInt(256)));
-            Color colorSecond = JColorChooser.showDialog(null, "Color", new Color(rnd.nextInt(256), rnd.nextInt(256),rnd.nextInt(256)));
-
-            _locomotive = new DrawningWarmlyLocomotive(rnd.nextInt(200) + 100, rnd.nextInt(1000) + 1000,
-                    colorFirst,
-                    colorSecond,
-                    rnd.nextBoolean(),
-                    rnd.nextBoolean());
-            _locomotive.SetPosition(10 + rnd.nextInt(90), 10 + rnd.nextInt(90), 800, 500 - 75);
-            speedLabel.setText("Speed: " + _locomotive.Locomotive.getSpeed());
-            weightLabel.setText("Weight: " + (int)_locomotive.Locomotive.getWeight());
-            colorLabel.setText("Color: " + _locomotive.Locomotive.getBodyColor().getRed() + " " +  _locomotive.Locomotive.getBodyColor().getGreen() + " " + _locomotive.Locomotive.getBodyColor().getBlue() );
-            repaint();
-        });
-
-        JButton selectLocomotiveButton = new JButton("Select");
-        selectLocomotiveButton.addActionListener(e -> {
-            SelectedLocomotive = _locomotive;
-            caller.dispose();
-        });
-
         statusPanel.add(createButton);
-        statusPanel.add(modifiedButton);
-        statusPanel.add(selectLocomotiveButton);
         statusPanel.add(speedLabel);
         statusPanel.add(weightLabel);
         statusPanel.add(colorLabel);
 
-        JButton moveDownButton = new JButton("D");
+        JButton moveDownButton = new JButton("Down");
         moveDownButton.addActionListener(e -> {
             if (_locomotive != null) _locomotive.MoveTransport(Direction.Down);
             repaint();
         });
 
-        JButton moveUpButton = new JButton("U");
+        JButton moveUpButton = new JButton("Up");
         moveUpButton.addActionListener(e -> {
             if (_locomotive != null) _locomotive.MoveTransport(Direction.Up);
             repaint();
         });
 
-        JButton moveLeftButton = new JButton("L");
+        JButton moveLeftButton = new JButton("Left");
         moveLeftButton.addActionListener(e -> {
             if (_locomotive != null) _locomotive.MoveTransport(Direction.Left);
             repaint();
         });
 
-        JButton moveRightButton = new JButton("R");
+        JButton moveRightButton = new JButton("Right");
         moveRightButton.addActionListener(e -> {
             if (_locomotive != null) _locomotive.MoveTransport(Direction.Right);
             repaint();
@@ -94,7 +83,10 @@ public class FormLocomotive extends JComponent{
         statusPanel.add(moveDownButton);
         statusPanel.add(moveLeftButton);
         statusPanel.add(moveRightButton);
+
+        formFrame.getContentPane().add(this);
     }
+
     @Override
     protected void paintComponent(Graphics g) {
         super.paintComponent(g);
@@ -102,7 +94,8 @@ public class FormLocomotive extends JComponent{
         if (_locomotive != null) _locomotive.DrawTransport(g2);
         super.repaint();
     }
+
     public static void main(String[] args) {
-        new FormMapWithSetLocomotives();
+        FormLocomotive formLocomotive = new FormLocomotive();
     }
 }

FormMap.java

@@ -1,129 +0,0 @@
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
-import java.util.Random;
-
-public class FormMap extends JComponent {
-
-    private AbstractMap _abstractMap;
-    private BufferedImage bufferImg = null;
-
-    public FormMap() {
-        JFrame formFrame = new JFrame("Form Map");
-        formFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        formFrame.setSize(1000, 500);
-        formFrame.setVisible(true);
-        formFrame.setLocationRelativeTo(null);
-
-        Panel statusPanel = new Panel();
-        statusPanel.setBackground(Color.WHITE);
-        statusPanel.setLayout(new FlowLayout());
-        setLayout(new BorderLayout());
-        add(statusPanel, BorderLayout.SOUTH);
-
-        Label speedLabel = new Label("Speed:         ");
-        Label weightLabel = new Label("Weight:       ");
-        Label colorLabel = new Label("Color:                    ");
-
-        String[] maps = {
-                "Simple Map",
-                "Spike Map",
-                "Rail Map"
-        };
-        JComboBox mapSelectComboBox = new JComboBox(maps);
-        mapSelectComboBox.setEditable(true);
-        mapSelectComboBox.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                String item = (String)mapSelectComboBox.getSelectedItem();
-                if (item == null) return;
-                switch (item) {
-                    case ("Simple Map"):
-                        _abstractMap = new SimpleMap();
-                        break;
-                    case ("Spike Map"):
-                        _abstractMap = new SpikeMap();
-                        break;
-                    case ("Rail Map"):
-                        _abstractMap = new RailMap();
-                        break;
-                }
-            }
-        });
-
-        JButton createButton = new JButton("Create");
-        createButton.addActionListener(e -> {
-            Random rnd = new Random();
-            var locomotive = new DrawningLocomotive(rnd.nextInt(200) + 100, rnd.nextInt(1000) + 1000, new Color(rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256)));
-            speedLabel.setText("Speed: " + locomotive.Locomotive.getSpeed());
-            weightLabel.setText("Weight: " + (int)locomotive.Locomotive.getWeight());
-            colorLabel.setText("Color: " + locomotive.Locomotive.getBodyColor().getRed() + " " +  locomotive.Locomotive.getBodyColor().getGreen() + " " + locomotive.Locomotive.getBodyColor().getBlue());
-            if (_abstractMap != null) bufferImg = _abstractMap.CreateMap(1000, 490, new DrawningObjectLocomotive(locomotive));
-            repaint();
-        });
-
-        JButton modifiedButton = new JButton("Modified");
-        modifiedButton.addActionListener(e -> {
-            Random rnd = new Random();
-            var locomotive = new DrawningWarmlyLocomotive(rnd.nextInt(200) + 100, rnd.nextInt(1000) + 1000,
-                    new Color(rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256)),
-                    new Color(rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256)),
-                    rnd.nextBoolean(),
-                    rnd.nextBoolean());
-            speedLabel.setText("Speed: " + locomotive.Locomotive.getSpeed());
-            weightLabel.setText("Weight: " + (int)locomotive.Locomotive.getWeight());
-            colorLabel.setText("Color: " + locomotive.Locomotive.getBodyColor().getRed() + " " +  locomotive.Locomotive.getBodyColor().getGreen() + " " + locomotive.Locomotive.getBodyColor().getBlue() );
-            if (_abstractMap != null) bufferImg = _abstractMap.CreateMap(1000, 490, new DrawningObjectLocomotive(locomotive));
-            repaint();
-        });
-        statusPanel.add(mapSelectComboBox);
-        statusPanel.add(createButton);
-        statusPanel.add(modifiedButton);
-        statusPanel.add(speedLabel);
-        statusPanel.add(weightLabel);
-        statusPanel.add(colorLabel);
-
-        JButton moveDownButton = new JButton("Down");
-        moveDownButton.addActionListener(e -> {
-            if(bufferImg != null) bufferImg = _abstractMap.MoveObject(Direction.Down);
-            repaint();
-        });
-
-        JButton moveUpButton = new JButton("Up");
-        moveUpButton.addActionListener(e -> {
-            if(bufferImg != null) bufferImg = _abstractMap.MoveObject(Direction.Up);
-            repaint();
-        });
-
-        JButton moveLeftButton = new JButton("Left");
-        moveLeftButton.addActionListener(e -> {
-            if(bufferImg != null) bufferImg = _abstractMap.MoveObject(Direction.Left);
-            repaint();
-        });
-
-        JButton moveRightButton = new JButton("Right");
-        moveRightButton.addActionListener(e -> {
-            if(bufferImg != null) bufferImg = _abstractMap.MoveObject(Direction.Right);
-            repaint();
-        });
-
-        statusPanel.add(moveUpButton);
-        statusPanel.add(moveDownButton);
-        statusPanel.add(moveLeftButton);
-        statusPanel.add(moveRightButton);
-
-        formFrame.getContentPane().add(this);
-        super.repaint();
-    }
-
-    @Override
-    protected void paintComponent(Graphics g) {
-        super.paintComponent(g);
-        Graphics2D g2 = (Graphics2D)g;
-        if (bufferImg != null) g2.drawImage(bufferImg, 0,0,1000,490,null);
-        super.repaint();
-    }
-
-}

FormMapWithSetLocomotives.java

@@ -1,205 +0,0 @@
-import javax.swing.*;
-import javax.swing.text.MaskFormatter;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
-import java.text.ParseException;
-
-public class FormMapWithSetLocomotives extends JComponent {
-    private BufferedImage bufferImg = null;
-    /// Объект от класса карты с набором объектов
-    private MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> _mapLocomotivesCollectionGeneric;
-    public FormMapWithSetLocomotives() {
-        JFrame formFrame = new JFrame("Form Map With SetLocomotives");
-        formFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        formFrame.setSize(750, 500);
-        formFrame.setLocationRelativeTo(null);
-
-        Panel statusPanel = new Panel();
-        statusPanel.setBackground(Color.WHITE);
-        statusPanel.setLayout(new GridLayout(0, 1, 20, 20));
-        setLayout(new BorderLayout());
-        add(statusPanel, BorderLayout.EAST);
-
-        // КомбоБокс с картами
-        String[] maps = {
-                "Simple Map",
-                "Spike Map",
-                "Rail Map"
-        };
-        JComboBox mapSelectComboBox = new JComboBox(maps);
-        mapSelectComboBox.setEditable(true);
-        mapSelectComboBox.addActionListener(e -> {
-            AbstractMap map = null;
-            String item = (String)mapSelectComboBox.getSelectedItem();
-            switch (item) {
-                case "Simple Map":
-                    map = new SimpleMap();
-                    break;
-                case "Spike Map":
-                    map = new SpikeMap();
-                    break;
-                case "Rail Map":
-                    map = new RailMap();
-                    break;
-            }
-            if (map != null)
-            {
-                _mapLocomotivesCollectionGeneric = new MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>
-                        (600, 500, map);
-            }
-            else
-            {
-                _mapLocomotivesCollectionGeneric = null;
-            }
-        });
-        statusPanel.add(mapSelectComboBox);
-
-        // Кнопка добавления локомотива
-        JButton addLocomotiveButton = new JButton("Add Locomotive");
-        addLocomotiveButton.addActionListener(e -> {
-            // логика добавления
-            if (_mapLocomotivesCollectionGeneric == null)
-            {
-                return;
-            }
-            JDialog dialog = new JDialog(formFrame, "Dialog", true);
-            FormLocomotive formLocomotive = new FormLocomotive(dialog);
-            dialog.setSize(800, 500);
-            dialog.setContentPane(formLocomotive);
-            dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-            dialog.setVisible(true);
-            DrawningObjectLocomotive locomotive = new DrawningObjectLocomotive(formLocomotive.getSelectedLocomotive());
-            if (_mapLocomotivesCollectionGeneric.Plus(locomotive) != -1) {
-                JOptionPane.showMessageDialog(formFrame, "Object added", "Success", JOptionPane.OK_CANCEL_OPTION);
-                bufferImg = _mapLocomotivesCollectionGeneric.ShowSet();
-                repaint();
-            }
-            else {
-                JOptionPane.showMessageDialog(formFrame, "Object cannot be added", "Error", JOptionPane.OK_CANCEL_OPTION);
-            }
-        });
-        statusPanel.add(addLocomotiveButton);
-
-        // Текстовое поле для ввода позиции с маской
-        JFormattedTextField maskedTextFieldPosition = null;
-        try {
-            MaskFormatter positionMask = new MaskFormatter("##");
-            maskedTextFieldPosition = new JFormattedTextField(positionMask);
-            statusPanel.add(maskedTextFieldPosition);
-        }
-        catch (ParseException e) {
-            e.printStackTrace();
-        }
-        //Кнопка удаления локомотива
-        JButton deleteLocomotiveButton = new JButton("Delete Locomotive");
-        JFormattedTextField finalMaskedTextFieldPosition = maskedTextFieldPosition;
-        deleteLocomotiveButton.addActionListener(e -> {
-            // логика удаления
-            if ((String)mapSelectComboBox.getSelectedItem() == null) {
-                return;
-            }
-            if (finalMaskedTextFieldPosition == null) {
-                return;
-            }
-            int position = Integer.parseInt(finalMaskedTextFieldPosition.getText());
-            if (_mapLocomotivesCollectionGeneric.Minus(position) != null) {
-                JOptionPane.showMessageDialog(formFrame, "Object removed", "Success", JOptionPane.OK_CANCEL_OPTION);
-                bufferImg = _mapLocomotivesCollectionGeneric.ShowSet();
-                repaint();
-            }
-            else{
-                JOptionPane.showMessageDialog(formFrame, "Object cannot be removed", "Error", JOptionPane.OK_CANCEL_OPTION);
-            }
-        });
-        statusPanel.add(deleteLocomotiveButton);
-        //Кнопка просмотра хранилища
-        JButton showStorageButton = new JButton("Show Storage");
-        showStorageButton.addActionListener(e -> {
-            // логика просмотра
-            if (_mapLocomotivesCollectionGeneric == null)
-            {
-                return;
-            }
-            bufferImg = _mapLocomotivesCollectionGeneric.ShowSet();
-            repaint();
-        });
-        statusPanel.add(showStorageButton);
-        //Кнопка просмотра карты
-        JButton showOnMapButton = new JButton("Show On Map");
-        showOnMapButton.addActionListener(e -> {
-            // логика просмотра
-            if (_mapLocomotivesCollectionGeneric == null)
-            {
-                return;
-            }
-            bufferImg = _mapLocomotivesCollectionGeneric.ShowOnMap();
-        });
-        statusPanel.add(showOnMapButton);
-
-        ActionListener moveButtonListener = new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (_mapLocomotivesCollectionGeneric == null)
-                {
-                    return;
-                }
-                String name = e.getActionCommand();
-                Direction dir = Direction.None;
-                switch (name)
-                {
-                    case "Up":
-                        dir = Direction.Up;
-                        break;
-                    case "Down":
-                        dir = Direction.Down;
-                        break;
-                    case "Left":
-                        dir = Direction.Left;
-                        break;
-                    case "Right":
-                        dir = Direction.Right;
-                        break;
-                }
-                bufferImg = _mapLocomotivesCollectionGeneric.MoveObject(dir);
-            }
-        };
-
-        //Кнопки управления
-        JButton moveDownButton = new JButton("Down");
-        moveDownButton.addActionListener(moveButtonListener);
-
-        JButton moveUpButton = new JButton("Up");
-        moveUpButton.addActionListener(moveButtonListener);
-
-        JButton moveLeftButton = new JButton("Left");
-        moveLeftButton.addActionListener(moveButtonListener);
-
-        JButton moveRightButton = new JButton("Right");
-        moveRightButton.addActionListener(moveButtonListener);
-
-        statusPanel.add(moveUpButton);
-        statusPanel.add(moveDownButton);
-        statusPanel.add(moveLeftButton);
-        statusPanel.add(moveRightButton);
-
-        JButton showGalleryButton = new JButton("Show Gallery");
-        showGalleryButton.addActionListener(e -> {
-            new FormEntityWithExtraGallery();
-        });
-        statusPanel.add(showGalleryButton);
-
-        formFrame.getContentPane().add(this);
-        formFrame.setVisible(true);
-    }
-
-    @Override
-    protected void paintComponent(Graphics g) {
-        super.paintComponent(g);
-        Graphics2D g2 = (Graphics2D)g;
-        if (bufferImg != null) g2.drawImage(bufferImg, 0,0,600,500,null);
-        super.repaint();
-    }
-
-}

IDrawningExtra.java

@@ -1,6 +0,0 @@
-import java.awt.*;
-
-public interface IDrawningExtra {
-    void setExtraNum(int num);
-    void DrawExtra(int startPosX, int startPosY, Graphics2D g);
-}

IDrawningObject.java

@@ -1,17 +0,0 @@
-import java.awt.*;
-public interface IDrawningObject {
-    /// Шаг перемещения объекта
-    float getStep();
-    /// Установка позиции объекта
-    void SetObject(int x, int y, int width, int height);
-    /// Изменение направления перемещения объекта
-    void MoveObject(Direction direction);
-    /// Отрисовка объекта
-    void DrawningObject(Graphics g);
-    /// Получение текущей позиции объекта
-    float[] GetCurrentPosition();
-    //0 - up
-    //1 - right
-    //2 - down
-    //3 - left
-}

MapWithSetLocomotivesGeneric.java

@@ -1,168 +0,0 @@
-import java.awt.*;
-import java.awt.image.BufferedImage;
-
-public class MapWithSetLocomotivesGeneric
-        <T extends IDrawningObject, U extends AbstractMap>
-{
-    /// Ширина окна отрисовки
-    private final int _pictureWidth;
-    /// Высота окна отрисовки
-    private final int _pictureHeight;
-    /// Размер занимаемого объектом места (ширина)
-    private final int _placeSizeWidth = 210;
-    /// Размер занимаемого объектом места (высота)
-    private final int _placeSizeHeight = 90;
-
-    /// Набор объектов
-    private final SetLocomotivesGeneric<T> _setLocomotives;
-    /// Карта
-    private final U _map;
-    /// Конструктор
-    public MapWithSetLocomotivesGeneric(int picWidth, int picHeight, U map)
-    {
-        int width = picWidth / _placeSizeWidth;
-        int height = picHeight / _placeSizeHeight;
-        _setLocomotives = new SetLocomotivesGeneric<T>(width * height);
-        _pictureWidth = picWidth;
-        _pictureHeight = picHeight;
-        _map = map;
-    }
-
-    /// Добавление
-    public int Plus(T locomotive)
-    {
-        return this._setLocomotives.Insert(locomotive);
-    }
-    /// Удаление
-    public T Minus(int position)
-    {
-        return this._setLocomotives.Remove(position);
-    }
-    /// Вывод всего набора объектов
-    public BufferedImage ShowSet()
-    {
-        BufferedImage bmp = new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_RGB);
-        Graphics gr = bmp.getGraphics();
-        DrawBackground((Graphics2D)gr);
-        DrawLocomotives((Graphics2D)gr);
-        return bmp;
-    }
-
-    /// Просмотр объекта на карте
-    public BufferedImage ShowOnMap()
-    {
-        Shaking();
-        for (int i = 0; i < _setLocomotives.Count(); i++)
-        {
-            var locomotive = _setLocomotives.Get(i);
-            if (locomotive != null)
-            {
-                return _map.CreateMap(_pictureWidth, _pictureHeight, locomotive);
-            }
-        }
-        return new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_RGB);
-    }
-
-    /// Перемещение объекта по крате
-    public BufferedImage MoveObject(Direction direction)
-    {
-        if (_map != null)
-        {
-            return _map.MoveObject(direction);
-        }
-        return new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_RGB);
-    }
-
-    /// "Взбалтываем" набор, чтобы все элементы оказались в начале
-    private void Shaking()
-    {
-        int j = _setLocomotives.Count() - 1;
-        for (int i = 0; i < _setLocomotives.Count(); i++)
-        {
-            if (_setLocomotives.Get(i) == null)
-            {
-                for (; j > i; j--)
-                {
-                    var locomotive = _setLocomotives.Get(j);
-                    if (locomotive != null)
-                    {
-                        _setLocomotives.Insert(locomotive, i);
-                        _setLocomotives.Remove(j);
-                        break;
-                    }
-                }
-                if (j <= i)
-                {
-                    return;
-                }
-            }
-        }
-    }
-
-    /// Метод отрисовки фона
-    private void DrawBackground(Graphics2D g)
-    {
-        g.setColor(Color.WHITE);
-        g.fillRect(0,0,600, 500);
-        for (int j = _placeSizeHeight; j < _pictureHeight; j+= _placeSizeHeight)
-        {
-            //нижняя линия рельс
-            g.setColor(Color.BLACK);
-            g.setStroke(new BasicStroke(5));
-
-            g.drawLine(0, j, _pictureWidth, j);
-            for (int i = 0; i < _pictureWidth; i+=20)
-            {
-                g.drawLine(i, j, i, j + 10);
-            }
-            g.drawLine(0, j + 10, _pictureWidth, j + 10);
-
-            //верхняя линия рельс
-
-            g.setColor(Color.GRAY);
-
-            g.drawLine(0, j - 20, _pictureWidth, j - 20);
-            for (int i = 0; i < _pictureWidth; i += 20)
-            {
-                g.drawLine(i, j - 20, i, j - 10);
-            }
-            g.drawLine(0, j - 10, _pictureWidth, j - 10);
-
-            //фонари
-            for (int i = _placeSizeWidth; i < _pictureWidth; i += _placeSizeWidth)
-            {
-                g.setColor(Color.BLACK);
-                g.setStroke(new BasicStroke(10));
-                g.drawLine(i, j - _placeSizeHeight + 20, i, j);
-                g.setColor(Color.YELLOW);
-                g.setStroke(new BasicStroke(20));
-                g.drawLine(i, j - _placeSizeHeight + 18, i, j - _placeSizeHeight + 38);
-            }
-        }
-        g.setStroke(new BasicStroke(2));
-    }
-
-    /// Метод прорисовки объектов
-    private void DrawLocomotives(Graphics2D g)
-    {
-        int width = _pictureWidth / _placeSizeWidth;
-        int height = _pictureHeight / _placeSizeHeight;
-
-        int curWidth = 0;
-        int curHeight = 0;
-
-        for (int i = 0; i < _setLocomotives.Count(); i++)
-        {
-            // установка позиции
-            if (_setLocomotives.Get(i) != null) _setLocomotives.Get(i).SetObject(curWidth * _placeSizeWidth + 10, curHeight * _placeSizeHeight + 18, _pictureWidth, _pictureHeight);
-            if (_setLocomotives.Get(i) != null) _setLocomotives.Get(i).DrawningObject(g);
-            if (curWidth < width) curWidth++;
-            else
-            {
-                curWidth = 0;
-                curHeight++;
-            }
-        }
-    }
-
-}

RailMap.java

@@ -1,58 +0,0 @@
-import java.awt.*;
-
-public class RailMap extends AbstractMap{
-    /// Цвет участка закрытого
-    private final Color barrierColor = Color.BLACK;
-    /// Цвет участка открытого
-    private final Color roadColor = Color.PINK;
-
-    @Override
-    protected  void DrawBarrierPart(Graphics g, int i, int j)
-    {
-        g.setColor(barrierColor);
-        g.fillRect( (int)(i * _size_x), (int)(j * _size_y), (int)(i * (_size_x +
-                1)), (int)(j * (_size_y + 1)));
-    }
-
-    @Override
-    protected void DrawRoadPart(Graphics g, int i, int j)
-    {
-        g.setColor(roadColor);
-        g.fillRect( (int)(i * _size_x), (int)(j * _size_y), (int)(i * (_size_x +
-                1)),(int)( j * (_size_y + 1)));
-    }
-    @Override
-    protected void GenerateMap()
-    {
-        _map = new int[100][100];
-        _size_x = (float)_width / _map.length;
-        _size_y = (float)_height / _map[0].length;
-        int counter = 0;
-        for (int i = 0; i < _map.length; ++i)
-        {
-            for (int j = 0; j < _map[0].length; ++j)
-            {
-                _map[i][j] = _freeRoad;
-            }
-        }
-        while (counter < 1)
-        {
-            int y = _random.nextInt(85);
-
-            for(int x = 0; x < 99; x++)
-            {
-                _map[x][y] = _barrier;
-                _map[x][y + 5] = _barrier;
-
-                if (x % 5 == 0)
-                {
-                    _map[x][y + 1] = _barrier;
-                    _map[x][y + 2] = _barrier;
-                    _map[x][y + 3] = _barrier;
-                    _map[x][y + 4] = _barrier;
-                }
-            }
-            counter += 1;
-        }
-    }
-}

SetLocomotivesGeneric.java

@@ -1,61 +0,0 @@
-public class SetLocomotivesGeneric <T>
-{
-    private final T[] _places;
-
-    public int Count() {
-        return _places.length;
-    }
-
-    public SetLocomotivesGeneric(int count) {
-        _places = (T[]) new Object[count];
-    }
-
-    public int Insert (T locomotive) {
-        return Insert(locomotive, 0);
-    }
-
-    public int Insert (T locomotive, int position) {
-        if (position >= _places.length || position < 0) return -1;
-        if (_places[position] == null) {
-            _places[position] = locomotive;
-            return position;
-        }
-
-        int emptyEl = -1;
-        for (int i = position + 1; i < Count(); i++)
-        {
-            if (_places[i] == null)
-            {
-                emptyEl = i;
-                break;
-            }
-        }
-        if (emptyEl == -1)
-        {
-            return -1;
-        }
-        for (int i = emptyEl; i > position; i--)
-        {
-            _places[i] = _places[i - 1];
-        }
-        _places[position] = locomotive;
-        return position;
-    }
-
-    public T Remove (int position) {
-        if (position >= _places.length || position < 0) return null;
-        T result = _places[position];
-        _places[position] = null;
-        return result;
-    }
-
-    public T Get(int position)
-    {
-        if (position >= _places.length || position < 0)
-        {
-            return null;
-        }
-        return _places[position];
-    }
-
-}

SimpleMap.java

@@ -1,49 +0,0 @@
-import java.awt.*;
-
-public class SimpleMap extends AbstractMap{
-    /// Цвет участка закрытого
-    private final Color barrierColor = Color.BLACK;
-    /// Цвет участка открытого
-    private final Color roadColor = Color.GRAY;
-
-    @Override
-    protected  void DrawBarrierPart(Graphics g, int i, int j)
-    {
-        g.setColor(barrierColor);
-        g.fillRect( (int)(i * _size_x), (int)(j * _size_y), (int)(i * (_size_x +
-                1)), (int)(j * (_size_y + 1)));
-    }
-
-    @Override
-    protected void DrawRoadPart(Graphics g, int i, int j)
-    {
-        g.setColor(roadColor);
-        g.fillRect( (int)(i * _size_x), (int)(j * _size_y), (int)(i * (_size_x +
-                1)),(int)( j * (_size_y + 1)));
-    }
-    @Override
-    protected void GenerateMap()
-    {
-        _map = new int[100][100];
-        _size_x = (float)_width / _map.length;
-        _size_y = (float)_height / _map[0].length;
-        int counter = 0;
-        for (int i = 0; i < _map.length; ++i)
-        {
-            for (int j = 0; j < _map[0].length; ++j)
-            {
-                _map[i][j] = _freeRoad;
-            }
-        }
-        while (counter < 50)
-        {
-            int x = _random.nextInt(100);
-            int y = _random.nextInt(85);
-            if (_map[x][y] == _freeRoad)
-            {
-                _map[x][y] = _barrier;
-                counter++;
-            }
-        }
-    }
-}

SpikeMap.java

@@ -1,53 +0,0 @@
-import java.awt.*;
-
-public class SpikeMap extends AbstractMap{
-    /// Цвет участка закрытого
-    private final Color barrierColor = Color.BLACK;
-    /// Цвет участка открытого
-    private final Color roadColor = Color.GREEN;
-
-    @Override
-    protected  void DrawBarrierPart(Graphics g, int i, int j)
-    {
-        g.setColor(barrierColor);
-        g.fillRect( (int)(i * _size_x), (int)(j * _size_y), (int)(i * (_size_x +
-                1)), (int)(j * (_size_y + 1)));
-    }
-
-    @Override
-    protected void DrawRoadPart(Graphics g, int i, int j)
-    {
-        g.setColor(roadColor);
-        g.fillRect( (int)(i * _size_x), (int)(j * _size_y), (int)(i * (_size_x +
-                1)),(int)( j * (_size_y + 1)));
-    }
-    @Override
-    protected void GenerateMap()
-    {
-        _map = new int[100][100];
-        _size_x = (float)_width / _map.length;
-        _size_y = (float)_height / _map[0].length;
-        int counter = 0;
-        for (int i = 0; i < _map.length; ++i)
-        {
-            for (int j = 0; j < _map[0].length; ++j)
-            {
-                _map[i][j] = _freeRoad;
-            }
-        }
-        while (counter < 15)
-        {
-            int x = _random.nextInt(95) + 1;
-            int y = _random.nextInt(85) + 1;
-            if (_map[x][y] == _freeRoad)
-            {
-                _map[x][y] = _barrier;
-                if (_map[x + 1][y] == _freeRoad) _map[x + 1][y] = _barrier;
-                if (_map[x - 1][y] == _freeRoad) _map[x - 1][y] = _barrier;
-                if (_map[x][y + 1] == _freeRoad) _map[x][y + 1] = _barrier;
-                if (_map[x][y - 1] == _freeRoad) _map[x][y - 1] = _barrier;
-                counter++;
-            }
-        }
-    }
-}