From 2ab74c38dc66bdae5cb932d1811b682cfb2b2479 Mon Sep 17 00:00:00 2001
From: dex_moth <dovakin042@mail.ru>
Date: Sat, 18 Nov 2023 14:35:17 +0400
Subject: [PATCH] lab2

---
 .idea/uiDesigner.xml                          | 124 ++++++++++++++
 .idea/workspace.xml                           |  56 ++++++-
 .../Entities/CountPortholes.class             | Bin 0 -> 1116 bytes
 .../Entities/EntityAirbus.class               | Bin 0 -> 804 bytes
 .../FormAirbus$1.class                        | Bin 0 -> 2014 bytes
 .../FormAirbus$2.class                        | Bin 0 -> 2135 bytes
 .../FormAirbus$Canvas.class                   | Bin 0 -> 928 bytes
 .../FormAirbus.class                          | Bin 0 -> 3719 bytes
 .../Main.class                                | Bin 0 -> 388 bytes
 .../MovementStrategy/Direction.class          | Bin 0 -> 1176 bytes
 ...DrawingAirbus.java => DrawningAirbus.java} |  96 ++++++-----
 src/Drawnings/DrawningPlane.java              |  43 +++++
 ...oles.java => DrawningPortholesCircle.java} |  40 +++--
 src/Drawnings/DrawningPortholesHeart.java     |  81 ++++++++++
 src/Drawnings/DrawningPortholesSquare.java    |  97 +++++++++++
 src/Drawnings/IDrawningPortholes.java         |  10 ++
 src/Entities/EntityAirbus.java                |  29 +---
 src/Entities/EntityPlane.java                 |  21 +++
 src/FormAirbus.java                           | 153 +++++++++++++++---
 src/Main.java                                 |   1 +
 src/MovementStrategy/AbstractStrategy.java    |  76 +++++++++
 .../DrawningObjectAirbus.java                 |  24 +++
 src/MovementStrategy/IMoveableObject.java     |   8 +
 src/MovementStrategy/MoveToBorder.java        |  53 ++++++
 src/MovementStrategy/MoveToCenter.java        |  53 ++++++
 src/MovementStrategy/ObjectParameters.java    |  25 +++
 src/MovementStrategy/Status.java              |   7 +
 27 files changed, 880 insertions(+), 117 deletions(-)
 create mode 100644 .idea/uiDesigner.xml
 create mode 100644 out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/Entities/CountPortholes.class
 create mode 100644 out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/Entities/EntityAirbus.class
 create mode 100644 out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus$1.class
 create mode 100644 out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus$2.class
 create mode 100644 out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus$Canvas.class
 create mode 100644 out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus.class
 create mode 100644 out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/Main.class
 create mode 100644 out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/MovementStrategy/Direction.class
 rename src/Drawnings/{DrawingAirbus.java => DrawningAirbus.java} (63%)
 create mode 100644 src/Drawnings/DrawningPlane.java
 rename src/Drawnings/{DrawingPortholes.java => DrawningPortholesCircle.java} (64%)
 create mode 100644 src/Drawnings/DrawningPortholesHeart.java
 create mode 100644 src/Drawnings/DrawningPortholesSquare.java
 create mode 100644 src/Drawnings/IDrawningPortholes.java
 create mode 100644 src/Entities/EntityPlane.java
 create mode 100644 src/MovementStrategy/AbstractStrategy.java
 create mode 100644 src/MovementStrategy/DrawningObjectAirbus.java
 create mode 100644 src/MovementStrategy/IMoveableObject.java
 create mode 100644 src/MovementStrategy/MoveToBorder.java
 create mode 100644 src/MovementStrategy/MoveToCenter.java
 create mode 100644 src/MovementStrategy/ObjectParameters.java
 create mode 100644 src/MovementStrategy/Status.java

diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.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>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d2e0a73..ffec6a2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,27 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4ad590c0-5ac3-4af8-9d5f-82f5c307cd9c" name="Changes" comment="clean" />
+    <list default="true" id="4ad590c0-5ac3-4af8-9d5f-82f5c307cd9c" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Drawnings/DrawningPlane.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Drawnings/DrawningPortholesHeart.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Drawnings/DrawningPortholesSquare.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Drawnings/IDrawningPortholes.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Entities/EntityPlane.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/MovementStrategy/AbstractStrategy.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/MovementStrategy/DrawningObjectAirbus.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/MovementStrategy/IMoveableObject.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/MovementStrategy/MoveToBorder.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/MovementStrategy/MoveToCenter.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/MovementStrategy/ObjectParameters.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/MovementStrategy/Status.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Drawnings/DrawingAirbus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Drawnings/DrawningAirbus.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Drawnings/DrawingPortholes.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Drawnings/DrawningPortholesCircle.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entities/EntityAirbus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entities/EntityAirbus.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/FormAirbus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/FormAirbus.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -13,7 +33,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="main" />
+        <entry key="$PROJECT_DIR$" value="lab1" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -21,9 +41,9 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 8
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 8
+}</component>
   <component name="ProjectId" id="2YLEaNaqu94PwzQjd2r7Rir4Z96" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -33,15 +53,35 @@
   "keyToString": {
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "lab1",
-    "last_opened_file_path": "E:/GitLab/PIbd-22_Isaeva_A.I._Airbus_Hard"
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "git-widget-placeholder": "lab2",
+    "last_opened_file_path": "E:/GitLab/PIbd-22_Isaeva_A.I._Airbus_Hard/src/MovementStrategy"
   }
 }]]></component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\GitLab\PIbd-22_Isaeva_A.I._Airbus_Hard\src\MovementStrategy" />
+      <recent name="E:\GitLab\PIbd-22_Isaeva_A.I._Airbus_Hard\src\Entities" />
+      <recent name="E:\GitLab\PIbd-22_Isaeva_A.I._Airbus_Hard\src\Drawnings" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="E:\GitLab\PIbd-22_Isaeva_A.I._Airbus_Hard" />
     </key>
   </component>
+  <component name="RunManager">
+    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Main" />
+      <module name="PIbd-22_Isaeva_A.I._Airbus_Hard" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.Main" />
+      </list>
+    </recent_temporary>
+  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -64,6 +104,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="clean" />
-    <option name="LAST_COMMIT_MESSAGE" value="clean" />
+    <option name="LAST_COMMIT_MESSAGE" value="" />
   </component>
 </project>
\ No newline at end of file
diff --git a/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/Entities/CountPortholes.class b/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/Entities/CountPortholes.class
new file mode 100644
index 0000000000000000000000000000000000000000..130233ddaed07f8e30cc6509151a6fe169a2719a
GIT binary patch
literal 1116
zcmZ`%ZEw<G6g^L0DAaDlZVtiCmpSFlft#CtU|F`1nV6tkERqmE6;`23X_HcB{N_(m
zmbgWu*=K*0@jee2Axe|>_THXzo_lWZ&tG4E064%i4H84@(2v~6b^7IMFz}<}AdI?!
z=kya`Pz<PuG01htXGqs(Kr0*@H;~}iSpB`@M<00UngL@}>bl{mG;d%5Nd|4baZr16
zXfb5o&Xm<*Vo^iVz!GjSsBJIs9fqY`zIJM#*=5i6JLRL+snd=sI#Rf)A#EUoTMYAm
z0f+veM+ctS-oQC}$FP%|U{^i6->*y*tSEH-PG#~0E+F(*4cx{ZvbgK|ZnVd+JSjD1
zzQ{M?P<67u8b=}ygTFp7@DN#UTeQ(<SjpvQ8>b`w;FM}`LY^0DuJ61W^jc0>w_6@n
zHvV&Ve&#3{%v#X4y@nmSoIe&(e7i?l=D!1ANWOGv6HbopkT8)GQqxM*btxn)x8vK<
zAS9}s%Qxuf@3y`1Oo|g)d~&-pd)lio=vFWY+s<>BTUwmnz!Lw5`<pbr6z!|BpXSR5
zP^3i@k+us+X81}GLZx~RS;FTjTcgM?eTca)xPArm6J-nqdd9>ziSQW|Aqo68Mb6Mo
zR=C9S6&S}$Q}{<zF-9nCphQ`jZk1>sIh2+IvJl&(DAOmcP+Ymd%4d3=rKI68cOjG#
z64{}5x;F)7E2;Cvp(DAaG8B3Osn~b0raXjfHI*SWtEmoYlDyw(e{np))|mWyOfG#R
zu6b9!z`b+GB3V;JqKV|bDiZw?>*tu`osTq4!Iv>dF+;P?k|Sx{<~DW+C*kRD<T2pC

literal 0
HcmV?d00001

diff --git a/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/Entities/EntityAirbus.class b/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/Entities/EntityAirbus.class
new file mode 100644
index 0000000000000000000000000000000000000000..cf759af52560077b2e38ec0618c7c906f0842f17
GIT binary patch
literal 804
zcmZuv!EVz)6r61wyGad6Q%c&jPzr5GEP+3u2&q&=iWI>iD4gwNm273=%5hrt%7F{N
zf)GeVNF4Y8J_<3rF;H2#?0Y-==Ixu={q_6DPXMQAm#~I{1ItAbw!rqwX{u5sXTC|U
zPgN4mX9C6kg_I)!(ba@?7bTPh?6*>lCn@2MhFur8a9g1CA|73z#ZjCHRD0*aW#9)_
zsc(>zGOE~gP;;?`J3KeXQ7|3*ufuaWWHbAjnyU1<K%vzh=)QMd)b({%Kb02(>tmT_
z<FKMj{45?xfl5zJ<*WI-P$qAJFd|ax#ls*P1c}o747AdTqM~|lrPLFS&;Eaf@q&(k
zOXP;8TC1H`Mdw=GP9AL!=-h1SoPCvfRSN&RQ|`y}WGFjIPrG^3@~7Gt98!Ii4`ng(
zeVDCj=S`&5j1*$_7PB4fa%~Xx83kj}`v&pJl<#r14d`N@xw|aDJ>2I`-~bP}=E=_I
z9J#WRe29lD$QxgB<l0K|79M5f_b5;*(Dc5e;vFsEczX*7@5urio|aM_O&FYy(T4@L
zzy9mqFxJ$`-Jw0ZG^WAdwU1+}(^|b{*Gwz><0$i@$(k}v)mW3f0w;NF`nLW6R3U@l

literal 0
HcmV?d00001

diff --git a/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus$1.class b/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..ffe7420be804d61a81f588fe72f51d9e574b3bbe
GIT binary patch
literal 2014
zcmZuyU3U{z6y3Kioi-hsw3H9AK-7v!X-NwzYH78U7J_Xl6pNrpr^zK9NM`EH^n(W%
zA1-kz`1$AykGOmSgtm)He0BLW`4|2Om&<);+9ZfsD>L_=d(OV+?6dEkKmU1B1Tct&
zM%18IL!FLIs29*jY^N}2Iy3WbN3TG=H*2~bJ+zNj7WyJ+K%<6;jwa{=vCGDSk;)rZ
zE_HI|vdnmlJ8W8}Hy}`(NKQ4P8Bq-}9W7`Th*Xd`xn#<GcF3N$7`0<mAuXlcMUz-3
z&d4QiL@jf}Hf+_fO~-cZ5ZLzrZUS0PdMZkwEs+es!n7tmhlqsPi5E4r>)3_e0xgxi
z)0QW5(h+EwGaOfPDzG*2JVG+9Auh0`5;?q-k#nADTMc+w;F^EWUoGA6*ZgAKf8-ZA
zSoWW)$%E4E(#_JHc<H)--+vg`dV9L!2YTZED!o?Y2YdEM{GU`vH`f`V%xk4@{ogox
z>fbNj^otBG`VZs&?;Na_ksgOTJc;-AM9_g(HSE>#8WIBApCRgGkmrP9N!ISp+KXe-
zb&Z@nY8rVvCy-n(*jV&ZLv~@#wxs3tRgn;Ow=X%Rp>w0{^PZVcoi?njU5Fs5WYNt=
z9(9aGi<G;mjZvs6<&x6T18PgN*r|Z&x<pzLdr+V`AT~@OZ#xkjz#B?sZ&Ff;bUGc1
z=`9^^;~knZhP7b0>_?S4JB9)yn|&Dl8U}Q{i}zS?MRn^QY&PX`*35ddflkvZ;)sqR
z<=)7p<I>E{dJ%MCSmiLnx)SM;kdJbTedVl<>qz5-K=fjEz51|bft{lpEc}-bX4!>N
z9b*_5XquGXgzcJ2O#+)(Z&>bxj#D^I!ZUVZ#y(;%QO*YSdX)_hvMHY!b}euq>=}HZ
zVM@nYd`Kxjqk|1Eo<3K4!<I3Vmsx?j#QEfu;^4fFkJP!=964v0mZ#x@z^-y<<N{@p
z8qBCPM@`q0mO41mL{$$c5#kNmSt>0$YFcu9zAz)5GioP+)=@iS<fjbBRP%LXow{i#
zfGU)Z-aZyRCcRlZJ7G9RL3+}mPt*wZo{-KZUREmgJypuBPH$MH8YI)4QCG}_?GP+4
z2_n)0HFAmER0+I%n7OfFrtOtxKM%_a9qL}y6L3>?5*WUD(latw#*Df3`XZC|ypxe5
zreYvk5#xRpOUtm8$+P!XF07a09G9+l+;({r>1m4`59JNlRjJp93P+q*cLM}IhKR+~
z_01c-hW{pf!uLgv2KZK%Naw!C5S=T~9t1wqeAY7(ScJjnw$KYR$Z$sg08Jpv@g}-m
zkI`A;5}$+>SGYwTmx`T_ARb}!GPbPZh5mb}AFu6ik45fcM|-U8E?V1TyYEs-tuL+O
zl~|;I4asvW*f*}i*3fmXy9IwNV}C3=-QA-39JSQ`HGOLh2e=}@`LnMTyxtz}cxV}Y
z<<Z~@jy}e*aDJ>imQ|3E>GEJ1?}uwA>y|ND4m<ZCAfTBar9G&{H0v2al+Vxjxw=W~
zHMHUeKRlmfFTUV0y@eFM!XbQ(3%HG|_y%|I9e&35_!U3kDSiy793ZjH#LHopq_*;J
z;xgxCt4wbZSCHrKZTMx~?-0I30T%sidN!f<l!iTjqeko`(Q`D_;8Qq!*AX0W14}bJ
PzSS10$Le>OtMkCWY2+97

literal 0
HcmV?d00001

diff --git a/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus$2.class b/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus$2.class
new file mode 100644
index 0000000000000000000000000000000000000000..ddf77b5744ccc247afdbfed1a1c66a1e73500f5d
GIT binary patch
literal 2135
zcmaJ?U2has7=BJ$I_-97x21fD1y-%NTPRzKidu@4(#pcNtQ3pX4?5jFYzKB{>df>5
zH4(Y+Mx$58L}RMa1dSRgfo(&j-Wp@f^vY|w@<$lsb7tG!Mbu4p<~`^AJkR^QXMX<c
z_6mSLyjhPbRBNcwu>rLL`k?LP`%GtI+HLO^sP!gIx4nz|$+Ds+ggVq~2<d2mE)c$G
z%oy>UVP)f|CN9dfN54a+WqOANs-v;ddNiU*Ls&;MS_DGnNL*YnWiHciPh0fbmQ<1E
z;_j@;SSQZNId4#@nXna`HEhwb725>1{JWWemX)6J5@?Oaf?&n6Mm&cR8D={k)X=75
z2X+cHm+MYgp3F)|pl-@=T*;-t=IH$qVhIfqflX!4fw{Dt@=V*R!@~k^`PclV)wlg+
ze<kAI^j9bp{5xu~u=?)m)z$YRt5^K%{*7R7f7jkfcUQz;qSaF5K-a#I|FLrEq@EsX
zdwKPJ{|8EU{OhY%{S`W|_%|Z{j}(?lk!}?;+>Y$;3ZWg3YS^vgF+>Hn-UHOBpw5(G
zNuJ%Ev}cE;>l#^k%rtU#Rv@-^U}M&c_uKg?+me>oQvpJ;yFIZ{4IS%kpZ3gL{Ip?Z
z?0g6@MT<`6J?0p*79n@z>r#sRkjf&iqYL}lD~pW^fUb!q6s`vZ8UtL5`E#}tLN}gJ
zBzuyKiY5|?*r<x|l#ZwIj6j2maMZSQ(y#)ijVY!b($NbtuQqL1Glt7%RZzFRKiDJ_
zj-XG&Q62p_Ml{NlT(ck($fdJp#+wX6CzQvaj^~tlJypl0nVs}P*o%a!@Pt4|G%;8N
zt8{>##6LI2#?&cPok<--7#3(cpIHN|ICcWtlk1?B;VbG`cM8vIIIUv@XE-qbWk_&F
zq?fW?Q&Cf31JNs{9o2CbFS2`SJ3nC`wdXh+2FZV!T?>jWjUOox7%=G=UefTgj#uz1
z=i(kxty^)FUFi*2#zanL1ZtvVs#!-cuES85gyzU8!?ZjNX@MQ3KFb+$EZ&z^WhPD6
zla`vorf5aa$T!C8w=<+|Q_{5L@N|AcI%iZSftIA5HgcneW2*JqW{tYGNT-S@?cF^*
z^pNx>?M%vWjJ))uLz^Ze$eohT1>StB^j#HWP+8u9Dm5skF|F>al<hEBPBMr{2vo^A
zVpB0KrJI3?1uJbUbK(B5JfXuOQs)V<sTeD|ZyfQA^razVYVCZX5qsK6%Ry5i&{QVx
zKIO}u0V|zj@2za{yd?9mbiL!Y%WF+fSj4zLXSl8^y|y?Ji10g52Z0HQa9Di{_<5+}
zzX2J(C8fiBtDR8Co?8$di_jJVn+tr_(i8X)Sw6QEtuP6bE7}Lq1TIqEK(i}h8ec+=
zPlgpAVIyj&y4!IR;wCm0uxSYo^j<^laCL86I5dxKZQ<5=w6ukH&XY+k4=v%5aHw|~
zv2%;qGpyW}vG-hOGkz*yUpO<~*{u1Lnydd9e`gup)Ch2W?`si{xBZ{8vw(x@U#zO9
zfM-k6z#@*{!pY+LWM?>|(uT%MLIJ0Wx)*8+I9GBzzYu`b$gkioR71fwNE!Hqx4~zW
zK1B=W`K9|DyYU4tmM;;<H5|lOoV%~_I=;aN_?A}R;X1y@FMR%n1^kX10qlp_ghs~A
z!(szk__r~|HIXf~;x1l;!zx<w>zds`Ms?xQZkm=2sOIgm>rYgP?QF^nx2iCUIlgNc
W9Jn0pG_n{3DHI>n?+CST0Dl9uX+5F<

literal 0
HcmV?d00001

diff --git a/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus$Canvas.class b/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus$Canvas.class
new file mode 100644
index 0000000000000000000000000000000000000000..d6768543b0c74650017d84374b960c91c819baeb
GIT binary patch
literal 928
zcmZuwU2hUW6g?Lx3)^j>tsqvdsGxk*Qqea|lLk_?fySf_uV#P^timptU5bxB_=lQQ
zoA_XSGw~l8P4&(~OBG+{&dfdcoHKXten0>G1;8$zMiD?zL&(4a!i1GQM-Fx^*&4Z-
zs<4lRO9*>C%gt;PjQT8F(GfvZgKl6E1|j)I9E*1)cWl|+(tgz$3?19FJ+6Lc*_O9M
z2<Gz5D3%e^5I3-bRf0a_Bg9^Jq!`;=KhY<w*K5-ow{)?a<b3sO1`<ee;ZRt%cPYt^
zlexOGQxapZ^jwNz&uY7sd{aY;ur`+|*L1AoriNPvZexRxx)A$UmawE!M^f1C(2@MQ
z)PI!9HP%w?NgKGUdZS6xx5!p=S6i5G5<*p{V{)Qy+2+A$&@$zbX!ZGKweGY<zbT}p
z&eO|~`V{<zD=gE`R3XG0rq^>iuY?o>(=#Olm;Y`Jfx4=Ct_55j?3O!(#C(pQ!|y)y
zMEh++45vo)LuVx0=ANaj#%7;!OHmUd2d3-2a9r+?@zS<US?vqgHPtXprV44Ey9kdU
z#p7!7cozWiDBa_DpHDj+103~2@gt~k2JOVhWOxlT68M2EugM7t5AcvrjQ80HIo>ZY
z?0uZUd4`cs`+?y>PGt+Hpi?Y;L+GSXJi}V?E3P-Dmz$q(gB9;6#UPa81~guOGW##~
zc#b%JBf;!xB4jAwJ4sK7FP&sjK#^q=jNZf}7T)stXpw;>-UhIZ$9`N!nWN6&0RJFQ
FfIqX+&CUP-

literal 0
HcmV?d00001

diff --git a/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus.class b/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/FormAirbus.class
new file mode 100644
index 0000000000000000000000000000000000000000..c5e7b5b3120f72493612d33a2646e8a87ca778a5
GIT binary patch
literal 3719
zcmZu!Yj6|S75?tZMnY_`r8vA267y(ki(mr@X|O55Hn<36o5o;bpfPKCZ7-2mjwIVa
z+9p6AwBgav;52=uX`6;7ePBS6ivxY8X*->%++Ue?rhhuqnf`01{gvrt`kh_Lk{mqa
zz2~0yJ@>okUj5;t8@B+o;P*ag3afH&<Zk7%x$C(rxtqD^T)KAlB*}NloSA)j_EheQ
z9~G$dVu21Xd<wy%#<+2;F*#w`Lyf!J6UK<CuwbiYTd8ddchyBi-WW3|?M@}A)Lh@=
zg<nB$k0(Z2tVI7<a_vSx7D5+~cPLcVMT#P7FGLlpy$I+C;!XvBQK+z@e=L=X+ieNc
zNSUs)h?Pv4wwX}4&y8(Nq#Dg}(@r(EL{nDWE+{m6aaVa7oBXJOF7cM>ST4bqm-^q!
zRhR{9FYYcke$bB<uJOG(?i1rBt}&O*<c5wHEmxIWKIBKOYq?g(C&cnj*D~1=AD;{8
zXIh`sQHOfU!z{05#H<r$TYO|RZgX`Cp1S%T(OReD0jy`Gl4h#MN?QFfZb?PmK`DHr
zLZDc{wQYtyZY2F^aN}>%@gN@J{zV-=1C?w=UYTWkc>cCWjD9ob!y^ita~E@0b7|sd
znqVP%UL<icH<P<nOEk?8MCS>nX=3XN<+o;^C9tkG`LP+5Quk&ZTk&b89utpk@iAFf
zjkAw)7;}O#i$_`EGVtv)kEPlzGdAGIHna$u>cwZ9jvd%ZpMxUH`&?G;bI!EchtCjJ
zxyuCoHDZ7E6jPK`)46L*d%8(HhIQ<gEbnl#EbOlr5dyv}BW_NAyfuEzi%!<PcoM=k
z0bwTm=)hhbpT%Pe-f<%~W_As7QFY<^l2en{ZT4di_Q|65i^`!AjjsNqW;B&QDF<{s
zj$Vc8Xg+o!J%y#^Yc3?mQXb+?mnGin94j9_CmrG9>`S>Rw+ypqKUS03^L`w3ckhS}
z1N{n%%Yo0Tlt*^GGwuLSyHgc8qhXtPB^IL?lw}UFCUs%{38)Xk(s2||DlDW@hmjbv
zYyu<SU5eH$f)67KD~oN6J9xI1TX@dF+SKgn*^{z|aUG+QYtYTLw1fD-<}u$xc^ecD
zDIH_tAyDeU=@F7|i>Msaaa>e<uFC#VAD&jw#zsZs3p&0i9n{Meb+T=G@$5YOghz}a
zGaQZEKAhr?S~5)@-eVr$KiV*A5Bc#7D#g?DI$pqwt|w8S>$`<BBg{NLzNF*JlF}kK
zrN^wH;gk<&6)F=hd7fA(Msnm5OqTN%9WRTm-?fdHgEajrdrQorF0q<LOOX}~U)Axo
z62l$w2`=gDG#qfKZ<ZN~)LmW`zOCbRe8*i`H@h9vBqrQ8_gx*|!}k@Iv3@(uL1QeI
zYKz5_X4k06hRa4TO)sze108SSvWuRGaXdc8wsLm~dR$(IVY9*sR!XY+wvKlMg@U+N
zcA^1db2HwS=EBb&`83F<3R60+;u;&UF+fCzO8m}s=jQy87N{1P5+<!9gDhc0<MIni
zVRebC+g@SyJ*>!tHIN!sP+>OiVN-UI$Et52VNBS(Z{1swJuR{$&q+2GC|B0Z;C)7a
zlJ`_JRcse)B69tV@M<aW8e8Tm(Xyf~KEQ3MideSUIX2R7CiWT5g%ga#qeiU9NLVt@
zGb>WVR+6`0$+bcs{_gl#B5Jl<a#2+kucrp-4TNf^nM`$<;#+LPHgET~n2}7HoGx&$
zFs$M}RPZ5F0}a#o87U1n^5YENb>=rAPaRF}IF693#+mbaaOQ04&d3JpjBI9(oQ=X6
zdEA|mXWAKwX=mhtaz-8wj*xeXGx7=HjC>6^Bky*O8i;4q^ZRqoUSQUW<MvQcW#I|U
zU}0}4i$!THCS4=+k~Ef*ULo{7X{;n&EA;9#)`T*+KU9%HXv*>Y3w~F_$L}gEzyve7
zgnN-j2!F%Flr&)t9>rSxk{Y@j7r(-<In(52;pS9vKl5Ww9v>q$NTdyEY$Uz8H~6V6
zwxrR-$+q4swx`kR^4lH$E>8CJR^CKMug5cuuI}E73K_EKPNRpygT2ASSv-+OU+6me
zW)P*G$CHJb!LTciIbxe)`*z}|9C4E3<ZZ-RjHfX{;Y9F62A>yV2G8^cPiApCgXf$G
zj?Nj1&IDg_b<Q|C=jQ8Npw5NhMOWv7qw~sqok{9U248b^CLNt`<aGj`+JO3R2Hy%T
z$l#5T%HT~Z+tqqNMFY54y()trl93D`Q_g9s4h7Vu0RB~7lfjRu(n>m@Uaj6Bj31M+
zE1->6*W{guMvpKy34<CxA)`+idrQJh1hlsTY72cl;Kn@@&^`#L!6M@VP0ARPj!B6|
zljJ@xu|Jn3w$bAWc$NgzA2axAh-ugvTsa^_vOqKyh}HtJt3dP=h`s_bQ6SC~h{*zR
zp+J1x;YLTq;EcOCgX<EW|4Us`fVa{m1t@D=Qt*%`WlQs<AVA3C+4_*pA3P~KPt<a(
z<4IbNjl2dr(TGFXfDvrM3HFz>yeVGeiF*f+u)A;JNpHfR*l+&A4)b^V_z$+@BeW<l
zTGdkQP^<YsU59qnj9qFc!fH2mt1iALkDx;((4|geuX=^g#5d7RAnjA{qep#!1L~i6
zTz!aMZ4nM?_u!DW9*4E9ctYEWKCKf+v;#1-Bk0#GM70D4w5MTe&tXtIhaqhe!`kbx
zw97cEP2oxH25jv;#I+nowZGyi?H@>J|3*^#A5tDKpE`3r!{f{M3=e+ebdLA%Tc@8?
jvJ$oY6;#7tbMKQALM18puO>gP$d9%8v4MU2cfkJva=sL?

literal 0
HcmV?d00001

diff --git a/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/Main.class b/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/Main.class
new file mode 100644
index 0000000000000000000000000000000000000000..b8e33fdb850ee16d506bc477eeb657d4f326a0fc
GIT binary patch
literal 388
zcmZus!AiqG5Ph4bO%tQ7t=6-*)`K~Es0c;qDe9pT5l@>K;+A9s+ob>Hsi5Eo_)+3a
zD&*qAzG2>*c{B6<^YH~>fin*lIu2|fUGxNoYq^y{E_D_>#OpMv1bWv>tLjFeGo3{a
z`U2jvG{r)hxZZehxcxxDzLQE*xGi5(fkCKrdS4fDY93{r6Eh0SMCOq+it|6xuHMv!
zMuglvr|zOLnM_~8c9B(Ol+Na}h;(T(svrL&(^{*tHc7fvJkDjuOE$qd_(*;h1fNOh
zQx;GZ6uTEYi1$W5BxD)%j|lyJ0R|XS=HeJ5Vz~LLF(d91&hrlLQ){rFW}{EDS`!yz
LoHWL#gcc^hPwhmf

literal 0
HcmV?d00001

diff --git a/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/MovementStrategy/Direction.class b/out/production/PIbd-22_Isaeva_A.I._Airbus_Hard/MovementStrategy/Direction.class
new file mode 100644
index 0000000000000000000000000000000000000000..883737e62b48a37e362f0f2218fe6f687cb25399
GIT binary patch
literal 1176
zcmaJ<ZBNrs6n<`B)~$9h$BQzVAfjwT87RY-E(8LYm<%yimMnhiM%hZb)|3w8H-D0j
zM2JSiXMdFO+{@GvWlh?1&$-We&UsGHkDp(@16YTtL1M^k2S-lZ@gpk=?Z|1qFK)V_
z(}>)_Pk=!&pd!W~?Y?E0tXvK@IXZ42!O_ZQ@J^&(F<^*5#o3QIV#vTS52&x)W=lk_
z8c1V=L7T0vS9Z57hU}X`b##njT*HWgYq(BC4KMH=hS6NUa$q0XMbGw|#hv;AX)twU
za6`kSfh=xP@xOpAztg6gN4D2-cJ>)cxxVZT&ptdf`vNo@*KeBr6*z(5pEhs{GYqk^
z>$}k^!+1YcFY|f68i%UW0H)(e#9_oS%)PvU0_M4R(a9mhR4zYIJ{9^6RW^b>Qa)U9
zedk4|U3bFQcHN`M;(t2G51J`Mx)L;OuWE-br|9u0zTGCe^uLo}NNqb&E7*H!hlGio
zkXl!wmP;mKxlP}WIw7UXxqOw@qTKL$!&&I#;v*~%YHQVG(5;{oHk@ZJ7dG@~Hy8M?
zTw9_MW@wq!wF$na09jf<VQKG#rF8>R8NOs3N%!|KPkHyrn<2{|y^GXmjGkfaBY6x9
z^o@x-iSStzAqo64S)QS%S>Y5DXJ8yJUBE9=#5hM`2@lA7NUut1A2^hD1+pMpA}iCC
zR+yhW!PF-@UdE(hnX3>?35n#;nck8}SxM=9iKrx(RDwcZAgg@?tI1u+R!!+bvubLW
zhFObsk+gW%7gfgb2rE5`Mvub$N(|}S@(E^-Aq(e@A{<RPcU9r&!kLQ+CwYq8F;ZO2
ed4X{nIY?)cNHcVvBO!c@Qm^~RctZCQp8f*&AnW`9

literal 0
HcmV?d00001

diff --git a/src/Drawnings/DrawingAirbus.java b/src/Drawnings/DrawningAirbus.java
similarity index 63%
rename from src/Drawnings/DrawingAirbus.java
rename to src/Drawnings/DrawningAirbus.java
index efd3310..a8fc97e 100644
--- a/src/Drawnings/DrawingAirbus.java
+++ b/src/Drawnings/DrawningAirbus.java
@@ -1,29 +1,48 @@
 package Drawnings;
 
 import java.awt.*;
+import java.util.Random;
 import Entities.*;
 import MovementStrategy.*;
 
-public class DrawingAirbus {
+public class DrawningAirbus {
 
     public EntityAirbus entityAirbus;
-    public DrawingPortholes _portholes;
+    public IDrawningPortholes _portholes;
     private int _pictureWidth;
     private int _pictureHeight;
-    private int _startPosX;
-    private int _startPosY;
-    private int _airbusWidth = 123;
+    protected int _startPosX;
+    protected int _startPosY;
+    private int _airbusWidth = 124;
     private int _airbusHeight = 44;
 
-    public void Init(int speed, float weight, Color bodyColor, Color additionalColor, boolean isCompartment, boolean isadditionalEngine, int countPortholes, int width, int height) {
+    public int GetPosX() { return  _startPosX; }
+    public int GetPosY() { return _startPosY; }
+    public int GetWidth() { return  _airbusWidth; }
+    public int GetHeight() { return  _airbusHeight; }
+
+    public DrawningAirbus(int speed, float weight, Color bodyColor, int countPortholes, int width, int height) {
         if (width < _airbusHeight || height < _airbusWidth)
             return;
         _pictureWidth = width;
         _pictureHeight = height;
-        entityAirbus = new EntityAirbus();
-        entityAirbus.Init(speed, weight, bodyColor, additionalColor, isCompartment, isadditionalEngine);
+        entityAirbus = new EntityAirbus(speed, weight, bodyColor);
 
-        _portholes = new DrawingPortholes();
+        Random random = new Random();
+        switch (random.nextInt(0,3)) {
+            case 0:
+                _portholes = new DrawningPortholesCircle();
+                break;
+            case 1:
+                _portholes = new DrawningPortholesHeart();
+                break;
+            case 2:
+                _portholes = new DrawningPortholesSquare();
+                break;
+            default:
+                _portholes = new DrawningPortholesCircle();
+                break;
+        }
         _portholes.SetCount(countPortholes);
     }
 
@@ -39,6 +58,27 @@ public class DrawingAirbus {
         }
     }
 
+    public boolean CanMove(Direction direction)
+    {
+        if (entityAirbus == null)
+        {
+            return false;
+        }
+        switch (direction)
+        {
+            case Left:
+                return _startPosX - entityAirbus.Step > 0;
+            case Right:
+                return _startPosX + _airbusWidth + entityAirbus.Step < _pictureWidth;
+            case Up:
+                return _startPosY - entityAirbus.Step > 0;
+            case Down:
+                return _startPosY + _airbusHeight + entityAirbus.Step < _pictureHeight;
+            default:
+                return false;
+        }
+    }
+
     public void MoveTransport(Direction direction){
         if (entityAirbus == null) {
             return;
@@ -46,28 +86,16 @@ public class DrawingAirbus {
 
         switch (direction) {
             case Left:
-            if (_startPosX - entityAirbus.Step > 0)
-            {
-                _startPosX -= entityAirbus.Step;
-            }
+            _startPosX -= entityAirbus.Step;
             break;
         case Right:
-            if (_startPosX + _airbusWidth + entityAirbus.Step < _pictureWidth)
-            {
-                _startPosX += entityAirbus.Step;
-            }
+            _startPosX += entityAirbus.Step;
             break;
         case Up:
-            if (_startPosY - entityAirbus.Step > 0)
-            {
-                _startPosY -= entityAirbus.Step;
-            }
+            _startPosY -= entityAirbus.Step;
             break;
         case Down:
-            if (_startPosY + _airbusHeight + entityAirbus.Step < _pictureHeight)
-            {
-                _startPosY += entityAirbus.Step;
-            }
+            _startPosY += entityAirbus.Step;
             break;
         }
     }
@@ -122,23 +150,5 @@ public class DrawingAirbus {
         g.drawOval(_startPosX+25,_startPosY+38, 6, 6);
         g.drawOval(_startPosX+30,_startPosY+38, 6, 6);
         g.drawOval(_startPosX+100,_startPosY+38, 6, 6);
-
-        // пассажирский отсек
-        if (entityAirbus.IsCompartment())
-        {
-            g.setColor(entityAirbus.getAdditionalColor());
-            g.fillOval(_startPosX+57, _startPosY+11, 39, 9);
-            g.setColor(Color.BLACK);
-            g.drawOval(_startPosX+57, _startPosY+11, 39, 9);
-        }
-
-        // доп двигатель
-        if (entityAirbus.IsAdditionalEngine())
-        {
-            g.setColor(entityAirbus.getAdditionalColor());
-            g.fillOval(_startPosX, _startPosY + 25, 11, 5);
-            g.setColor(Color.BLACK);
-            g.drawOval(_startPosX, _startPosY + 25, 11, 5);
-        }
     }
 }
diff --git a/src/Drawnings/DrawningPlane.java b/src/Drawnings/DrawningPlane.java
new file mode 100644
index 0000000..ce380f4
--- /dev/null
+++ b/src/Drawnings/DrawningPlane.java
@@ -0,0 +1,43 @@
+package Drawnings;
+
+import Entities.EntityPlane;
+
+import java.awt.*;
+
+public class DrawningPlane extends DrawningAirbus {
+
+    public DrawningPlane(int speed, float weight, Color bodyColor, int countPortholes, Color additionalColor, boolean isCompartment, boolean isAdditionalEngine, int width, int height)
+    {
+        super(speed, weight, bodyColor, countPortholes, width, height);
+        if (entityAirbus != null) {
+            entityAirbus = new EntityPlane(speed, weight, bodyColor, additionalColor, isCompartment, isAdditionalEngine);
+        }
+    }
+    @Override
+    public void DrawTransport(Graphics2D g) {
+
+        if (entityAirbus == null)
+        {
+            return;
+        }
+
+        Color additionalColor = ((EntityPlane)entityAirbus).getAdditionalColor();
+        // пассажирский отсек
+        if (((EntityPlane)entityAirbus).IsCompartment()) {
+            g.setColor(additionalColor);
+            g.fillOval(_startPosX + 57, _startPosY + 11, 39, 9);
+            g.setColor(Color.BLACK);
+            g.drawOval(_startPosX + 57, _startPosY + 11, 39, 9);
+        }
+
+        super.DrawTransport(g);
+
+        // доп двигатель
+        if (((EntityPlane)entityAirbus).IsAdditionalEngine()) {
+            g.setColor(additionalColor);
+            g.fillOval(_startPosX, _startPosY + 25, 11, 5);
+            g.setColor(Color.BLACK);
+            g.drawOval(_startPosX, _startPosY + 25, 11, 5);
+        }
+    }
+}
diff --git a/src/Drawnings/DrawingPortholes.java b/src/Drawnings/DrawningPortholesCircle.java
similarity index 64%
rename from src/Drawnings/DrawingPortholes.java
rename to src/Drawnings/DrawningPortholesCircle.java
index 11faa56..f93c2b8 100644
--- a/src/Drawnings/DrawingPortholes.java
+++ b/src/Drawnings/DrawningPortholesCircle.java
@@ -3,17 +3,15 @@ package Drawnings;
 import java.awt.*;
 import Entities.*;
 
-public class DrawingPortholes {
+public class DrawningPortholesCircle implements IDrawningPortholes {
     private CountPortholes _porthole;
-    public int Count;
 
     public CountPortholes getCount()
     {
         return _porthole;
     }
     public void SetCount (int count) {
-        Count = count;
-        switch (Count) {
+        switch (count) {
             case 10:
                 _porthole = CountPortholes.Ten;
                 break;
@@ -29,69 +27,69 @@ public class DrawingPortholes {
         }
     }
 
-    public void Draw (Graphics2D g, int _startPosx, int _startPoxY) {
+    public void Draw (Graphics2D g, int _startPosX, int _startPosY) {
         g.setColor(Color.BLACK);
         if (_porthole == CountPortholes.Ten) {
             // цикл
             for (int i = 0; i < 10; ++i)
             {
                 g.setColor(Color.cyan);
-                g.fillOval(_startPosx + 19 + i*8, _startPoxY+21, 3, 3);
+                g.fillOval(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
                 g.setColor(Color.black);
-                g.drawOval(_startPosx + 19 + i*8, _startPoxY+21, 3, 3);
+                g.drawOval(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
             }
         }
         if (_porthole == CountPortholes.Twenty) {
             for (int i = 0; i < 10; ++i)
             {
                 g.setColor(Color.cyan);
-                g.fillOval(_startPosx + 19 + i*8, _startPoxY+21, 3, 3);
+                g.fillOval(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
                 g.setColor(Color.black);
-                g.drawOval(_startPosx + 19 + i*8, _startPoxY+21, 3, 3);
+                g.drawOval(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
             }
             for (int i=0; i < 5; ++i)
             {
                 g.setColor(Color.cyan);
-                g.fillOval(_startPosx + 15 + i*5, _startPoxY+26, 3, 3);
+                g.fillOval(_startPosX + 15 + i*5, _startPosY+26, 3, 3);
                 g.setColor(Color.black);
-                g.drawOval(_startPosx + 15 + i*5, _startPoxY+26, 3, 3);
+                g.drawOval(_startPosX + 15 + i*5, _startPosY+26, 3, 3);
             }
             for (int i=0; i < 5; ++i)
             {
                 g.setColor(Color.cyan);
-                g.fillOval(_startPosx + 70 + i*5, _startPoxY+26, 3, 3);
+                g.fillOval(_startPosX + 70 + i*5, _startPosY+26, 3, 3);
                 g.setColor(Color.black);
-                g.drawOval(_startPosx + 70 + i*5, _startPoxY+26, 3, 3);
+                g.drawOval(_startPosX + 70 + i*5, _startPosY+26, 3, 3);
             }
         }
         if (_porthole == CountPortholes.Thirty){
             for (int i = 0; i < 10; ++i)
             {
                 g.setColor(Color.cyan);
-                g.fillOval(_startPosx + 19 + i*8, _startPoxY+21, 3, 3);
+                g.fillOval(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
                 g.setColor(Color.black);
-                g.drawOval(_startPosx + 19 + i*8, _startPoxY+21, 3, 3);
+                g.drawOval(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
             }
             for (int i=0; i < 5; ++i)
             {
                 g.setColor(Color.cyan);
-                g.fillOval(_startPosx + 15 + i*5, _startPoxY+26, 3, 3);
+                g.fillOval(_startPosX + 15 + i*5, _startPosY+26, 3, 3);
                 g.setColor(Color.black);
-                g.drawOval(_startPosx + 15 + i*5, _startPoxY+26, 3, 3);
+                g.drawOval(_startPosX + 15 + i*5, _startPosY+26, 3, 3);
             }
             for (int i=0; i < 5; ++i)
             {
                 g.setColor(Color.cyan);
-                g.fillOval(_startPosx + 70 + i*5, _startPoxY+26, 3, 3);
+                g.fillOval(_startPosX + 70 + i*5, _startPosY+26, 3, 3);
                 g.setColor(Color.black);
-                g.drawOval(_startPosx + 70 + i*5, _startPoxY+26, 3, 3);
+                g.drawOval(_startPosX + 70 + i*5, _startPosY+26, 3, 3);
             }
             for (int i = 0; i < 10; ++i)
             {
                 g.setColor(Color.cyan);
-                g.fillOval(_startPosx + 19 + i*8, _startPoxY+31, 3, 3);
+                g.fillOval(_startPosX + 19 + i*8, _startPosY+31, 3, 3);
                 g.setColor(Color.black);
-                g.drawOval(_startPosx + 19 + i*8, _startPoxY+31, 3, 3);
+                g.drawOval(_startPosX + 19 + i*8, _startPosY+31, 3, 3);
             }
         }
     }
diff --git a/src/Drawnings/DrawningPortholesHeart.java b/src/Drawnings/DrawningPortholesHeart.java
new file mode 100644
index 0000000..6b93ee1
--- /dev/null
+++ b/src/Drawnings/DrawningPortholesHeart.java
@@ -0,0 +1,81 @@
+package Drawnings;
+
+import Entities.CountPortholes;
+
+import java.awt.*;
+
+public class DrawningPortholesHeart implements IDrawningPortholes {
+    private CountPortholes _porthole;
+
+    public CountPortholes getCount()
+    {
+        return _porthole;
+    }
+    public void SetCount (int count) {
+        switch (count) {
+            case 10:
+                _porthole = CountPortholes.Ten;
+                break;
+            case 20:
+                _porthole = CountPortholes.Twenty;
+                break;
+            case 30:
+                _porthole = CountPortholes.Thirty;
+                break;
+            default:
+                _porthole = CountPortholes.Ten;
+                break;
+        }
+    }
+
+    public void Draw (Graphics2D g, int _startPosX, int _startPosY) {
+        g.setColor(Color.BLACK);
+        if (_porthole == CountPortholes.Ten) {
+            for (int i = 0; i < 10; ++i)
+            {
+                drawHeart(g, _startPosX + 19 + i*8, _startPosY + 20);
+            }
+        }
+        if (_porthole == CountPortholes.Twenty) {
+            for (int i = 0; i < 10; ++i)
+            {
+                drawHeart(g, _startPosX + 19 + i*8, _startPosY + 20);
+            }
+            for (int i=0; i < 5; ++i)
+            {
+                drawHeart(g, _startPosX + 12 + i*6, _startPosY + 26);
+            }
+            for (int i=0; i < 5; ++i)
+            {
+                drawHeart(g, _startPosX + 70 + i*6, _startPosY + 26);
+            }
+        }
+        if (_porthole == CountPortholes.Thirty){
+            for (int i = 0; i < 10; ++i)
+            {
+                drawHeart(g, _startPosX + 19 + i*8, _startPosY + 20);
+            }
+            for (int i=0; i < 5; ++i)
+            {
+                drawHeart(g, _startPosX + 12 + i*6, _startPosY + 26);
+            }
+            for (int i=0; i < 5; ++i)
+            {
+                drawHeart(g, _startPosX + 70 + i*6, _startPosY + 26);
+            }
+            for (int i = 0; i < 10; ++i)
+            {
+                drawHeart(g, _startPosX + 19 + i*8, _startPosY+32);
+            }
+        }
+    }
+
+    public void drawHeart(Graphics2D g, int _startPosX, int _startPosY){
+        int[] HeartX = {_startPosX+2, _startPosX, _startPosX, _startPosX+1, _startPosX+2, _startPosX+3, _startPosX+5, _startPosX+5};
+        int[] HeartY = {_startPosY+4, _startPosY+2, _startPosY, _startPosY, _startPosY+1, _startPosY, _startPosY, _startPosY+2};
+        g.setColor(Color.cyan);
+        g.fillPolygon(HeartX, HeartY, HeartX.length);
+        g.setColor(Color.black);
+        g.drawPolygon(HeartX, HeartY, HeartX.length);
+    }
+}
\ No newline at end of file
diff --git a/src/Drawnings/DrawningPortholesSquare.java b/src/Drawnings/DrawningPortholesSquare.java
new file mode 100644
index 0000000..23e5563
--- /dev/null
+++ b/src/Drawnings/DrawningPortholesSquare.java
@@ -0,0 +1,97 @@
+package Drawnings;
+
+import Entities.CountPortholes;
+
+import java.awt.*;
+
+public class DrawningPortholesSquare implements IDrawningPortholes {
+    private CountPortholes _porthole;
+
+    public CountPortholes getCount()
+    {
+        return _porthole;
+    }
+    public void SetCount (int count) {
+        switch (count) {
+            case 10:
+                _porthole = CountPortholes.Ten;
+                break;
+            case 20:
+                _porthole = CountPortholes.Twenty;
+                break;
+            case 30:
+                _porthole = CountPortholes.Thirty;
+                break;
+            default:
+                _porthole = CountPortholes.Ten;
+                break;
+        }
+    }
+
+    public void Draw (Graphics2D g, int _startPosX, int _startPosY) {
+        g.setColor(Color.BLACK);
+        if (_porthole == CountPortholes.Ten) {
+            // цикл
+            for (int i = 0; i < 10; ++i)
+            {
+                g.setColor(Color.cyan);
+                g.fillRect(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
+                g.setColor(Color.black);
+                g.drawRect(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
+            }
+        }
+        if (_porthole == CountPortholes.Twenty) {
+            for (int i = 0; i < 10; ++i)
+            {
+                g.setColor(Color.cyan);
+                g.fillRect(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
+                g.setColor(Color.black);
+                g.drawRect(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
+            }
+            for (int i=0; i < 5; ++i)
+            {
+                g.setColor(Color.cyan);
+                g.fillRect(_startPosX + 15 + i*5, _startPosY+26, 3, 3);
+                g.setColor(Color.black);
+                g.drawRect(_startPosX + 15 + i*5, _startPosY+26, 3, 3);
+            }
+            for (int i=0; i < 5; ++i)
+            {
+                g.setColor(Color.cyan);
+                g.fillRect(_startPosX + 70 + i*5, _startPosY+26, 3, 3);
+                g.setColor(Color.black);
+                g.drawRect(_startPosX + 70 + i*5, _startPosY+26, 3, 3);
+            }
+        }
+        if (_porthole == CountPortholes.Thirty){
+            for (int i = 0; i < 10; ++i)
+            {
+                g.setColor(Color.cyan);
+                g.fillRect(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
+                g.setColor(Color.black);
+                g.drawRect(_startPosX + 19 + i*8, _startPosY+21, 3, 3);
+            }
+            for (int i=0; i < 5; ++i)
+            {
+                g.setColor(Color.cyan);
+                g.fillRect(_startPosX + 15 + i*5, _startPosY+26, 3, 3);
+                g.setColor(Color.black);
+                g.drawRect(_startPosX + 15 + i*5, _startPosY+26, 3, 3);
+            }
+            for (int i=0; i < 5; ++i)
+            {
+                g.setColor(Color.cyan);
+                g.fillRect(_startPosX + 70 + i*5, _startPosY+26, 3, 3);
+                g.setColor(Color.black);
+                g.drawRect(_startPosX + 70 + i*5, _startPosY+26, 3, 3);
+            }
+            for (int i = 0; i < 10; ++i)
+            {
+                g.setColor(Color.cyan);
+                g.fillRect(_startPosX + 19 + i*8, _startPosY+31, 3, 3);
+                g.setColor(Color.black);
+                g.drawRect(_startPosX + 19 + i*8, _startPosY+31, 3, 3);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Drawnings/IDrawningPortholes.java b/src/Drawnings/IDrawningPortholes.java
new file mode 100644
index 0000000..6ac3162
--- /dev/null
+++ b/src/Drawnings/IDrawningPortholes.java
@@ -0,0 +1,10 @@
+package Drawnings;
+
+import java.awt.*;
+import Entities.CountPortholes;
+
+public interface IDrawningPortholes {
+    public CountPortholes getCount();
+    public void SetCount (int count);
+    public void Draw (Graphics2D g, int _startPosX, int _startPoxY);
+}
\ No newline at end of file
diff --git a/src/Entities/EntityAirbus.java b/src/Entities/EntityAirbus.java
index 1f4b8a7..0c83f72 100644
--- a/src/Entities/EntityAirbus.java
+++ b/src/Entities/EntityAirbus.java
@@ -6,11 +6,7 @@ public class EntityAirbus {
     private int Speed;
     private float Weight;
     private Color BodyColor;
-    private Color AdditionalColor;
-    private boolean IsCompartment;
-    private boolean IsAdditionalEngine;
-
-    public int Step;
+    public float Step;
 
     public int getSpeed() {
         return Speed;
@@ -21,27 +17,14 @@ public class EntityAirbus {
     public Color getBodyColor() {
         return BodyColor;
     }
-    public Color getAdditionalColor() {
-        return AdditionalColor;
-    }
-    public boolean IsCompartment() {
-        return IsCompartment;
-    }
-    public boolean IsAdditionalEngine() {
-        return IsAdditionalEngine;
-    }
 
 
-    public void Init(int speed, float weight, Color bodyColor, Color additionalColor, boolean isCompartment, boolean isAdditionalEngine)
+    public EntityAirbus(int speed, float weight, Color bodyColor)
     {
+        Weight = weight;
+        Speed = speed;
+        BodyColor = bodyColor;
 
-    Weight = weight;
-    Speed = speed;
-    BodyColor = bodyColor;
-    AdditionalColor = additionalColor;
-    IsCompartment = isCompartment;
-    IsAdditionalEngine = isAdditionalEngine;
-
-    Step = Speed * 100 / (int) Weight;
+        Step = Speed * 100 / (int) Weight;
     }
 }
diff --git a/src/Entities/EntityPlane.java b/src/Entities/EntityPlane.java
new file mode 100644
index 0000000..90f94f5
--- /dev/null
+++ b/src/Entities/EntityPlane.java
@@ -0,0 +1,21 @@
+package Entities;
+
+import javax.swing.text.AttributeSet;
+import java.awt.*;
+
+public class EntityPlane extends EntityAirbus {
+    private Color AdditionalColor;
+    private boolean IsCompartment;
+    private boolean IsAdditionalEngine;
+
+    public EntityPlane(int speed, float weight, Color bodyColor, Color additionalColor, boolean isCompartment, boolean isAdditionalEngine) {
+        super(speed, weight, bodyColor);
+        AdditionalColor = additionalColor;
+        IsCompartment = isCompartment;
+        IsAdditionalEngine = isAdditionalEngine;
+    }
+
+    public Color getAdditionalColor() { return AdditionalColor; }
+    public boolean IsCompartment() { return IsCompartment; }
+    public boolean IsAdditionalEngine() { return IsAdditionalEngine; }
+}
diff --git a/src/FormAirbus.java b/src/FormAirbus.java
index 05d6c5e..78cf068 100644
--- a/src/FormAirbus.java
+++ b/src/FormAirbus.java
@@ -7,12 +7,23 @@ import MovementStrategy.*;
 
 public class FormAirbus extends JFrame {
 
-    private DrawingAirbus _drawningAirbus;
-    private Canvas canvas = new Canvas();
+    private int width;
+    private int height;
+    private DrawningAirbus _drawningAirbus;
+    private AbstractStrategy _abstractStrategy;
+    private Canvas canvas;
 
-    JLabel labelCount = new JLabel("Введите число иллюминаторов:");
-    private JTextField fieldCount = new JTextField();
-    private JButton buttonCreate;
+    // выбор кол-ва иллюминаторов
+    JLabel labelCount;
+    private JTextField fieldCount;
+
+    // выбор стратегии
+    JLabel labelStrategy;
+    JComboBox comboBoxStrategy;
+    JButton buttonStrategy;
+
+    private JButton buttonCreateAirbus;
+    private JButton buttonCreatePlane;
     private JButton buttonUp;
     private JButton buttonDown;
     private JButton buttonRight;
@@ -26,43 +37,67 @@ public class FormAirbus extends JFrame {
 
     private void InitializeComponent()
     {
-        buttonCreate = new JButton("Создать самолёт");
+        canvas = new Canvas();
+
+        labelCount = new JLabel("Введите число иллюминаторов:");
+        fieldCount = new JTextField();
+
+        labelStrategy = new JLabel("Шаг стратегии:");
+        comboBoxStrategy = new JComboBox(new Integer[] {0, 1});
+        buttonStrategy = new JButton("Выбрать стратегию");
+        buttonStrategy.setMargin(new Insets(0, 0, 0, 0));
+
+        buttonCreateAirbus = new JButton("Создать аэробус");
+        buttonCreateAirbus.setMargin(new Insets(0, 0, 0, 0));
+
+        buttonCreatePlane = new JButton("Создать самолёт");
+        buttonCreatePlane.setMargin(new Insets(0, 0, 0, 0));
 
         buttonUp = new JButton();
         buttonUp.setName("up");
         buttonUp.setIcon(new ImageIcon("images\\KeyUp.png"));
-        buttonUp.setSize(48, 44);
 
         buttonRight = new JButton();
         buttonRight.setName("right");
         buttonRight.setIcon(new ImageIcon("images\\KeyRight.png"));
-        buttonRight.setSize(48, 44);
 
         buttonLeft = new JButton();
-
         buttonLeft.setName("left");
         buttonLeft.setIcon(new ImageIcon("images\\KeyLeft.png"));
-        buttonLeft.setSize(48, 44);
 
         buttonDown = new JButton();
         buttonDown.setName("down");
         buttonDown.setIcon(new ImageIcon("images\\KeyDown.png"));
-        buttonDown.setSize(48, 44);
 
         setSize(800,500);
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         setLayout(null);
 
-        buttonCreate.setBounds(12, 355, 170, 44);
+        buttonCreateAirbus.setBounds(12, 355, 146, 33);
+        buttonCreatePlane.setBounds(182, 355, 146, 33);
+
+        labelCount.setBounds(42, 405, 240, 20);
+        fieldCount.setBounds(240, 407, 48, 20);
+
+        labelStrategy.setBounds(630, 20, 146, 33);
+        comboBoxStrategy.setBounds(630, 50, 146, 20);
+        buttonStrategy.setBounds(630, 80, 146, 33);
+
         buttonUp.setBounds(679, 313, 48, 44);
         buttonRight.setBounds( 728, 358, 48, 44);
         buttonLeft.setBounds(630, 358, 48, 44);
         buttonDown.setBounds( 679, 358, 48, 44);
         labelCount.setBounds(12, 405, 240, 20);
         fieldCount.setBounds(210, 407, 48, 20);
-        canvas.setBounds(0,0,800, 460);
+        canvas.setBounds(0,0,790, 460);
 
-        add(buttonCreate);
+        add(buttonCreateAirbus);
+        add(buttonCreatePlane);
+        add(labelCount);
+        add(fieldCount);
+        add(labelStrategy);
+        add(comboBoxStrategy);
+        add(buttonStrategy);
         add(buttonUp);
         add(buttonRight);
         add(buttonDown);
@@ -71,14 +106,18 @@ public class FormAirbus extends JFrame {
         add(fieldCount);
         add(canvas);
 
-        buttonCreate.addActionListener(buttonCreateListener);
+        // логика формы
+        buttonCreateAirbus.addActionListener(buttonCreateAirbusListener);
+        buttonCreatePlane.addActionListener(buttonCreatePlaneListener);
+        buttonStrategy.addActionListener(buttonStrategyListener);
         buttonUp.addActionListener(buttonsMoveListener);
         buttonRight.addActionListener(buttonsMoveListener);
         buttonDown.addActionListener(buttonsMoveListener);
         buttonLeft.addActionListener(buttonsMoveListener);
     }
 
-    ActionListener buttonCreateListener = new ActionListener() {
+    ActionListener buttonCreateAirbusListener = new ActionListener() {
+        @Override
         public void actionPerformed(ActionEvent e) {
             int countPortholes;
             try
@@ -96,15 +135,86 @@ public class FormAirbus extends JFrame {
             }
 
             Random rand = new Random();
-            _drawningAirbus = new DrawingAirbus();
-            _drawningAirbus.Init(rand.nextInt(200) + 100, rand.nextInt(2000) + 1000,
+            _drawningAirbus = new DrawningAirbus(rand.nextInt(200) + 100, rand.nextInt(2000) + 1000,
                     new Color(rand.nextInt(256),rand.nextInt(256),rand.nextInt(256)),
-                    new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)),
-                    rand.nextBoolean(), rand.nextBoolean(),
                     countPortholes,
                     canvas.getWidth(), canvas.getHeight());
 
             _drawningAirbus.SetPosition(rand.nextInt(100) + 10, rand.nextInt(100) + 10);
+            comboBoxStrategy.setEnabled(true);
+            canvas.repaint();
+        }
+    };
+
+    ActionListener buttonCreatePlaneListener = new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            int countPortholes;
+            try
+            {
+                countPortholes = Integer.parseInt(fieldCount.getText());
+            }
+            catch (Exception ex)
+            {
+                countPortholes = 0;
+            }
+            if (countPortholes != 10 && countPortholes != 20 && countPortholes != 30)
+            {
+                JOptionPane.showMessageDialog(null, "Число должно быть равно 10, 20 или 30.\nКол-во иллюминаторов приравнено к 10");
+                countPortholes = 10;
+            }
+
+            Random rand = new Random();
+            _drawningAirbus = new DrawningPlane(rand.nextInt(200) + 100, rand.nextInt(2000) + 1000,
+                    new Color(rand.nextInt(256),rand.nextInt(256),rand.nextInt(256)),
+                    countPortholes,
+                    new Color(rand.nextInt(256), rand.nextInt(256), rand.nextInt(256)),
+                    rand.nextBoolean(), rand.nextBoolean(),
+                    canvas.getWidth(), canvas.getHeight());
+
+            _drawningAirbus.SetPosition(rand.nextInt(100) + 10, rand.nextInt(100) + 10);
+            comboBoxStrategy.setEnabled(true);
+            canvas.repaint();
+        }
+    };
+
+    ActionListener buttonStrategyListener = new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            if (_drawningAirbus == null)
+            {
+                return;
+            }
+            if (comboBoxStrategy.isEnabled()) {
+
+                switch (comboBoxStrategy.getSelectedIndex()) {
+                    case 0:
+                        _abstractStrategy = new MoveToCenter();
+                        break;
+                    case 1:
+                        _abstractStrategy = new MoveToBorder();
+                        break;
+                    default:
+                        _abstractStrategy = null;
+                        break;
+                }
+                ;
+                if (_abstractStrategy == null) {
+                    return;
+                }
+                _abstractStrategy.SetData(new DrawningObjectAirbus(_drawningAirbus), canvas.getWidth(), canvas.getHeight());
+                comboBoxStrategy.setEnabled(false);
+            }
+            if (_abstractStrategy == null)
+            {
+                return;
+            }
+            _abstractStrategy.MakeStep();
+            if (_abstractStrategy.GetStatus() == Status.Finish)
+            {
+                comboBoxStrategy.setEnabled(true);
+                _abstractStrategy = null;
+            }
             canvas.repaint();
         }
     };
@@ -136,8 +246,7 @@ public class FormAirbus extends JFrame {
     };
 
     class Canvas extends JComponent{
-        public Canvas(){
-        }
+        public Canvas() {}
         public void paintComponent (Graphics g){
             if (_drawningAirbus == null){
                 return;
diff --git a/src/Main.java b/src/Main.java
index 03af442..ba66689 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,4 +1,5 @@
 public class Main {
+
     public static void main(String[] args) {
         new FormAirbus();
     }
diff --git a/src/MovementStrategy/AbstractStrategy.java b/src/MovementStrategy/AbstractStrategy.java
new file mode 100644
index 0000000..742c4df
--- /dev/null
+++ b/src/MovementStrategy/AbstractStrategy.java
@@ -0,0 +1,76 @@
+package MovementStrategy;
+
+public abstract class AbstractStrategy {
+    private IMoveableObject _moveableObject;
+    private Status _state = Status.NotInit;
+    protected int FieldWidth;
+    protected int FieldHeight;
+    public Status GetStatus() { return _state; }
+
+    // Изменить статус, установить поля
+    public void SetData(IMoveableObject moveableObject, int width, int height)
+    {
+        if (moveableObject == null)
+        {
+            _state = Status.NotInit;
+            return;
+        }
+        _state = Status.InProgress;
+        _moveableObject = moveableObject;
+        FieldWidth = width;
+        FieldHeight = height;
+    }
+
+    // сделать шаг
+    public void MakeStep()
+    {
+        if (_state != Status.InProgress)
+        {
+            return;
+        }
+        if (IsTargetDestination())
+        {
+            _state = Status.Finish;
+            return;
+        }
+        MoveToTarget();
+    }
+
+    // перемещения
+    protected boolean MoveLeft() { return MoveTo(Direction.Left); }
+    protected boolean MoveRight() { return MoveTo(Direction.Right); }
+    protected boolean MoveUp() { return MoveTo(Direction.Up); }
+    protected boolean MoveDown() { return MoveTo(Direction.Down); }
+
+    // параметры
+    protected ObjectParameters GetObjectParameters() { return _moveableObject.GetObjectPosition(); }
+    // шаг
+    protected int GetStep()
+    {
+        if (_state != Status.InProgress)
+        {
+            return 0;
+        }
+        return _moveableObject.GetStep();
+    }
+    // перемещение
+    protected abstract void MoveToTarget();
+
+    // достигнута ли цель
+    protected abstract boolean IsTargetDestination();
+
+    // попытка перемещения по направлению
+    private boolean MoveTo(Direction directionType)
+    {
+        if (_state != Status.InProgress)
+        {
+            return false;
+        }
+        if (_moveableObject.CheckCanMove(directionType))
+        {
+            _moveableObject.MoveObject(directionType);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/MovementStrategy/DrawningObjectAirbus.java b/src/MovementStrategy/DrawningObjectAirbus.java
new file mode 100644
index 0000000..47a9c6f
--- /dev/null
+++ b/src/MovementStrategy/DrawningObjectAirbus.java
@@ -0,0 +1,24 @@
+package MovementStrategy;
+import Drawnings.*;
+
+public class DrawningObjectAirbus implements IMoveableObject {
+    private DrawningAirbus _drawningAirbus = null;
+
+    public DrawningObjectAirbus(DrawningAirbus drawningAirbus)
+    {
+        _drawningAirbus = drawningAirbus;
+    }
+
+    public ObjectParameters GetObjectPosition()
+    {
+        if (_drawningAirbus == null || _drawningAirbus.entityAirbus == null)
+        {
+            return null;
+        }
+        return new ObjectParameters(_drawningAirbus.GetPosX(), _drawningAirbus.GetPosY(), _drawningAirbus.GetWidth(), _drawningAirbus.GetHeight());
+    }
+
+    public int GetStep() { return (int)_drawningAirbus.entityAirbus.Step; }
+    public boolean CheckCanMove(Direction direction) { return _drawningAirbus.CanMove(direction); }
+    public void MoveObject(Direction direction) { _drawningAirbus.MoveTransport(direction); }
+}
diff --git a/src/MovementStrategy/IMoveableObject.java b/src/MovementStrategy/IMoveableObject.java
new file mode 100644
index 0000000..ffd427e
--- /dev/null
+++ b/src/MovementStrategy/IMoveableObject.java
@@ -0,0 +1,8 @@
+package MovementStrategy;
+
+public interface IMoveableObject {
+    ObjectParameters GetObjectPosition();
+    int GetStep();
+    boolean CheckCanMove(Direction direction);
+    void MoveObject(Direction direction);
+}
diff --git a/src/MovementStrategy/MoveToBorder.java b/src/MovementStrategy/MoveToBorder.java
new file mode 100644
index 0000000..08e2b44
--- /dev/null
+++ b/src/MovementStrategy/MoveToBorder.java
@@ -0,0 +1,53 @@
+package MovementStrategy;
+
+public class MoveToBorder extends AbstractStrategy {
+    @Override
+    protected boolean IsTargetDestination()
+    {
+        var objParams = GetObjectParameters();
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.RightBorder() <= FieldWidth &&
+                objParams.RightBorder() + GetStep() >= FieldWidth &&
+                objParams.DownBorder() <= FieldHeight &&
+                objParams.DownBorder() + GetStep() >= FieldHeight;
+    }
+
+    // движение к цели
+    @Override
+    protected void MoveToTarget()
+    {
+        var objParams = GetObjectParameters();
+        if (objParams == null)
+        {
+            return;
+        }
+        var diffX = FieldWidth;
+        if (Math.abs(diffX) > GetStep())
+        {
+            if (diffX < 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+
+        var diffY = FieldHeight;
+        if (Math.abs(diffY) > GetStep())
+        {
+            if (diffY < 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}
diff --git a/src/MovementStrategy/MoveToCenter.java b/src/MovementStrategy/MoveToCenter.java
new file mode 100644
index 0000000..1b278cb
--- /dev/null
+++ b/src/MovementStrategy/MoveToCenter.java
@@ -0,0 +1,53 @@
+package MovementStrategy;
+
+public class MoveToCenter extends AbstractStrategy {
+    @Override
+    protected boolean IsTargetDestination()
+    {
+        var objParams = GetObjectParameters();
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.ObjectMiddleHorizontal() <= FieldWidth / 2 &&
+                objParams.ObjectMiddleHorizontal() + GetStep() >= FieldWidth / 2 &&
+                objParams.ObjectMiddleVertical() <= FieldHeight / 2 &&
+                objParams.ObjectMiddleVertical() + GetStep() >= FieldHeight / 2;
+    }
+
+    // движение к цели
+    @Override
+    protected void MoveToTarget()
+    {
+        var objParams = GetObjectParameters();
+        if (objParams == null)
+        {
+            return;
+        }
+        var diffX = objParams.ObjectMiddleHorizontal() - FieldWidth / 2;
+        if (Math.abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+
+        var diffY = objParams.ObjectMiddleVertical() - FieldHeight / 2;
+        if (Math.abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}
diff --git a/src/MovementStrategy/ObjectParameters.java b/src/MovementStrategy/ObjectParameters.java
new file mode 100644
index 0000000..a741f5a
--- /dev/null
+++ b/src/MovementStrategy/ObjectParameters.java
@@ -0,0 +1,25 @@
+package MovementStrategy;
+
+public class ObjectParameters {
+    private int _x;
+    private int _y;
+    private int _width;
+    private int _height;
+
+    public int LeftBorder() { return _x; }
+    public int TopBorder() { return _y; }
+    public int RightBorder() { return _x + _width; }
+    public int DownBorder() { return _y + _height; }
+
+
+    public int ObjectMiddleHorizontal () { return _x + _width / 2; }
+    public int ObjectMiddleVertical () { return _y + _height / 2; }
+
+    public ObjectParameters(int x, int y, int width, int height)
+    {
+        _x = x;
+        _y = y;
+        _width = width;
+        _height = height;
+    }
+}
diff --git a/src/MovementStrategy/Status.java b/src/MovementStrategy/Status.java
new file mode 100644
index 0000000..586b538
--- /dev/null
+++ b/src/MovementStrategy/Status.java
@@ -0,0 +1,7 @@
+package MovementStrategy;
+
+public enum Status {
+    NotInit,
+    InProgress,
+    Finish
+}