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; }