fix final

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/1 lab hard.iml" filepath="$PROJECT_DIR$/1 lab hard.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/ProjectGasolineTankerHard.iml" filepath="$PROJECT_DIR$/.idea/ProjectGasolineTankerHard.iml" />
     </modules>
   </component>
 </project>

src/AbstractMap.java

@@ -0,0 +1,146 @@
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.util.Random;
+
+public abstract class AbstractMap {
+    private IDrawingObject _drawingObject = 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;
+
+    public BufferedImage CreateMap(int width, int height, IDrawingObject drawingObject)
+    {
+        _width = width;
+        _height = height;
+        _drawingObject = drawingObject;
+        GenerateMap();
+        while (!SetObjectOnMap())
+        {
+            GenerateMap();
+        }
+        return DrawMapWithObject();
+    }
+
+    public BufferedImage MoveObject(Direction direction)
+    {
+        if (true)
+        {
+            _drawingObject.MoveObject(direction);
+        }
+        float[] cortege = _drawingObject.GetCurrentPosition();
+        if (CheckLand(cortege[0],cortege[1],cortege[2],cortege[3])!= 0)
+        {
+            _drawingObject.MoveObject(SetOppositDirection(direction));
+        }
+        return  DrawMapWithObject();
+    }
+
+    private boolean SetObjectOnMap()
+    {
+        if (_drawingObject==null || _map == null)
+        {
+            return false;
+        }
+        int x = _random.nextInt(10);
+        int y = _random.nextInt(10);
+        _drawingObject.SetObject(x, y, _width, _height);
+
+        float[] dim = _drawingObject.GetCurrentPosition();
+
+        while (CheckLand(dim[0], dim[1], dim[2], dim[3]) != 2)
+        {
+            int res;
+            do
+            {
+                res = CheckLand(dim[0], dim[1], dim[2], dim[3]);
+                if (res == 0)
+                {
+                    _drawingObject.SetObject((int)dim[0], (int)dim[1], _width, _height);
+                    return true;
+                }
+                else
+                {
+                    dim[0] += _size_x;
+                }
+            } while (res != 2);
+            dim[0] = x;
+            dim[1] += _size_y;
+        }
+        return false;
+    }
+
+    private BufferedImage DrawMapWithObject()
+    {
+        BufferedImage bmp = new BufferedImage(_width, _height,BufferedImage.TYPE_INT_RGB);
+        if (_drawingObject == null || _map == null)
+        {
+            return bmp;
+        }
+        Graphics gr = bmp.getGraphics();
+        for (int i = 0; i < _map.length; ++i)
+        {
+            for (int j = 0; j < _map[i].length; ++j)
+            {
+                if (_map[i][j] == _freeRoad)
+                {
+                    DrawBarrierPart(gr, i, j);
+                }
+                else if (_map[i][j] == _barrier)
+                {
+                    DrawRoadPart(gr, i, j);
+                }
+            }
+        }
+        _drawingObject.DrawingObject(gr);
+        return bmp;
+    }
+    private int CheckLand(float Left, float Right, float Top, float Bottom)
+    {
+        int RUi = (int)(Left / _size_x);
+        int RUj = (int)(Right / _size_y);
+        int LDi = (int)(Top / _size_x);
+        int LDj = (int)(Bottom / _size_y);
+
+        if (RUi < 0 || RUj < 0 || LDi >= _map[0].length || LDj >= _map.length)
+        {
+            return -1;
+        }
+        for (int x = RUi; x <= LDi; x++)
+        {
+            for (int y = RUj; y <= LDj; y++)
+            {
+                if (_map[x][y] == _barrier)
+                {
+                    return 1;
+                }
+            }
+        }
+        return 0;
+    }
+    private Direction SetOppositDirection(Direction dir)
+    {
+        switch (dir)
+        {
+            case Up:
+                return Direction.Down;
+            case Down:
+                return Direction.Up;
+            case Left:
+                return Direction.Right;
+            case Right:
+                return Direction.Left;
+            case None:
+                return Direction.None;
+        }
+        return Direction.None;
+    }
+
+    protected abstract void GenerateMap();
+    protected abstract void DrawBarrierPart(Graphics gr, int i, int j);
+    protected abstract void DrawRoadPart(Graphics gr, int i, int j);
+}

src/CreaterGeneric.java

@@ -0,0 +1,38 @@
+import java.util.Random;
+import java.util.ArrayList;
+public class CreaterGeneric <T extends EntityGasolineTanker, U extends IDrawningObjectWheels>{
+    ArrayList<T> GasolineTanker;
+    ArrayList<U> Wheels;
+    int GasolineTankerCount=0;
+    int WheelsCount=0;
+    public CreaterGeneric(int gasolineTankerCount,int wheelsCount){
+        GasolineTanker=new ArrayList<>(gasolineTankerCount);
+        Wheels=new ArrayList<>(wheelsCount);
+    }
+    public int Add(T gasolineTanker){
+        if(GasolineTankerCount<=GasolineTanker.size()){
+            GasolineTanker.add(gasolineTanker);
+            GasolineTankerCount++;
+            return GasolineTankerCount-1;
+        }
+        return -1;
+    }
+    public int Add(U wheels){
+        if(WheelsCount<=Wheels.size()){
+            Wheels.add(wheels);
+            WheelsCount++;
+            return WheelsCount-1;
+        }
+        return -1;
+    }
+    public DrawingGasolineTanker NewGasolineTankerCreating()
+    {
+        Random rand=new Random();
+        T gasolineTanker = (GasolineTanker.get(rand.nextInt(GasolineTankerCount)));
+        U wheel = (Wheels.get(rand.nextInt(WheelsCount)));
+        if(gasolineTanker instanceof EntityImprovedGasolineTanker){
+            return new DrawingImprovedGasolineTanker(gasolineTanker,wheel);
+        }
+        return new DrawingGasolineTanker(gasolineTanker,wheel);
+    }
+}

src/Direction.java

@@ -1,6 +1,8 @@
 public enum Direction {
-    Up,
-    Down,
-    Left,
-    Right;
+    Up(1),
+    Down(2),
+    Left(3),
+    Right(4),
+    None(0);
+    Direction(int value){}
 }

src/DrawingField.java

@@ -2,12 +2,13 @@ import javax.swing.*;
 import java.awt.*;
 import java.util.Random;
 
-public class DrawingField  extends JPanel {
-    private final FormGasolineTanker field;
-    DrawingGasolineTanker _gasolineTanker;
+public class DrawingField extends JPanel{
+    private final FormGasolineTanker Field;
+    DrawingGasolineTanker _gasolineTanker=null;
     public DrawingField(FormGasolineTanker field) {
-        this.field = field;
+        Field = field;
     }
+
     @Override
     protected void paintComponent(Graphics g) {
         super.paintComponent(g);
@@ -16,42 +17,50 @@ public class DrawingField  extends JPanel {
             _gasolineTanker.DrawTransport(g2);
         else return;
     }
-    public void UpButtonAction(){
-        if (_gasolineTanker!=null)
-            _gasolineTanker.MoveTransport(Direction.Up);
-        else
+    public void DirectionButtonAction(Direction side){
+        if(_gasolineTanker == null)
             return;
+        _gasolineTanker.MoveTransport(side);
     }
-    public void DownButtonAction(){
-        if (_gasolineTanker!=null)
-            _gasolineTanker.MoveTransport(Direction.Down);
-        else
-            return;
-    }
-    public void RightButtonAction(){
-        if (_gasolineTanker!=null)
-            _gasolineTanker.MoveTransport(Direction.Right);
-        else
-            return;
-    }
-    public void LeftButtonAction(){
-        if (_gasolineTanker!=null)
-            _gasolineTanker.MoveTransport(Direction.Left);
-        else
-            return;
+    private void SetData() {
+        Random rand=new Random();
+        _gasolineTanker.SetPosition(rand.nextInt(100)+10,rand.nextInt(100)+10,getWidth(),getHeight());
+        Field.SpeedLabel.setText("Speed: "+_gasolineTanker.getGasolineTanker().getSpeed());
+        Field.WeightLabel.setText("Weight: "+_gasolineTanker.getGasolineTanker().getWeight());
+        Field.BodyColorLabel.setText("Color: "+Integer.toHexString(_gasolineTanker.getGasolineTanker().getBodyColor().getRGB()).substring(2));
     }
     public void CreateButtonAction(){
-        Random rnd=new Random();
-        _gasolineTanker=new DrawingGasolineTanker();
-        _gasolineTanker.Init(rnd.nextInt(50)+10,rnd.nextInt(100)+500,new Color(rnd.nextInt(256),rnd.nextInt(256),rnd.nextInt(256)));
-        _gasolineTanker.SetPosition(rnd.nextInt(100)+10,rnd.nextInt(100)+10,getWidth(),getHeight());
-        field.SpeedLabel.setText("Speed: "+_gasolineTanker.getGasolineTanker().getSpeed());
-        field.WeightLabel.setText("Weight: "+_gasolineTanker.getGasolineTanker().getWeight());
-        field.BodyColorLabel.setText("Color: "+Integer.toHexString(_gasolineTanker.getGasolineTanker().getBodyColor().getRGB()).substring(2));
+        Random rand=new Random();
+        Color color1=new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256));
+        if(color1==null)
+            color1=new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256));
+        _gasolineTanker=new DrawingGasolineTanker(rand.nextInt(50)+10,rand.nextInt(3000)+20000,color1,rand.nextInt(3));
+        SetData();
+    }
+    public void CreateModifButtonAction(){
+        Random rand=new Random();
+        Color color1=new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256));
+        Color color2=new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256));
+        if(color1==null)
+            color1=new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256));
+        if (color2==null)
+            color2=new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256));
+        _gasolineTanker = new DrawingImprovedGasolineTanker(rand.nextInt(50) + 10, rand.nextInt(3000) + 20000, color1,
+                color2, rand.nextBoolean(), rand.nextBoolean(), rand.nextInt(3));
+        SetData();
     }
     public void ResizeField(){
         if (_gasolineTanker!=null)
             _gasolineTanker.ChangeBorders(getWidth(),getHeight());
         else return;
     }
+
+    public void Draw(Graphics2D graphics) {
+        if (_gasolineTanker!=null)
+            _gasolineTanker.DrawTransport(graphics);
+        else return;
+    }
+    public DrawingGasolineTanker GetDrawingGasolineTanker() {
+        return _gasolineTanker;
+    }
 }

src/DrawingGasolineTanker.java

@@ -1,25 +1,65 @@
 import java.awt.*;
 
 public class DrawingGasolineTanker {
-    public EntityGasolineTanker GasolineTanker;
-    public EntityGasolineTanker getGasolineTanker() {
+    protected EntityGasolineTanker GasolineTanker;
+    public EntityGasolineTanker getGasolineTanker(){
         return GasolineTanker;
     }
-    public DrawingWheels Wheels;
-    private int _startPosX;
-    private int _startPosY;
+    protected IDrawningObjectWheels Wheels;
+    private CountWheels _wheels;
+    protected int _startPosX;
+    protected int _startPosY;
     private Integer _pictureWidth = null;
     private Integer _pictureHeight = null;
-    private final int _gasolineTankerWidth = 160;
-    private final int _gasolineTankerHeight = 55;
+    private int _gasolineTankerWidth = 160;
+    private int _gasolineTankerHeight = 70;
 
-    public void Init(int speed, float weight, Color bodyColor)
+    public DrawingGasolineTanker(int speed, float weight, Color bodyColor, int wheelsForm)
     {
-        GasolineTanker = new EntityGasolineTanker();
-        GasolineTanker.Init(speed, weight, bodyColor);
-        Wheels = new DrawingWheels();
+        GasolineTanker = new EntityGasolineTanker(speed, weight, bodyColor);
+        Wheels= GetFormOfWheels(wheelsForm);
         Wheels.SetCountWheels((int)(2 + Math.random() + Math.random()*2));
     }
+    public DrawingGasolineTanker(int speed, float weight, Color bodyColor, IDrawningObjectWheels wheelsForm)
+    {
+        GasolineTanker = new EntityGasolineTanker(speed, weight, bodyColor);
+        Wheels= wheelsForm;
+    }
+    public DrawingGasolineTanker(EntityGasolineTanker gasolineTanker,IDrawningObjectWheels wheels)
+    {
+        GasolineTanker = gasolineTanker;
+        Wheels = wheels;
+    }
+
+    public IDrawningObjectWheels GetFormOfWheels(int FormOfWheel){
+        OrnamentForm temp = null;
+        for (OrnamentForm form:OrnamentForm.values()) {
+            if(form.Value==FormOfWheel){
+                temp = form;
+                break;
+            }
+        }
+        if(temp==null)
+            return null;
+        switch (temp){
+            case NoneOrnament:
+                return new DrawingWheels(_wheels);
+            case GrayOrnament:
+                return new DrawingOrnamentWheelsFirst(_wheels);
+            case RedOrnament:
+                return new DrawingOrnamentWheelsSecond(_wheels);
+        }
+        return null;
+    }
+
+    protected DrawingGasolineTanker(int speed, float weight, Color bodyColor,int gasolineTankerWidth, int gasolineTankerHeight)
+    {
+        GasolineTanker = new EntityGasolineTanker(speed, weight, bodyColor);
+        Wheels= new DrawingWheels(_wheels);
+        Wheels.SetCountWheels((int)(2 + Math.random() + Math.random()*2));
+        _gasolineTankerWidth=gasolineTankerWidth;
+        _pictureHeight=gasolineTankerHeight;
+    }
 
     public void SetPosition(int x, int y, int width, int height)
     {
@@ -70,6 +110,7 @@ public class DrawingGasolineTanker {
                 break;
         }
     }
+
     public void DrawTransport(Graphics g)
     {
         if (_startPosX < 0 || _startPosY < 0 || _pictureHeight== null || _pictureWidth== null)
@@ -103,6 +144,7 @@ public class DrawingGasolineTanker {
         g2.drawRect(_startPosX + 120, _startPosY + 10, 25, 25);
         g2.fillRect(_startPosX + 120, _startPosY + 10, 25, 25);
     }
+
     public void ChangeBorders(int width,int height)
     {
         _pictureWidth = width;
@@ -122,4 +164,12 @@ public class DrawingGasolineTanker {
             _startPosY = _pictureHeight - _gasolineTankerHeight;
         }
     }
+    public float[] GetCurrentPosition() {
+        float[] dim = new float[4];
+        dim[0] = _startPosX;
+        dim[1] =_startPosY;
+        dim[2] = _startPosX + _gasolineTankerWidth;
+        dim[3] = _startPosY + _gasolineTankerHeight;
+        return dim;
+    }
 }

src/DrawingImprovedGasolineTanker.java

@@ -0,0 +1,60 @@
+import java.awt.*;
+
+public class DrawingImprovedGasolineTanker extends DrawingGasolineTanker {
+
+    public DrawingImprovedGasolineTanker(int speed, float weight, Color bodyColor, Color dopColor, boolean bodyKit, boolean antena,int wheelForm) {
+        super(speed, weight, bodyColor, 160, 70);
+        GasolineTanker=new EntityImprovedGasolineTanker(speed,weight,bodyColor,dopColor,bodyKit,antena);
+        Wheels= GetFormOfWheels(wheelForm);
+        Wheels.SetCountWheels((int)(2 + Math.random() + Math.random()*2));
+    }
+    public DrawingImprovedGasolineTanker(int speed, float weight, Color bodyColor, Color dopColor, boolean bodyKit, boolean antena,IDrawningObjectWheels wheelForm) {
+        super(speed, weight, bodyColor, 160, 70);
+        GasolineTanker=new EntityImprovedGasolineTanker(speed,weight,bodyColor,dopColor,bodyKit,antena);
+        Wheels= wheelForm;
+    }
+    public DrawingImprovedGasolineTanker(EntityGasolineTanker gasolineTanker,IDrawningObjectWheels wheels) {
+        super(gasolineTanker,wheels);
+        GasolineTanker=gasolineTanker;
+    }
+
+
+    @Override
+    public void DrawTransport(Graphics g) {
+
+        if (! (GasolineTanker instanceof EntityImprovedGasolineTanker))
+        {
+            return;
+        }
+
+        EntityImprovedGasolineTanker improvedGasolineTanker  = (EntityImprovedGasolineTanker)GasolineTanker;
+        Graphics2D g2 = (Graphics2D) g;
+
+        int [] x1 ={_startPosX+25,_startPosX+65,_startPosX+75,_startPosX+25,_startPosX+25};
+        int [] y1 ={_startPosY,_startPosY,_startPosY+5,_startPosY+5,_startPosY};
+        int [] x2 ={_startPosX+25,_startPosX+75,_startPosX+65,_startPosX+25,_startPosX+25};
+        int [] y2 ={_startPosY+45,_startPosY+45,_startPosY+50,_startPosY+50,_startPosY+45};
+
+        if (improvedGasolineTanker.BodyKit)
+        {
+            g2.setColor(improvedGasolineTanker.GetDopColor());
+            g2.drawRect(_startPosX + 25, _startPosY + 5, 100, 35);
+            g2.fillRect(_startPosX + 25, _startPosY + 5, 100, 35);
+
+        }
+
+        _startPosX += 10;
+        _startPosY += 5;
+        super.DrawTransport(g);
+        _startPosX -= 10;
+        _startPosY -= 5;
+
+        if (improvedGasolineTanker.Antena)
+        {
+            g2.setColor(Color.RED);
+            g2.drawRect(_startPosX + 130, _startPosY + 5, 10, 5);
+            g2.fillRect(_startPosX + 130, _startPosY + 5, 10, 5);
+
+        }
+    }
+}

src/DrawingObjectGasolineTanker.java

@@ -0,0 +1,39 @@
+import java.awt.*;
+
+public class DrawingObjectGasolineTanker implements IDrawingObject {
+
+    private DrawingGasolineTanker _gasolineTanker=null;
+
+    public DrawingObjectGasolineTanker(DrawingGasolineTanker gasolineTanker)
+    {
+        _gasolineTanker= gasolineTanker;
+    }
+
+    public float Step() {
+        if(_gasolineTanker != null && _gasolineTanker.GasolineTanker != null)
+            return _gasolineTanker.GasolineTanker.Step;
+        return 0;
+    }
+
+    @Override
+    public void SetObject(int x, int y, int width, int height) {
+        _gasolineTanker.SetPosition(x,y,width,height);
+    }
+
+    @Override
+    public void MoveObject(Direction direction) {
+        _gasolineTanker.MoveTransport(direction);
+    }
+
+    @Override
+    public void DrawingObject(Graphics g) {
+        _gasolineTanker.DrawTransport(g);
+    }
+
+    @Override
+    public float[] GetCurrentPosition() {
+        if(_gasolineTanker!=null)
+            return _gasolineTanker.GetCurrentPosition();
+        return null;
+    }
+}

src/DrawingOrnamentWheelsFirst.java

@@ -0,0 +1,54 @@
+import java.awt.*;
+
+public class DrawingOrnamentWheelsFirst implements IDrawningObjectWheels{
+    private CountWheels _wheels;
+
+    public DrawingOrnamentWheelsFirst(CountWheels wheels){
+        _wheels=wheels;
+    }
+    @Override
+    public void SetCountWheels(int count) {
+        for (CountWheels temp: CountWheels.values())
+            if (temp.getCountWheels() == count){
+                _wheels=temp;
+                return;
+            }
+    }
+
+    @Override
+    public void DrawWheels(Graphics2D g, int _startPosX, int _startPosY) {
+        if (_wheels.getCountWheels() == 2) {
+            g.setColor(Color.BLACK);
+            g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.setColor(Color.GRAY);
+            g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5);
+        }
+        if (_wheels.getCountWheels() == 3) {
+            g.setColor(Color.BLACK);
+            g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.drawOval(_startPosX + 30, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20);
+            g.setColor(Color.GRAY);
+            g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 30, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5);
+        }
+        if (_wheels.getCountWheels() == 4) {
+            g.setColor(Color.BLACK);
+            g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.drawOval(_startPosX + 30, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20);
+            g.drawOval(_startPosX + 50, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 50, _startPosY + 35, 20, 20);
+            g.setColor(Color.GRAY);
+            g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 50, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 30, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5);
+        }
+    }
+}

src/DrawingOrnamentWheelsSecond.java

@@ -0,0 +1,55 @@
+import java.awt.*;
+
+public class DrawingOrnamentWheelsSecond implements IDrawningObjectWheels{
+    private CountWheels _wheels;
+
+    public DrawingOrnamentWheelsSecond(CountWheels wheels){
+        _wheels=wheels;
+    }
+    @Override
+    public void SetCountWheels(int count) {
+        for (CountWheels temp: CountWheels.values())
+            if (temp.getCountWheels() == count){
+                _wheels=temp;
+                return;
+            }
+    }
+
+    @Override
+    public void DrawWheels(Graphics2D g, int _startPosX, int _startPosY) {
+
+        if (_wheels.getCountWheels() == 2) {
+            g.setColor(Color.BLACK);
+            g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.setColor(Color.RED);
+            g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5);
+        }
+        if (_wheels.getCountWheels() == 3) {
+            g.setColor(Color.BLACK);
+            g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.drawOval(_startPosX + 30, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20);
+            g.setColor(Color.RED);
+            g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 30, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5);
+        }
+        if (_wheels.getCountWheels() == 4) {
+            g.setColor(Color.BLACK);
+            g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.drawOval(_startPosX + 30, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20);
+            g.drawOval(_startPosX + 50, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 50, _startPosY + 35, 20, 20);
+            g.setColor(Color.RED);
+            g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 50, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 30, _startPosY + 45, 20, 5);
+            g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5);
+        }
+    }
+}

src/DrawingWheels.java

@@ -1,8 +1,12 @@
 import java.awt.*;
 
-public class DrawingWheels {
+public class DrawingWheels implements IDrawningObjectWheels{
 
-    private CountWheels _wheels;
+    private CountWheels _wheels = null;
+
+    public DrawingWheels(CountWheels wheels) {
+        _wheels=wheels;
+    }
 
     public void SetCountWheels(int Count){
         for (CountWheels temp: CountWheels.values())
@@ -13,29 +17,26 @@ public class DrawingWheels {
     }
 
     public void DrawWheels(Graphics2D g,int _startPosX, int _startPosY) {
-        switch (_wheels.getCountWheels())
-        {
-            case 2:
-                g.setColor(Color.BLACK);
-                g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
-                g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
-                break;
-            case 3:
-                g.setColor(Color.BLACK);
-                g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
-                g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
-                g.drawOval(_startPosX + 30, _startPosY + 35, 20, 20);
-                g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20);
-                break;
-            case 4:
-                g.setColor(Color.BLACK);
-                g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
-                g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
-                g.drawOval(_startPosX + 30, _startPosY + 35, 20, 20);
-                g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20);
-                g.drawOval(_startPosX + 50, _startPosY + 35, 20, 20);
-                g.fillOval(_startPosX + 50, _startPosY + 35, 20, 20);
-                break;
+        if (_wheels.getCountWheels() == 2) {
+            g.setColor(Color.BLACK);
+            g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
+        }
+        if (_wheels.getCountWheels() == 3) {
+            g.setColor(Color.BLACK);
+            g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.drawOval(_startPosX + 30, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20);
+        }
+        if (_wheels.getCountWheels() == 4){
+            g.setColor(Color.BLACK);
+            g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20);
+            g.drawOval(_startPosX + 30, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20);
+            g.drawOval(_startPosX + 50, _startPosY + 35, 20, 20);
+            g.fillOval(_startPosX + 50, _startPosY + 35, 20, 20);
         }
     }
 }

src/EntityGasolineTanker.java

@@ -14,15 +14,15 @@ public class EntityGasolineTanker {
     public Color getBodyColor() {
         return BodyColor;
     }
-    public float Step;
+    public int Step;
 
-    public void Init(int speed, float weight, Color bodyColor){
+    public EntityGasolineTanker(int speed, float weight, Color bodyColor){
 
         Random rnd = new Random();
         Speed = speed <= 0 ? rnd.nextInt(50)+10 : speed;
         Weight = weight <= 0 ? rnd.nextInt(100)+500 : weight;
         BodyColor = bodyColor;
-        Step = Speed * 100/ (int)Weight;
+        Step = Speed * 5000/ (int)Weight;
     }
 }
 

src/EntityImprovedGasolineTanker.java

@@ -0,0 +1,26 @@
+import java.awt.*;
+
+public class EntityImprovedGasolineTanker extends EntityGasolineTanker{
+    public Color DopColor;
+    public Color GetDopColor() {
+        return DopColor;
+    }
+
+    public boolean BodyKit ;
+    public boolean GetBodyKit () {
+        return BodyKit ;
+    }
+
+    public boolean Antena ;
+    public boolean GetAntena () {
+        return Antena ;
+    }
+
+    public EntityImprovedGasolineTanker(int speed, float weight, Color bodyColor, Color dopColor, boolean bodyKit, boolean antena){
+        super(speed,weight,bodyColor);
+        DopColor = dopColor;
+        BodyKit = bodyKit;
+        Antena = antena;
+
+    }
+}

src/FormCreater.form

@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormCreater">
+  <grid id="27dc6" binding="PictureBox" layout-manager="GridLayoutManager" row-count="2" 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="1076" height="604"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="1ddce" layout-manager="GridLayoutManager" row-count="3" 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="2" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="bevel-lowered" title="Setting"/>
+        <children>
+          <grid id="4fd6c" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <grid id="2d416" layout-manager="GridLayoutManager" row-count="2" 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="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+                <border type="bevel-lowered" title="Characteristics gasoline tanker"/>
+                <children>
+                  <component id="5f2c7" class="javax.swing.JLabel" binding="SetSpeedLabel">
+                    <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="Speed:"/>
+                    </properties>
+                  </component>
+                  <component id="460f9" class="javax.swing.JTextField" binding="SpeedTextField">
+                    <constraints>
+                      <grid row="0" column="1" 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>
+                  <component id="8647d" class="javax.swing.JTextField" binding="WeightTextField">
+                    <constraints>
+                      <grid row="1" column="1" 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>
+                  <component id="635c7" class="javax.swing.JLabel" binding="SetWeightLabel">
+                    <constraints>
+                      <grid row="1" 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="Weight:"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
+              <grid id="f3a26" 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>
+                  <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/>
+                <border type="bevel-lowered" title="Improved"/>
+                <children>
+                  <component id="a7785" class="javax.swing.JCheckBox" binding="BodyKitCheckBox">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="Barrel"/>
+                    </properties>
+                  </component>
+                  <component id="42af0" class="javax.swing.JCheckBox" binding="AntennaCheckBox">
+                    <constraints>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="Bulb"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
+              <grid id="7b130" 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>
+                  <grid row="2" 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="bevel-lowered" title="Type gasoline tanker"/>
+                <children>
+                  <component id="da325" class="javax.swing.JRadioButton" binding="BasicRadioButton">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="Simple"/>
+                    </properties>
+                  </component>
+                  <component id="a537c" class="javax.swing.JRadioButton" binding="AdvancedRadioButton">
+                    <constraints>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="Improved"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
+              <grid id="b3fe8" layout-manager="GridLayoutManager" row-count="3" 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="3" 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="bevel-lowered" title="Count wheels"/>
+                <children>
+                  <component id="c0d0c" class="javax.swing.JRadioButton" binding="TwoRadioButton">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="2"/>
+                    </properties>
+                  </component>
+                  <component id="ffc90" class="javax.swing.JRadioButton" binding="ThreeRadioButton">
+                    <constraints>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="3"/>
+                    </properties>
+                  </component>
+                  <component id="eb57" class="javax.swing.JRadioButton" binding="FourRadioButton">
+                    <constraints>
+                      <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="4"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
+              <grid id="99a4b" layout-manager="GridLayoutManager" row-count="3" 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="4" 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="bevel-lowered" title="Color ornament"/>
+                <children>
+                  <component id="acf86" class="javax.swing.JRadioButton" binding="NotOrnament">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="Not ornament"/>
+                    </properties>
+                  </component>
+                  <component id="52ce4" class="javax.swing.JRadioButton" binding="RedOrnament">
+                    <constraints>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="Red ornament"/>
+                    </properties>
+                  </component>
+                  <component id="4f3ee" class="javax.swing.JRadioButton" binding="GrayOrnament">
+                    <constraints>
+                      <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="Gray ornament"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
+            </children>
+          </grid>
+          <component id="8917a" class="javax.swing.JButton" binding="ChooseButton">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Choose"/>
+            </properties>
+          </component>
+          <component id="5c309" class="javax.swing.JButton" binding="ShowGasolineTankerButton">
+            <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="Show"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+      <grid id="1063d" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <grid id="cc2a8" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children/>
+          </grid>
+        </children>
+      </grid>
+    </children>
+  </grid>
+</form>

src/FormCreater.java

@@ -0,0 +1,134 @@
+import javax.swing.*;
+import java.awt.*;
+import java.util.Random;
+
+public class FormCreater extends JDialog{
+    private JButton ChooseButton;
+    private JButton ShowGasolineTankerButton;
+    private JTextField SpeedTextField;
+    private JTextField WeightTextField;
+    private JCheckBox BodyKitCheckBox;
+    private JCheckBox AntennaCheckBox;
+    private JRadioButton BasicRadioButton;
+    private JRadioButton AdvancedRadioButton;
+    private JRadioButton TwoRadioButton;
+    private JRadioButton ThreeRadioButton;
+    private JRadioButton FourRadioButton;
+    private JRadioButton NotOrnament;
+    private JRadioButton RedOrnament;
+    private JRadioButton GrayOrnament;
+    private JLabel SetSpeedLabel;
+    private JLabel SetWeightLabel;
+    private JPanel PictureBox;
+    CountWheels wheels=null;
+    IDrawningObjectWheels fwheels=null;
+    private final CreaterGeneric<EntityGasolineTanker,IDrawningObjectWheels> createrGeneric=new CreaterGeneric<>(40,40);
+    private DrawingGasolineTanker _gasolineTanker;
+    private DrawingGasolineTanker selectedGasolineTanker;
+
+    ImageIcon spriteUp =new ImageIcon((new ImageIcon("Material\\KeyUp.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    ImageIcon spriteDown =new ImageIcon((new ImageIcon("Material\\KeyDown.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    ImageIcon spriteLeft =new ImageIcon((new ImageIcon("Material\\KeyLeft.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    ImageIcon spriteRight =new ImageIcon((new ImageIcon("Material\\KeyRight.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    public FormCreater(){
+        setTitle("Gasoline tanker");
+        setContentPane(PictureBox);
+        setResizable(false);
+        setSize(1000,500);
+        ShowWindow();
+        setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+        Graphics2D g2d = (Graphics2D) PictureBox.getGraphics();
+        if (_gasolineTanker != null) {
+            _gasolineTanker.DrawTransport(g2d);
+        }
+    }
+    private void ShowWindow(){
+
+        TwoRadioButton.addActionListener(e -> {
+            wheels=CountWheels.Two;
+        });
+        ThreeRadioButton.addActionListener(e -> {
+            wheels=CountWheels.Three;
+        });
+        FourRadioButton.addActionListener(e -> {
+            wheels=CountWheels.Four;
+        });
+
+        NotOrnament.addActionListener(e -> {
+            if(wheels==null){
+                return;
+            }
+            fwheels=new DrawingWheels(wheels);
+            if(fwheels==null)
+                return;
+            fwheels.SetCountWheels(wheels.getCountWheels());
+            createrGeneric.Add(fwheels);
+        });
+
+        RedOrnament.addActionListener(e -> {
+            if(wheels==null){
+                return;
+            }
+            fwheels=new DrawingOrnamentWheelsSecond(wheels);
+            if(fwheels==null)
+                return;
+            fwheels.SetCountWheels(wheels.getCountWheels());
+            createrGeneric.Add(fwheels);
+        });
+
+        GrayOrnament.addActionListener(e -> {
+            if(wheels==null){
+                return;
+            }
+            fwheels=new DrawingOrnamentWheelsFirst(wheels);
+            if(fwheels==null)
+                return;
+            fwheels.SetCountWheels(wheels.getCountWheels());
+            createrGeneric.Add(fwheels);
+        });
+
+        BasicRadioButton.addActionListener(e -> {
+            Color color=JColorChooser.showDialog(this,"Select body color",Color.WHITE);
+            if(Integer.parseInt(SpeedTextField.getText())==0 || Integer.parseInt(WeightTextField.getText())==0 || color==null){
+                return;
+            }
+            createrGeneric.Add(new EntityGasolineTanker(Integer.parseInt(SpeedTextField.getText()),Integer.parseInt(WeightTextField.getText()),color));
+        });
+
+        AdvancedRadioButton.addActionListener(e -> {
+            Color color1=JColorChooser.showDialog(this,"Select body color",Color.WHITE);
+            if(Integer.parseInt(SpeedTextField.getText())==0 || Integer.parseInt(WeightTextField.getText())==0 || color1==null){
+                return;
+            }
+            Color color2=JColorChooser.showDialog(this,"Select modification color",Color.WHITE);
+            if(color2==null){
+                return;
+            }
+            createrGeneric.Add(new EntityImprovedGasolineTanker(Integer.parseInt(SpeedTextField.getText()),Integer.parseInt(WeightTextField.getText()),
+                    color1,color2, BodyKitCheckBox.isSelected(),AntennaCheckBox.isSelected()));
+        });
+
+        ShowGasolineTankerButton.addActionListener(e -> {
+            Random rand=new Random();
+            _gasolineTanker=createrGeneric.NewGasolineTankerCreating();
+            _gasolineTanker.SetPosition(rand.nextInt(100),rand.nextInt(100),getWidth(),getHeight());
+            repaint();
+        });
+        ChooseButton.addActionListener(e -> {
+            selectedGasolineTanker=_gasolineTanker;
+            dispose();
+        });
+    }
+    public DrawingGasolineTanker getSelectedGasolineTanker() {
+        return selectedGasolineTanker;
+    }
+}

src/FormGasolineTanker.form

@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormGasolineTanker">
+  <grid id="27dc6" binding="PictureBox" layout-manager="GridLayoutManager" row-count="3" 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>
+      <xy x="20" y="20" width="664" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="1123e" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="6" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="f81fa" class="javax.swing.JLabel" binding="SpeedLabel">
+            <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="Speed:"/>
+            </properties>
+          </component>
+          <hspacer id="802bb">
+            <constraints>
+              <grid row="0" column="3" 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="7d7fb" class="javax.swing.JLabel" binding="WeightLabel">
+            <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="Weight:"/>
+            </properties>
+          </component>
+          <component id="ea175" class="javax.swing.JLabel" binding="BodyColorLabel">
+            <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="Color:"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+      <grid id="8a6df" 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="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="6c4ce" class="javax.swing.JButton" binding="ButtonCreate">
+            <constraints>
+              <grid row="0" 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="Create"/>
+            </properties>
+          </component>
+          <component id="76111" class="javax.swing.JButton" binding="ButtonCreateModif">
+            <constraints>
+              <grid row="0" 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="Improved create"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+      <grid id="39656" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="4" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="e39ac" class="javax.swing.JButton" binding="ButtonLeft">
+            <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="c212c" class="javax.swing.JButton" binding="ButtonDown">
+            <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="1b9e6" class="javax.swing.JButton" binding="ButtonRight">
+            <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"/>
+            </constraints>
+            <properties>
+              <text value=""/>
+            </properties>
+          </component>
+          <component id="39d04" class="javax.swing.JButton" binding="ButtonUp">
+            <constraints>
+              <grid row="0" 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>
+      <vspacer id="74357">
+        <constraints>
+          <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </vspacer>
+      <hspacer id="94433">
+        <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>
+      <grid id="d5026" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="5" 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>
+          <hspacer id="bfaf3">
+            <constraints>
+              <grid row="0" 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>
+      <grid id="b1e67" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <hspacer id="1fab3">
+            <constraints>
+              <grid row="0" 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>
+      <grid id="b72a1" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="d037b" class="javax.swing.JButton" binding="ButtonSelect">
+            <constraints>
+              <grid row="0" 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="Button"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+    </children>
+  </grid>
+</form>

src/FormGasolineTanker.java

@@ -2,134 +2,97 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
+
 public class FormGasolineTanker extends JFrame{
     private int Width;
     private int Height;
-
-    JPanel BottomPanel = new JPanel();
-    JPanel CreatePanel = new JPanel();
-    JPanel BottomAndCreatePanel = new JPanel();
-    JPanel DimentionPanel = new JPanel();
-    JPanel UPanel = new JPanel();
-    JPanel DPanel = new JPanel();
-    JPanel LRPanel = new JPanel();
-
-    JLabel SpeedLabel = new JLabel("Speed: ");
-    JLabel WeightLabel = new JLabel("Weight: ");
-    JLabel BodyColorLabel = new JLabel("Color: ");
-
     DrawingField field = new DrawingField(this);
+    DrawingGasolineTanker SelectedGasolineTanker;
+    private JButton ButtonDown;
+    private JButton ButtonRight;
+    private JButton ButtonLeft;
+    private JButton ButtonUp;
+    private JButton ButtonCreate;
+    private JButton ButtonCreateModif;
+    public JLabel SpeedLabel;
+    public JLabel WeightLabel;
+    public JLabel BodyColorLabel;
+    private JPanel PictureBox;
+    private JButton ButtonSelect;
 
-    JButton ButtonCreate=new JButton("Create");
-
-    Icon iconUp = new ImageIcon("C:\\Users\\kashi\\OneDrive\\Материал\\KeyUp.png");
-    JButton ButtonUp=new JButton(iconUp);
-
-    Icon iconDown = new ImageIcon("C:\\Users\\kashi\\OneDrive\\Материал\\KeyDown.png");
-    JButton ButtonDown=new JButton(iconDown);
-
-    Icon iconRight = new ImageIcon("C:\\Users\\kashi\\OneDrive\\Материал\\KeyRight.png");
-    JButton ButtonRight=new JButton(iconRight);
-
-    Icon iconLeft = new ImageIcon("C:\\Users\\kashi\\OneDrive\\Материал\\KeyLeft.png");
-    JButton ButtonLeft=new JButton(iconLeft);
     public FormGasolineTanker(){
         super("Gasoline Tanker");
-        setSize(800,600);
-        Width=getWidth();
-        Height=getHeight();
+        setContentPane(PictureBox);
+        setSize(1000,700);
+        Width = getWidth();
+        Height = getHeight();
         ShowWindow();
-        RefreshWindow();
+        field.setBounds(0,0,Width,Height);
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         setVisible(true);
     }
+    ImageIcon spriteUp =new ImageIcon((new ImageIcon("Material\\KeyUp.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    ImageIcon spriteDown =new ImageIcon((new ImageIcon("Material\\KeyDown.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    ImageIcon spriteLeft =new ImageIcon((new ImageIcon("Material\\KeyLeft.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    ImageIcon spriteRight =new ImageIcon((new ImageIcon("Material\\KeyRight.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    private void ShowWindow(){
 
-    public void ShowWindow(){
-
-        Dimension dimen=new Dimension(30,30);
-
-        ButtonUp.setPreferredSize(dimen);
-        ButtonUp.addActionListener(e->{
-            field.UpButtonAction();
-            repaint();
-        });
-
-        ButtonDown.setPreferredSize(dimen);
-        ButtonDown.addActionListener(e->{
-            field.DownButtonAction();
-            repaint();
-        });
-
-        ButtonRight.setPreferredSize(dimen);
-        ButtonRight.addActionListener(e->{
-            field.RightButtonAction();
-            repaint();
-        });
-
-        ButtonLeft.setPreferredSize(dimen);
-        ButtonLeft.addActionListener(e->{
-            field.LeftButtonAction();
-            repaint();
-        });
-
-        LRPanel.setLayout(new FlowLayout(FlowLayout.CENTER,50,0));
-        LRPanel.setBackground(new Color(0,0,0,0));
-        LRPanel.add(ButtonLeft);
-        LRPanel.add(ButtonRight);
-
-        UPanel.setLayout(new FlowLayout());
-        UPanel.setBackground(new Color(0,0,0,0));
-        UPanel.add(ButtonUp);
-
-        DPanel.setLayout(new FlowLayout());
-        DPanel.setBackground(new Color(0,0,0,0));
-        DPanel.add(ButtonDown);
-
-        DimentionPanel.setLayout(new BoxLayout(DimentionPanel,BoxLayout.Y_AXIS));
-        DimentionPanel.setBackground(new Color(0,0,0,0));
-        DimentionPanel.add(UPanel);
-        DimentionPanel.add(LRPanel);
-        DimentionPanel.add(DPanel);
-        add(DimentionPanel);
-
-        CreatePanel.setLayout(new FlowLayout());
-        CreatePanel.setBackground(new Color(0,0,0,0));
-        CreatePanel.add(ButtonCreate);
-        ButtonCreate.addActionListener(e->{
+        ButtonCreate.addActionListener(e -> {
             field.CreateButtonAction();
-            repaint();
+            ReDraw();
+        });
+        ButtonCreateModif.addActionListener(e -> {
+            field.CreateModifButtonAction();
+            ReDraw();
+        });
+        ButtonUp.setIcon(spriteUp);
+        ButtonUp.addActionListener(e -> {
+            field.DirectionButtonAction(Direction.Up);
+            ReDraw();
+        });
+        ButtonLeft.setIcon(spriteLeft);
+        ButtonLeft.addActionListener(e -> {
+            field.DirectionButtonAction(Direction.Left);
+            ReDraw();
+        });
+        ButtonRight.setIcon(spriteRight);
+        ButtonRight.addActionListener(e -> {
+            field.DirectionButtonAction(Direction.Right);
+            ReDraw();
+        });
+        ButtonDown.setIcon(spriteDown);
+        ButtonDown.addActionListener(e -> {
+            field.DirectionButtonAction(Direction.Down);
+            ReDraw();
+        });
+        ButtonSelect.addActionListener(e -> {
+            SelectedGasolineTanker=field.GetDrawingGasolineTanker();
+            JOptionPane.showMessageDialog(PictureBox, "Gasoline tanker added.");
         });
-
-        BottomPanel.setLayout(new FlowLayout());
-        BottomPanel.setBackground(new Color(0,0,0,0));
-        BottomPanel.add(SpeedLabel);
-        BottomPanel.add(WeightLabel);
-        BottomPanel.add(BodyColorLabel);
-
-        BottomAndCreatePanel.setLayout(new BoxLayout(BottomAndCreatePanel,BoxLayout.Y_AXIS));
-        BottomAndCreatePanel.setBackground(new Color(0,0,0,0));
-        BottomAndCreatePanel.add(CreatePanel);
-        BottomAndCreatePanel.add(BottomPanel);
-
-        add(BottomAndCreatePanel);
-        add(field);
 
         addComponentListener(new ComponentAdapter() {
             @Override
-            public void componentResized(ComponentEvent e) {
+            public  void componentResized(ComponentEvent e){
                 super.componentResized(e);
                 Width=getWidth();
                 Height=getHeight();
 
                 field.ResizeField();
-                repaint();
-                RefreshWindow();
+                ReDraw();
+                field.setBounds(0,0,Width,Height);
             }
         });
     }
-    public void RefreshWindow(){
-        field.setBounds(0,0,Width,Height);
-        BottomAndCreatePanel.setBounds(-220,Height-110,Width,80);
-        DimentionPanel.setBounds(Width-170,Height-170,190,140);
+    private void ReDraw()
+    {
+        Graphics2D graphics = (Graphics2D) PictureBox.getGraphics();
+        graphics.clearRect(0, 0, PictureBox.getWidth(), PictureBox.getHeight());
+        PictureBox.paintComponents(graphics);
+        field.Draw(graphics);
     }
+
 }

src/FormMapWithSetGasolineTanker.form

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormMapWithSetGasolineTanker">
+  <grid id="27dc6" binding="MainPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="668" height="474"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="42b0" binding="GroupBoxTools" layout-manager="GridLayoutManager" row-count="9" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="bevel-lowered" title=" Tools"/>
+        <children>
+          <grid id="bc845" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <vspacer id="9ecc2">
+                <constraints>
+                  <grid row="0" 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>
+            </children>
+          </grid>
+          <component id="52e81" class="javax.swing.JComboBox" binding="СomboBoxSelectorMap">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <model>
+                <item value="Simple map"/>
+                <item value="Long map"/>
+              </model>
+            </properties>
+          </component>
+          <vspacer id="f144d">
+            <constraints>
+              <grid row="2" 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="f5a9c" class="javax.swing.JButton" binding="ButtonAddGasolineTanker">
+            <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="Add"/>
+            </properties>
+          </component>
+          <component id="ceb03" class="javax.swing.JTextField" binding="TextBoxPosition">
+            <constraints>
+              <grid row="4" 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>
+          <component id="c29a2" class="javax.swing.JButton" binding="ButtonRemoveGasolineTanker">
+            <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="Remove"/>
+            </properties>
+          </component>
+          <vspacer id="76e51">
+            <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="42b8e" class="javax.swing.JButton" binding="ButtonShowStorage">
+            <constraints>
+              <grid row="7" 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="Storage"/>
+            </properties>
+          </component>
+          <component id="62dd6" class="javax.swing.JButton" binding="ButtonShowOnMap">
+            <constraints>
+              <grid row="8" 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="Map"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+      <grid id="c9878" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="cac88" class="javax.swing.JButton" binding="ButtonLeft">
+            <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="bd727" class="javax.swing.JButton" binding="ButtonDown">
+            <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="1ff1c" class="javax.swing.JButton" binding="ButtonRight">
+            <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"/>
+            </constraints>
+            <properties>
+              <text value=""/>
+            </properties>
+          </component>
+          <component id="b4d3c" class="javax.swing.JButton" binding="ButtonUp">
+            <constraints>
+              <grid row="0" 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="ad00b" binding="PictureBox" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="0" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children/>
+      </grid>
+      <hspacer id="29fed">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </hspacer>
+      <grid id="91c98" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="2" column="1" 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>
+          <vspacer id="43d2a">
+            <constraints>
+              <grid row="0" 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>
+        </children>
+      </grid>
+    </children>
+  </grid>
+</form>

src/FormMapWithSetGasolineTanker.java

@@ -0,0 +1,177 @@
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.util.Objects;
+
+public class FormMapWithSetGasolineTanker extends JFrame{
+    private JPanel GroupBoxTools;
+    private JComboBox СomboBoxSelectorMap;
+    private JButton ButtonAddGasolineTanker;
+    private JButton ButtonRemoveGasolineTanker;
+    private JButton ButtonShowStorage;
+    private JButton ButtonShowOnMap;
+    private JButton ButtonLeft;
+    private JButton ButtonDown;
+    private JButton ButtonRight;
+    private JButton ButtonUp;
+    private JPanel MainPanel;
+    private JTextField TextBoxPosition;
+    private JPanel PictureBox;
+    private Image bufferedImage;
+
+    private MapWithSetGasolineTankerGeneric<DrawingObjectGasolineTanker,AbstractMap> _mapGasolineTankerCollectionGeneric;
+
+    ImageIcon spriteUp =new ImageIcon((new ImageIcon("Material\\KeyUp.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    ImageIcon spriteDown =new ImageIcon((new ImageIcon("Material\\KeyDown.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    ImageIcon spriteLeft =new ImageIcon((new ImageIcon("Material\\KeyLeft.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    ImageIcon spriteRight =new ImageIcon((new ImageIcon("Material\\KeyRight.png")).
+            getImage().getScaledInstance(10,10,Image.SCALE_SMOOTH));
+    public FormMapWithSetGasolineTanker(){
+        setTitle("Gasoline tanker");
+        setContentPane(MainPanel);
+        setResizable(false);
+        setSize(1000,685);
+        ShowWindow();
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        setVisible(true);
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+
+        if (bufferedImage != null) {
+            PictureBox.paintComponents(bufferedImage.getGraphics());
+            PictureBox.getGraphics().drawImage(bufferedImage, 0, 0, null);
+        }
+    }
+
+    private void ShowWindow(){
+
+        ButtonShowOnMap.addActionListener(e -> {
+            if (_mapGasolineTankerCollectionGeneric == null)
+            {
+                return;
+            }
+            bufferedImage = _mapGasolineTankerCollectionGeneric.ShowOnMap();
+            repaint();
+        });
+
+        ButtonShowStorage.addActionListener(e -> {
+            if (_mapGasolineTankerCollectionGeneric == null)
+            {
+                return;
+            }
+            bufferedImage = _mapGasolineTankerCollectionGeneric.ShowSet();
+            repaint();
+        });
+
+        ButtonAddGasolineTanker.addActionListener(e -> {
+            if (_mapGasolineTankerCollectionGeneric == null)
+            {
+                return;
+            }
+            FormCreater dialog=new FormCreater();
+            dialog.setSize(1200,700);
+            dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
+            dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+            dialog.setVisible(true);
+            if (dialog.getSelectedGasolineTanker()!=null) {
+                DrawingObjectGasolineTanker gasolineTanker = new DrawingObjectGasolineTanker(dialog.getSelectedGasolineTanker());
+
+                if (_mapGasolineTankerCollectionGeneric.plus(gasolineTanker) >= 0) {
+                    JOptionPane.showMessageDialog(this, "\n" + "Object added", "Success", JOptionPane.INFORMATION_MESSAGE);
+                    bufferedImage = _mapGasolineTankerCollectionGeneric.ShowSet();
+                    repaint();
+                } else {
+                    JOptionPane.showMessageDialog(this, "Failed to add object", "Error",JOptionPane.INFORMATION_MESSAGE);
+                }
+            }
+        });
+
+        ButtonRemoveGasolineTanker.addActionListener(e -> {
+            String txt=TextBoxPosition.getText();
+            if (txt==null||_mapGasolineTankerCollectionGeneric==null||txt.isEmpty())
+            {
+                return;
+            }
+            int result = JOptionPane.showConfirmDialog(
+                    this,
+                    "Delete object?",
+                    "Delete",
+                    JOptionPane.YES_NO_CANCEL_OPTION);
+            if (result == JOptionPane.NO_OPTION)
+            {
+                return;
+            }
+            int pos = Integer.parseInt(txt);
+            if (_mapGasolineTankerCollectionGeneric.minus(pos) !=null)
+            {
+                JOptionPane.showMessageDialog(this,"Object added", "Success",JOptionPane.INFORMATION_MESSAGE);
+                bufferedImage = _mapGasolineTankerCollectionGeneric.ShowSet();
+                repaint();
+            }
+            else
+            {
+                JOptionPane.showMessageDialog(this,"Failed to add object", "Error",JOptionPane.INFORMATION_MESSAGE);
+            }
+        });
+
+        СomboBoxSelectorMap.addActionListener(e -> {
+            AbstractMap map = null;
+
+            switch (СomboBoxSelectorMap.getSelectedItem().toString())
+            {
+                case "Simple map":
+                    map = new SimpleMap();
+                    break;
+                case "Long map":
+                    map = new LongMap();
+                    break;
+            }
+            if (map != null)
+            {
+                _mapGasolineTankerCollectionGeneric = new MapWithSetGasolineTankerGeneric<>(
+                        PictureBox.getWidth(), PictureBox.getHeight(), map);
+            }
+            else
+            {
+                _mapGasolineTankerCollectionGeneric = null;
+            }
+        });
+        ButtonUp.setIcon(spriteUp);
+        ButtonUp.addActionListener(e -> {
+            if (_mapGasolineTankerCollectionGeneric != null) {
+                bufferedImage = _mapGasolineTankerCollectionGeneric.MoveObject(Direction.Up);
+                repaint();
+            }
+        });
+        ButtonDown.setIcon(spriteDown);
+        ButtonDown.addActionListener(e -> {
+            if (_mapGasolineTankerCollectionGeneric != null) {
+                bufferedImage = _mapGasolineTankerCollectionGeneric.MoveObject(Direction.Down);
+                repaint();
+            }
+        });
+        ButtonRight.setIcon(spriteRight);
+        ButtonRight.addActionListener(e -> {
+            if (_mapGasolineTankerCollectionGeneric != null) {
+                bufferedImage = _mapGasolineTankerCollectionGeneric.MoveObject(Direction.Right);
+                repaint();
+            }
+        });
+        ButtonLeft.setIcon(spriteLeft);
+        ButtonLeft.addActionListener(e -> {
+            if (_mapGasolineTankerCollectionGeneric != null) {
+                bufferedImage = _mapGasolineTankerCollectionGeneric.MoveObject(Direction.Left);
+                repaint();
+            }
+        });
+    }
+}

src/IDrawingObject.java

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

src/IDrawningObjectWheels.java

@@ -0,0 +1,6 @@
+import java.awt.*;
+
+public interface IDrawningObjectWheels {
+    void SetCountWheels(int count);
+    void DrawWheels(Graphics2D g, int _startPosX, int _startPosY);
+}

src/LongMap.java

@@ -0,0 +1,43 @@
+import java.awt.*;
+
+public class LongMap extends AbstractMap{
+    @Override
+    protected void GenerateMap()
+    {
+        _map = new int[100][100];
+        _size_x = (float)_width / _map[0].length;
+        _size_y = (float)_height / _map[1].length;
+        int counter = 0;
+        for (int i = 0; i < _map[0].length; ++i)
+        {
+            for (int j = 0; j < _map[1].length; ++j)
+            {
+                _map[i][j] = _freeRoad;
+            }
+        }
+        while (counter < 5)
+        {
+            int xStart = _random.nextInt(0, 100);
+            int xEnd = _random.nextInt(80, 100);
+
+            for (int i = xStart; i <= xEnd; ++i)
+            {
+                _map[i] [xStart] = _barrier;
+            }
+
+            counter++;
+        }
+    }
+
+    @Override
+    protected void DrawBarrierPart(Graphics gr, int i, int j) {
+        gr.setColor(Color.GRAY);
+        gr.fillRect((int) (i * _size_x), (int) (j * _size_y), (int) (i * (_size_x + 1)), (int) (j * (_size_y + 1)));
+    }
+
+    @Override
+    protected void DrawRoadPart(Graphics gr, int i, int j) {
+        gr.setColor(Color.BLACK);
+        gr.fillRect((int) (i * _size_x), (int) (j * _size_y), (int) (i * (_size_x + 1)), (int) (j * (_size_y + 1)));
+    }
+}

src/Main.java

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

src/MapWithSetGasolineTankerGeneric.java

@@ -0,0 +1,125 @@
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+public class MapWithSetGasolineTankerGeneric <T extends IDrawingObject,U extends AbstractMap>{
+    private final int _pictureWidth;
+    private final int _pictureHeight;
+    private final int _placeSizeWidth = 210;
+    private final int _placeSizeHeight = 90;
+    private final SetGasolineTankerGeneric<T> _setGasolineTanker;
+    private final U _map;
+
+    public MapWithSetGasolineTankerGeneric(int picWidth,int picHeight, U map)
+    {
+        int width = picWidth / _placeSizeWidth;
+        int height = picHeight/_placeSizeHeight;
+        _setGasolineTanker = new SetGasolineTankerGeneric<>(width * height);
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _map = map;
+    }
+
+    public int plus(T gasolineTanker)
+    {
+        return _setGasolineTanker.Insert(gasolineTanker);
+    }
+
+    public T minus(int position)
+    {
+        return _setGasolineTanker.Remove(position);
+    }
+
+    public Image ShowSet()
+    {
+        BufferedImage bmp = new BufferedImage(_pictureWidth, _pictureWidth,BufferedImage.TYPE_INT_ARGB);
+        Graphics gr = bmp.getGraphics();
+        DrawBackground(gr);
+        DrawGasolineTanker(gr);
+        return bmp;
+    }
+
+    public Image ShowOnMap()
+    {
+        Shaking();
+        for (int i = 0; i < _setGasolineTanker.Count(); i++)
+        {
+            T gasolineTanker = _setGasolineTanker.Get(i);
+            if (gasolineTanker != null)
+            {
+                return _map.CreateMap(_pictureWidth, _pictureHeight, gasolineTanker);
+            }
+        }
+        return new BufferedImage(_pictureWidth, _pictureHeight,1);
+    }
+
+    public Image MoveObject(Direction direction)
+    {
+        if (_map != null)
+        {
+            return _map.MoveObject(direction);
+        }
+        return new BufferedImage(_pictureWidth, _pictureHeight,1);
+    }
+
+    public void Shaking()
+    {
+        int j = _setGasolineTanker.Count() - 1;
+        for (int i = 0; i < _setGasolineTanker.Count(); i++)
+        {
+            if (_setGasolineTanker.Get(i) == null)
+            {
+                for (; j > i; j--)
+                {
+                    T gasolineTanker = _setGasolineTanker.Get(j);
+                    if (gasolineTanker != null)
+                    {
+                        _setGasolineTanker.Insert(gasolineTanker, i);
+                        _setGasolineTanker.Remove(j);
+                        break;
+                    }
+                }
+                if (j <= i)
+                {
+                    return;
+                }
+            }
+        }
+    }
+
+    private void DrawBackground(Graphics gr)
+    {
+        Graphics2D g=(Graphics2D)gr;
+
+        Color brush=Color.BLACK;
+        Stroke penWide = new BasicStroke(5);
+        Stroke penThin = new BasicStroke(1);
+
+        for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+        {
+            for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+            {
+                g.setColor(brush);
+                g.setStroke(penWide);
+                g.drawLine(i * _placeSizeWidth + 10, j * _placeSizeHeight + 2, i * _placeSizeWidth + (int)(_placeSizeWidth * 0.8), j * _placeSizeHeight + 2);
+                g.drawLine(i * _placeSizeWidth + (int)(_placeSizeWidth * 0.8), j * _placeSizeHeight + 2, i * _placeSizeWidth + (int)(_placeSizeWidth * 0.9) + 10, j * _placeSizeHeight + 2 + 20);
+                g.drawLine(i * _placeSizeWidth + (int)(_placeSizeWidth * 0.9) + 10, j * _placeSizeHeight + 2 + 20, i * _placeSizeWidth + (int)(_placeSizeWidth * 0.9) + 10, j * _placeSizeHeight + 2 + 20);
+                g.setStroke(penThin);
+            }
+        }
+    }
+
+    private void DrawGasolineTanker(Graphics gr)
+    {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+
+        for (int i = 0; i < _setGasolineTanker.Count(); i++)
+        {
+            if (_setGasolineTanker.Get(i) != null)
+            {
+                _setGasolineTanker.Get(i).SetObject(i % width * _placeSizeWidth, (height - 1 - i / width) * _placeSizeHeight, _pictureWidth, _pictureHeight);
+                _setGasolineTanker.Get(i).DrawingObject(gr);
+            }
+        }
+    }
+}

src/OrnamentForm.java

@@ -0,0 +1,9 @@
+public enum OrnamentForm {
+    NoneOrnament(0),
+    GrayOrnament(1),
+    RedOrnament(2);
+    public final int Value;
+    OrnamentForm(int i) {
+        Value=i;
+    }
+}

src/SetGasolineTankerGeneric.java

@@ -0,0 +1,68 @@
+public class SetGasolineTankerGeneric <T extends Object>{
+    private final Object[] _places;
+
+    public int Count() {
+        return _places.length;
+    }
+
+    public SetGasolineTankerGeneric(int count)
+    {
+        _places = new Object[count];
+    }
+
+    public int Insert(T gasolineTanker)
+    {
+        return Insert(gasolineTanker,0);
+    }
+
+    public int Insert(T gasolineTanker, int position)
+    {
+        int EmptyEl=-1;
+
+        if (position>=Count() || position < 0)
+            return -1;
+
+        if (_places[position] == null)
+        {
+            _places[position] = gasolineTanker;
+            return 1;
+        }
+
+        else if (_places[position] != null)
+        {
+            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] = gasolineTanker;
+        return 1;
+    }
+
+    public T Remove(int position)
+    {
+        if (position >= Count() || position < 0 || _places[position]==null)
+            return null;
+
+        T deleted =(T)_places[position];
+        _places[position] = null;
+        return deleted;
+    }
+
+    public T Get(int position)
+    {
+        if (position >= Count() || position < 0)
+            return null;
+
+        return (T)_places[position];
+    }
+}

src/SimpleMap.java

@@ -0,0 +1,36 @@
+import java.awt.*;
+
+public class SimpleMap extends AbstractMap {
+    @Override
+    protected void DrawBarrierPart(Graphics gr, int i, int j) {
+        gr.setColor(Color.GRAY);
+        gr.fillRect((int) (i * _size_x), (int) (j * _size_y), (int) (i * (_size_x + 1)), (int) (j * (_size_y + 1)));
+    }
+
+    @Override
+    protected void DrawRoadPart(Graphics gr, int i, int j) {
+        gr.setColor(Color.BLACK);
+        gr.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[i].length; ++j) {
+                _map[i][j] = _freeRoad;
+            }
+        }
+        while (counter < 50) {
+            int x = _random.nextInt(99);
+            int y = _random.nextInt(99);
+            if (_map[x][y] == _freeRoad) {
+                _map[x][y] = _barrier;
+                counter++;
+            }
+        }
+    }
+}