Часть перенес

OOP/.idea/uiDesigner.xml

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

OOP/src/DirectionType.java

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

OOP/src/DrawningElectricLocomotive.java

@@ -0,0 +1,193 @@
+import java.awt.*;
+import java.util.Random;
+
+public class DrawningElectricLocomotive {
+    private EntityElectricLocomotive entityElectricLocomotive;
+    public EntityElectricLocomotive getEntityElectricLocomotive() {
+        return entityElectricLocomotive;
+    }
+    private Integer _pictureWidth;
+    private Integer _pictureHeight;
+    private Integer _startPosX;
+    private Integer _startPosY;
+    private final int _drawingElectricLocomotiveWidth = 100;
+    private final int _drawingElectricLocomotiveHight = 100;
+
+    public DrawningElectricLocomotiveWheels _drawningElectricLocomotiveWheels;
+
+    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, boolean pantograph, boolean batteryStorage) {
+        entityElectricLocomotive = new EntityElectricLocomotive();
+        entityElectricLocomotive.Init(speed, weight, bodyColor, additionalColor, pantograph, batteryStorage);
+        _startPosY = null;
+        _startPosX = null;
+        _pictureWidth = null;
+        _pictureHeight = null;
+
+        _drawningElectricLocomotiveWheels = new DrawningElectricLocomotiveWheels();
+        Random random = new Random();
+        int[] countwheels = {2, 3, 4};
+        int wheelCount = countwheels[random.nextInt(countwheels.length)];
+        _drawningElectricLocomotiveWheels.setEnumNumber(wheelCount);
+
+
+    }
+
+    public void setPosition(int x, int y) {
+        if (_pictureHeight == null || _pictureWidth == null)
+            return;
+        _startPosX = x;
+        _startPosY = y;
+
+        if (_drawingElectricLocomotiveWidth + x > _pictureWidth || x < 0) {
+            _startPosX = 0;
+        }
+        if (_drawingElectricLocomotiveHight + y > _pictureHeight || y < 0) {
+            _startPosY = 0;
+        }
+    }
+
+    public boolean setPictureSize(int width, int height) {
+
+        if (_drawingElectricLocomotiveHight > height || _drawingElectricLocomotiveWidth > width)
+            return false;
+        _pictureHeight = height;
+        _pictureWidth = width;
+
+        if (_startPosX != null && _startPosY != null) {
+            if (_startPosX + _drawingElectricLocomotiveWidth > width)
+                _startPosX = width - _drawingElectricLocomotiveWidth;
+            if (_startPosY + _drawingElectricLocomotiveHight > height)
+                _startPosY = height - _drawingElectricLocomotiveHight;
+        }
+        return true;
+    }
+
+    public boolean moveTransport(DirectionType direction) {
+        if (entityElectricLocomotive == null || _pictureWidth == null || _pictureHeight == null)
+            return false;
+        switch (direction) {
+            case Left:
+                if (_startPosX - entityElectricLocomotive.Step() > 0)
+                    _startPosX -= (int) entityElectricLocomotive.Step();
+                return true;
+            case Up:
+                if (_startPosY - entityElectricLocomotive.Step() > 0)
+                    _startPosY -= (int) entityElectricLocomotive.Step();
+                return true;
+            case Right:
+                if (_startPosX + entityElectricLocomotive.Step() < _pictureWidth - _drawingElectricLocomotiveWidth)
+                    _startPosX += (int) entityElectricLocomotive.Step();
+                return true;
+            case Down:
+                if (_startPosY + entityElectricLocomotive.Step() < _pictureHeight - _drawingElectricLocomotiveHight)
+                    _startPosY += (int) entityElectricLocomotive.Step();
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public void DrawTransport(Graphics g){
+        if (entityElectricLocomotive == null || _startPosX == null || _startPosY == null) {
+            return;
+        }
+
+        Graphics2D g2d = (Graphics2D) g;
+        _drawningElectricLocomotiveWheels.drawElectricLocomotiveWheels(g, Color.BLACK, _startPosX, _startPosY);
+        Point[] Body = new Point[]{
+          new Point(_startPosX + 20,_startPosY + 20),
+          new Point(_startPosX, _startPosY + 25 + 20),
+          new Point(_startPosX , _startPosY + 50 + 20),
+                new Point(_startPosX + 100 , _startPosY + 50 + 20),
+                new Point(_startPosX + 100, _startPosY + 25 + 20),
+                new Point(_startPosX + 105, _startPosY + 20),
+        };
+
+        Polygon BodyPolygon = new Polygon();
+        for(Point point:Body){
+            BodyPolygon.addPoint(point.x, point.y);
+        }
+        g2d.setColor(entityElectricLocomotive.getBodyColor());
+        g2d.fillPolygon(BodyPolygon);
+
+
+        Point[] line = new Point[]{
+                new Point(_startPosX, _startPosY + 25 + 20),
+                new Point(_startPosX, _startPosY + 30 + 20),
+                new Point(_startPosX + 100, _startPosY + 30 + 20),
+                new Point(_startPosX + 100, _startPosY + 25 + 20),
+        };
+        Polygon linePolugon = new Polygon();
+        for(Point point: line){
+            linePolugon.addPoint(point.x, point.y);
+        }
+        g2d.setColor(entityElectricLocomotive.getAdditionalColor());
+        g2d.fillPolygon(linePolugon);
+
+
+        Point[] glass = new Point[]{
+            new Point(_startPosX + 20, _startPosY + 2 + 20),
+                new Point(_startPosX + 6 , _startPosY + 20 + 20),
+                new Point(_startPosX + 20, _startPosY + 20 + 20),
+                new Point(_startPosX + 20, _startPosY + 2 + 20)
+        };
+        Polygon glassPolygon = new Polygon();
+        for(Point point: glass){
+            glassPolygon.addPoint(point.x, point.y);
+        }
+        g2d.setColor(Color.WHITE);
+        g2d.fillPolygon(glassPolygon);
+
+
+        if(entityElectricLocomotive.getBatteryStorage()){
+            int mod = 50;
+            Point[] battery = new Point[]{
+                    new Point(_startPosX + 40/2 + mod, _startPosY + 2+ 20),
+                    new Point(_startPosX + 40/2 + mod, _startPosY + 4+ 20),
+                    new Point(_startPosX + 35/2 + mod , _startPosY + 4+ 20),
+                    new Point(_startPosX + 35/2 + mod, _startPosY + 16+ 20),
+                    new Point(_startPosX + 60/2 + mod, _startPosY + 16+ 20),
+                    new Point(_startPosX + 60/2 + mod, _startPosY + 4+ 20),
+                    new Point(_startPosX + 55/2 + mod, _startPosY + 4+ 20),
+                    new Point(_startPosX + 55/2 + mod, _startPosY + 2+ 20),
+            };
+            mod += 20;
+            Point[] battery2 = new Point[]{
+                    new Point(_startPosX + 40/2 + mod, _startPosY + 2+ 20),
+                    new Point(_startPosX + 40/2 + mod, _startPosY + 4+ 20),
+                    new Point(_startPosX + 35/2 + mod , _startPosY + 4+ 20),
+                    new Point(_startPosX + 35/2 + mod, _startPosY + 16+ 20),
+                    new Point(_startPosX + 60/2 + mod, _startPosY + 16+ 20),
+                    new Point(_startPosX + 60/2 + mod, _startPosY + 4+ 20),
+                    new Point(_startPosX + 55/2 + mod, _startPosY + 4+ 20),
+                    new Point(_startPosX + 55/2 + mod, _startPosY + 2+ 20),
+            };
+
+            Polygon batteryPolygon = new Polygon();
+            for(Point points : battery){
+                batteryPolygon.addPoint(points.x, points.y);
+            }
+            Polygon battery2Polygon = new Polygon();
+            for(Point points : battery2){
+                battery2Polygon.addPoint(points.x, points.y);
+            }
+            g2d.setColor(Color.YELLOW);
+            g2d.fillPolygon(batteryPolygon);
+            g2d.fillPolygon(battery2Polygon);
+        }
+        if(entityElectricLocomotive.getPantograph()){
+            g2d.setColor(Color.BLACK);
+            g.drawRect(_startPosX + 40,_startPosY,10,1);
+            g.drawRect(_startPosX + 5 + 40, _startPosY ,1,20);
+
+            g.drawRect(_startPosX + 40 + 30,_startPosY,10,1);
+            g.drawRect(_startPosX + 5 + 40 + 30, _startPosY ,1,20);
+
+        }
+
+
+
+    }
+
+
+}

OOP/src/DrawningElectricLocomotiveWheels.java

@@ -0,0 +1,51 @@
+import java.awt.*;
+
+public class DrawningElectricLocomotiveWheels {
+    private WheelsCount _wheelCount;
+    public void setEnumNumber(int wheelCount) {
+        for (WheelsCount value : WheelsCount.values()) {
+            if (value.getEnumNumber() == wheelCount) {
+                _wheelCount = value;
+                return;
+            }
+        }
+    }
+    public void drawElectricLocomotiveWheels(Graphics g, Color color, int startPosX, int startPosY) {
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.setColor(color);
+        g2d.setStroke(new BasicStroke(4));
+
+        if (_wheelCount.getEnumNumber() >= 2){
+            g2d.drawOval(startPosX, startPosY + 70,10,10);
+            g2d.drawOval(startPosX+ 10, startPosY + 70,10,10);
+
+            g2d.drawOval(startPosX + 50, startPosY + 70,10,10);
+            g2d.drawOval(startPosX+ 10 + 50, startPosY + 70,10,10);
+
+        }
+
+        if (_wheelCount.getEnumNumber() >= 3){
+            g2d.drawOval(startPosX, startPosY + 70,10,10);
+            g2d.drawOval(startPosX+ 10, startPosY + 70,10,10);
+            g2d.drawOval(startPosX+ 10 +10, startPosY + 70,10,10);
+
+            g2d.drawOval(startPosX + 50, startPosY + 70,10,10);
+            g2d.drawOval(startPosX  + 10 + 50, startPosY + 70,10,10);
+            g2d.drawOval(startPosX  + 10 + 10 + 50, startPosY + 70,10,10);
+        }
+
+        if (_wheelCount.getEnumNumber() >= 4){
+            g2d.drawOval(startPosX, startPosY + 70,10,10);
+            g2d.drawOval(startPosX+ 10, startPosY + 70,10,10);
+            g2d.drawOval(startPosX+ 10 +10, startPosY + 70,10,10);
+            g2d.drawOval(startPosX+ 10 +10 + 10, startPosY + 70,10,10);
+
+            g2d.drawOval(startPosX + 50, startPosY + 70,10,10);
+            g2d.drawOval(startPosX  + 10 + 50, startPosY + 70,10,10);
+            g2d.drawOval(startPosX  + 10 + 10 + 50, startPosY + 70,10,10);
+            g2d.drawOval(startPosX  + 10 + 10 + 10 + 50, startPosY + 70,10,10);
+        }
+
+    }
+}
+

OOP/src/FormElectricLocomotive.form

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormElectricLocomotive">
+  <grid id="27dc6" binding="PanelWrapper" 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>
+      <xy x="20" y="20" width="599" height="476"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="1ff9a" binding="PictureBox" layout-manager="GridLayoutManager" row-count="6" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="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>
+          <toolTipText value=""/>
+        </properties>
+        <border type="none"/>
+        <children>
+          <vspacer id="7b40c">
+            <constraints>
+              <grid row="2" column="0" row-span="2" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
+                <preferred-size width="88" height="14"/>
+              </grid>
+            </constraints>
+          </vspacer>
+          <hspacer id="e0b21">
+            <constraints>
+              <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+          </hspacer>
+          <component id="a8c2" class="javax.swing.JButton" binding="buttonCreateElectricLocomotive">
+            <constraints>
+              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false">
+                <minimum-size width="150" height="30"/>
+                <preferred-size width="150" height="30"/>
+                <maximum-size width="150" height="30"/>
+              </grid>
+            </constraints>
+            <properties>
+              <text value="Создать ЭлектроЛокомотив"/>
+            </properties>
+          </component>
+          <component id="79b3e" class="javax.swing.JButton" binding="buttonCreateLocomotive">
+            <constraints>
+              <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="10" fill="0" indent="0" use-parent-layout="false">
+                <minimum-size width="150" height="30"/>
+                <preferred-size width="150" height="30"/>
+                <maximum-size width="150" height="30"/>
+              </grid>
+            </constraints>
+            <properties>
+              <text value="Создать локомотив"/>
+            </properties>
+          </component>
+          <component id="fe25b" class="javax.swing.JButton" binding="buttonLeft">
+            <constraints>
+              <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false">
+                <minimum-size width="30" height="30"/>
+                <preferred-size width="30" height="30"/>
+                <maximum-size width="30" height="30"/>
+              </grid>
+            </constraints>
+            <properties>
+              <icon value="arrowLeft.png"/>
+              <text value=""/>
+            </properties>
+          </component>
+          <component id="3eabd" class="javax.swing.JButton" binding="buttonStrategyStep">
+            <constraints>
+              <grid row="1" column="3" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Шаг"/>
+            </properties>
+          </component>
+          <component id="86d84" class="javax.swing.JButton" binding="buttonRight">
+            <constraints>
+              <grid row="5" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false">
+                <minimum-size width="30" height="30"/>
+                <preferred-size width="30" height="30"/>
+                <maximum-size width="30" height="30"/>
+              </grid>
+            </constraints>
+            <properties>
+              <icon value="arrowRight.png"/>
+              <text value=""/>
+            </properties>
+          </component>
+          <component id="3dc0" class="javax.swing.JButton" binding="buttonDown">
+            <constraints>
+              <grid row="5" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false">
+                <minimum-size width="30" height="30"/>
+                <preferred-size width="30" height="30"/>
+                <maximum-size width="30" height="30"/>
+              </grid>
+            </constraints>
+            <properties>
+              <icon value="arrowDown.png"/>
+              <text value=""/>
+            </properties>
+          </component>
+          <component id="ccb2a" class="javax.swing.JButton" binding="buttonUp">
+            <constraints>
+              <grid row="4" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false">
+                <minimum-size width="30" height="30"/>
+                <preferred-size width="30" height="30"/>
+                <maximum-size width="30" height="30"/>
+              </grid>
+            </constraints>
+            <properties>
+              <icon value="arrowUp.png"/>
+              <text value=""/>
+            </properties>
+          </component>
+          <component id="988c8" class="javax.swing.JComboBox" binding="comboBoxStrategy">
+            <constraints>
+              <grid row="0" column="2" row-span="1" col-span="3" vsize-policy="0" hsize-policy="2" anchor="9" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <actionCommand value=""/>
+              <doubleBuffered value="false"/>
+              <toolTipText value=""/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+    </children>
+  </grid>
+</form>

OOP/src/FormElectricLocomotive.java

@@ -0,0 +1,177 @@
+
+import Drawnings.DrawningElectricLocomotive;
+import Drawnings.DrawningLocomotive;
+import MovementStrategy.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
+import java.util.Random;
+import java.util.List;
+
+public class FormElectricLocomotive extends JFrame {
+    protected DrawningLocomotive _drawningLocomotive;
+    JPanel PanelWrapper;
+    private JPanel PictureBox;
+    private JButton buttonCreateElectricLocomotive;
+    private JButton buttonCreateLocomotive;
+    private JButton buttonRight;
+    private JButton buttonDown;
+    private JButton buttonLeft;
+    private JButton buttonUp;
+    private JComboBox comboBoxStrategy;
+    private JButton buttonStrategyStep;
+    private AbstractStrategy _strategy;
+    private List<JComponent> controls;
+
+    private void createObject(String type) {
+        Random random = new Random();
+        switch (type) {
+            case "Drawnings.DrawningLocomotive":
+                _drawningLocomotive = new DrawningLocomotive(50, 100,
+                        new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)), random.nextInt(3));
+                break;
+            case "Drawnings.DrawningElectricLocomotive":
+                _drawningLocomotive = new DrawningElectricLocomotive(50, 100,
+                        new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),random.nextInt(3),
+                        new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),
+                        random.nextBoolean(), random.nextBoolean());
+                break;
+            default:
+                return;
+        }
+        _drawningLocomotive.setPictureSize(PictureBox.getWidth(), PictureBox.getHeight());
+        _drawningLocomotive.setPosition(random.nextInt(100),
+                random.nextInt(100));
+        _strategy = null;
+        comboBoxStrategy.setEnabled(true);
+
+        Draw();
+    }
+
+    public FormElectricLocomotive() {
+        buttonUp.setName("buttonUp");
+        buttonDown.setName("buttonDown");
+        buttonLeft.setName("buttonLeft");
+        buttonRight.setName("buttonRight");
+
+        InitializeControlsRepaintList();
+
+        buttonCreateElectricLocomotive.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                createObject("Drawnings.DrawningElectricLocomotive");
+
+            }
+        });
+        buttonCreateLocomotive.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                createObject("Drawnings.DrawningLocomotive");
+            }
+        });
+        ActionListener buttonMoveClickedListener = new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                String buttonName = ((JButton) e.getSource()).getName();
+                boolean result = false;
+
+                switch (buttonName) {
+                    case "buttonUp": {
+                        result = _drawningLocomotive.moveTransport(MovementDirection.Up);
+                    }
+                    break;
+                    case "buttonDown": {
+                        result = _drawningLocomotive.moveTransport(MovementDirection.Down);
+                    }
+                    break;
+                    case "buttonLeft": {
+                        result = _drawningLocomotive.moveTransport(MovementDirection.Left);
+                    }
+                    break;
+                    case "buttonRight": {
+                        result = _drawningLocomotive.moveTransport(MovementDirection.Right);
+                    }
+                    break;
+                }
+                if (result)
+                    Draw();
+            }
+        };
+        buttonRight.addActionListener(buttonMoveClickedListener);
+        buttonDown.addActionListener(buttonMoveClickedListener);
+        buttonLeft.addActionListener(buttonMoveClickedListener);
+        buttonUp.addActionListener(buttonMoveClickedListener);
+        comboBoxStrategy.addItem("К центру");
+        comboBoxStrategy.addItem("К краю");
+        buttonStrategyStep.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (_drawningLocomotive == null)
+                    return;
+                if (comboBoxStrategy.isEnabled()) {
+                    switch (comboBoxStrategy.getSelectedIndex()) {
+                        case 0:
+                            _strategy = new MoveToCenter();
+                            break;
+                        case 1:
+                            _strategy = new MoveToBorder();
+                            break;
+
+                        default:
+                            _strategy = null;
+                            break;
+
+                    }
+                    if (_strategy == null) {
+                        return;
+                    }
+                    _strategy.SetData(new MoveableLocomotive(_drawningLocomotive), PictureBox.getWidth(), PictureBox.getHeight());
+                }
+                if (_strategy == null) {
+                    return;
+                }
+                _strategy.MakeStep();
+                Draw();
+                comboBoxStrategy.setEnabled(false);
+
+                if (_strategy.GetStatus() == StrategyStatus.Finish) {
+                    comboBoxStrategy.setEnabled(true);
+                    _strategy = null;
+                }
+            }
+        });
+    }
+    private void Draw() {
+        if (_drawningLocomotive.getEntityLocomotive() == null)
+            return;
+        if (PictureBox.getWidth() == 0 || PictureBox.getHeight() == 0) {
+            return;
+        }
+        Graphics g = PictureBox.getGraphics();
+        g.setColor(PictureBox.getBackground());
+        g.fillRect(0,0, PictureBox.getWidth(), PictureBox.getHeight());
+        _drawningLocomotive.DrawTransport(g);
+
+        RepaintControls();
+    }
+    private void RepaintControls() {
+        for (JComponent control : controls) {
+            control.repaint();
+        }
+    }
+
+    private void InitializeControlsRepaintList() {
+        controls = new LinkedList<>();
+        controls.add(buttonCreateElectricLocomotive);
+        controls.add(buttonCreateLocomotive);
+        controls.add(buttonUp);
+        controls.add(buttonDown);
+        controls.add(buttonLeft);
+        controls.add(buttonRight);
+        controls.add(comboBoxStrategy);
+        controls.add(buttonStrategyStep);
+    }
+}