From da743af9babd7698e00766a1dce7656b3575f1fb Mon Sep 17 00:00:00 2001 From: allllen4a Date: Tue, 5 Dec 2023 13:19:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=82=D0=BE=D1=80=D0=B0=D1=8F=20=D0=BB?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DoubleDeckerBus/DrawningObjects/DrawningBus.java | 5 ----- DoubleDeckerBus/DrawningObjects/DrawningDoor.java | 2 -- DoubleDeckerBus/DrawningObjects/DrawningDoorOval.java | 1 - DoubleDeckerBus/DrawningObjects/DrawningDoorTriangle.java | 1 - DoubleDeckerBus/FormDoubleDeckerBus.java | 1 - 5 files changed, 10 deletions(-) diff --git a/DoubleDeckerBus/DrawningObjects/DrawningBus.java b/DoubleDeckerBus/DrawningObjects/DrawningBus.java index 0e13a84..3ace72b 100644 --- a/DoubleDeckerBus/DrawningObjects/DrawningBus.java +++ b/DoubleDeckerBus/DrawningObjects/DrawningBus.java @@ -2,7 +2,6 @@ package DoubleDeckerBus.DrawningObjects; import DoubleDeckerBus.DirectionType; import DoubleDeckerBus.Entities.EntityBus; -import java.util.Scanner; import javax.swing.*; import java.awt.*; import java.util.Random; @@ -16,8 +15,6 @@ public class DrawningBus { protected int _startPosY; protected int _busWidth = 160; protected int _busHeight = 100; - - private IDraw DrawningDoor; public EntityBus EntityBus() { @@ -28,7 +25,6 @@ public class DrawningBus { if (width <= _busWidth || height <= _busHeight) { return; } - _startPosX = 0; _startPosY = 0; busPanel.setSize(width, height); @@ -76,7 +72,6 @@ public class DrawningBus { } DrawningDoor.ChangeDoorsNumber(random.nextInt(2, 6)); } - public void SetPosition(int x, int y){ if (x < 0 || x + _busWidth > _pictureWidth) { diff --git a/DoubleDeckerBus/DrawningObjects/DrawningDoor.java b/DoubleDeckerBus/DrawningObjects/DrawningDoor.java index 6a572ec..735c35f 100644 --- a/DoubleDeckerBus/DrawningObjects/DrawningDoor.java +++ b/DoubleDeckerBus/DrawningObjects/DrawningDoor.java @@ -22,7 +22,6 @@ public class DrawningDoor implements IDraw { blackColor = Color.BLACK; BusPanel = busPanel; } - public void ChangeX(int x){ CurX = x; } @@ -41,7 +40,6 @@ public class DrawningDoor implements IDraw { DoorNumberType = DoorNumberType.Five; } } - public DoorNumberType DoorNumberType() { return DoorNumberType; } diff --git a/DoubleDeckerBus/DrawningObjects/DrawningDoorOval.java b/DoubleDeckerBus/DrawningObjects/DrawningDoorOval.java index 6b52c78..6aaa81d 100644 --- a/DoubleDeckerBus/DrawningObjects/DrawningDoorOval.java +++ b/DoubleDeckerBus/DrawningObjects/DrawningDoorOval.java @@ -50,7 +50,6 @@ public class DrawningDoorOval implements IDraw { Graphics2D g2d = (Graphics2D)BusPanel.getGraphics(); g2d.fillOval(x, y, 10, 20); } - public void DrawDoors() { Graphics2D g2d = (Graphics2D) BusPanel.getGraphics(); g2d.setColor(blackColor); diff --git a/DoubleDeckerBus/DrawningObjects/DrawningDoorTriangle.java b/DoubleDeckerBus/DrawningObjects/DrawningDoorTriangle.java index 656d921..d26eb2e 100644 --- a/DoubleDeckerBus/DrawningObjects/DrawningDoorTriangle.java +++ b/DoubleDeckerBus/DrawningObjects/DrawningDoorTriangle.java @@ -13,7 +13,6 @@ public class DrawningDoorTriangle implements IDraw { private int Height; public int CurX; public int CurY; - public DrawningDoorTriangle(int width, int height, int curX, int curY, JPanel busPanel) { Width = width; Height = height; diff --git a/DoubleDeckerBus/FormDoubleDeckerBus.java b/DoubleDeckerBus/FormDoubleDeckerBus.java index 7404808..f087777 100644 --- a/DoubleDeckerBus/FormDoubleDeckerBus.java +++ b/DoubleDeckerBus/FormDoubleDeckerBus.java @@ -13,7 +13,6 @@ import java.io.IOException; import java.util.Random; import javax.imageio.ImageIO; import javax.swing.*; - public class FormDoubleDeckerBus { static DrawningBus DrawningBus; static AbstractStrategy _abstractStrategy;