From 588661f02756031619565719ef925e00611293d9 Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Tue, 1 Nov 2022 13:45:38 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=20=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B8=20=D0=BF=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=B0=20=D0=BA=D0=BE=D0=BB=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D1=81=D1=82=D0=B2=D0=B0=20=D0=BA=D0=B0=D1=82=D0=BA?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/DrawingArmoredCar.java | 8 ++++++-- src/main/java/DrawingCaterpillar.java | 7 +++---- src/main/java/DrawingCrossCaterpillar.java | 3 +-- src/main/java/DrawingDoubleCaterpillar.java | 3 +-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/DrawingArmoredCar.java b/src/main/java/DrawingArmoredCar.java index 0bf1818..70b39aa 100644 --- a/src/main/java/DrawingArmoredCar.java +++ b/src/main/java/DrawingArmoredCar.java @@ -25,10 +25,14 @@ public class DrawingArmoredCar { public DrawingArmoredCar(int speed, float weight, Color bodyColor) { this.armoredCar = new EntityArmoredCar(speed, weight, bodyColor); + IDrawingCaterpillar[] realisations = new IDrawingCaterpillar[]{ + new DrawingCaterpillar(bodyColor), + new DrawingCrossCaterpillar(bodyColor), + new DrawingDoubleCaterpillar(bodyColor)}; Random r = new Random(); - IDrawingCaterpillar[] realisations = new IDrawingCaterpillar[]{new DrawingCaterpillar(r.nextInt(4, 7), bodyColor), - new DrawingCrossCaterpillar(r.nextInt(4, 7), bodyColor), new DrawingDoubleCaterpillar(r.nextInt(4, 7), bodyColor)}; + int num = r.nextInt(4, 7); this.drawingCaterpillar = realisations[r.nextInt(3)]; + drawingCaterpillar.setNumRinks(num); } protected DrawingArmoredCar(int speed, float weight, Color bodyColor, int carWidth, int carHeight) { diff --git a/src/main/java/DrawingCaterpillar.java b/src/main/java/DrawingCaterpillar.java index 96946b9..6cf873a 100644 --- a/src/main/java/DrawingCaterpillar.java +++ b/src/main/java/DrawingCaterpillar.java @@ -4,11 +4,10 @@ public class DrawingCaterpillar implements IDrawingCaterpillar { private NumRinks numRinks = NumRinks.Four; private Color color; - public DrawingCaterpillar(int n, Color color) { - setNumRinks(n); + public DrawingCaterpillar(Color color) { this.color = color; } - + @Override public void setNumRinks(int n) { switch (n) { case 4 -> numRinks = NumRinks.Four; @@ -22,7 +21,7 @@ public class DrawingCaterpillar implements IDrawingCaterpillar { } } } - + @Override public void DrawCaterpillar(Graphics2D g2d, int startPosX, int startPosY) { color = color != null ? color : Color.YELLOW; diff --git a/src/main/java/DrawingCrossCaterpillar.java b/src/main/java/DrawingCrossCaterpillar.java index 4b5efa4..98d7238 100644 --- a/src/main/java/DrawingCrossCaterpillar.java +++ b/src/main/java/DrawingCrossCaterpillar.java @@ -4,8 +4,7 @@ public class DrawingCrossCaterpillar implements IDrawingCaterpillar{ private NumRinks numRinks = NumRinks.Four; private Color color; - public DrawingCrossCaterpillar(int n, Color color) { - setNumRinks(n); + public DrawingCrossCaterpillar(Color color) { this.color = color; } diff --git a/src/main/java/DrawingDoubleCaterpillar.java b/src/main/java/DrawingDoubleCaterpillar.java index e5966a3..ed7da51 100644 --- a/src/main/java/DrawingDoubleCaterpillar.java +++ b/src/main/java/DrawingDoubleCaterpillar.java @@ -4,8 +4,7 @@ public class DrawingDoubleCaterpillar implements IDrawingCaterpillar{ private NumRinks numRinks = NumRinks.Four; private Color color; - public DrawingDoubleCaterpillar(int n, Color color) { - setNumRinks(n); + public DrawingDoubleCaterpillar(Color color) { this.color = color; }