From aa1469a83d765cb507202c812d9be7d8dd6a3478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F?= <Илья@WIN-RANNDDD> Date: Tue, 10 Oct 2023 15:48:46 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/projectMonorail/DirectionType.java | 1 + src/projectMonorail/DrawingMonorail.java | 4 ++-- src/projectMonorail/DrawingWheels.java | 1 + src/projectMonorail/EntityMonorail.java | 1 + src/projectMonorail/FrameMonorail.java | 1 - src/projectMonorail/Main.java | 2 +- src/projectMonorail/WheelNumber.java | 1 + 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/projectMonorail/DirectionType.java b/src/projectMonorail/DirectionType.java index a44e86f..1fa2045 100644 --- a/src/projectMonorail/DirectionType.java +++ b/src/projectMonorail/DirectionType.java @@ -1,4 +1,5 @@ package projectMonorail; + public enum DirectionType { Up, diff --git a/src/projectMonorail/DrawingMonorail.java b/src/projectMonorail/DrawingMonorail.java index f7cdcb9..d0ab47f 100644 --- a/src/projectMonorail/DrawingMonorail.java +++ b/src/projectMonorail/DrawingMonorail.java @@ -6,8 +6,6 @@ public class DrawingMonorail { private EntityMonorail entityMonorail; - private DrawingWheels drawingWheels; - public EntityMonorail getEntityMonorail() { return entityMonorail; } @@ -16,6 +14,8 @@ public class DrawingMonorail { this.entityMonorail = entityMonorail; } + private DrawingWheels drawingWheels; + private int pictureWidth; private int pictureHeight; diff --git a/src/projectMonorail/DrawingWheels.java b/src/projectMonorail/DrawingWheels.java index 5cb565c..25986c3 100644 --- a/src/projectMonorail/DrawingWheels.java +++ b/src/projectMonorail/DrawingWheels.java @@ -3,6 +3,7 @@ package projectMonorail; import java.awt.*; public class DrawingWheels { + private WheelNumber wheelNumber; public void setWheelNumber(int number) { diff --git a/src/projectMonorail/EntityMonorail.java b/src/projectMonorail/EntityMonorail.java index bc38526..d25a35d 100644 --- a/src/projectMonorail/EntityMonorail.java +++ b/src/projectMonorail/EntityMonorail.java @@ -49,6 +49,7 @@ public class EntityMonorail { public boolean getMagneticRail() { return magneticRail; } + private void setMagneticRail(boolean magneticRail) { this.magneticRail = magneticRail; } diff --git a/src/projectMonorail/FrameMonorail.java b/src/projectMonorail/FrameMonorail.java index 41b6376..23ba94e 100644 --- a/src/projectMonorail/FrameMonorail.java +++ b/src/projectMonorail/FrameMonorail.java @@ -17,5 +17,4 @@ public class FrameMonorail extends JFrame { setLocationRelativeTo(null); setVisible(true); } - } diff --git a/src/projectMonorail/Main.java b/src/projectMonorail/Main.java index ea1b9a7..f23be88 100644 --- a/src/projectMonorail/Main.java +++ b/src/projectMonorail/Main.java @@ -2,7 +2,7 @@ package projectMonorail; public class Main { public static void main(String[] args) { - FrameMonorail frame = new FrameMonorail(); + FrameMonorail frameMonorail = new FrameMonorail(); } } diff --git a/src/projectMonorail/WheelNumber.java b/src/projectMonorail/WheelNumber.java index eb594ad..f6111f6 100644 --- a/src/projectMonorail/WheelNumber.java +++ b/src/projectMonorail/WheelNumber.java @@ -1,4 +1,5 @@ package projectMonorail; + public enum WheelNumber { Two,