From 9c5273f2af2682e0db0c1a66ce8e4aaf5262765c Mon Sep 17 00:00:00 2001 From: Oleh Date: Thu, 16 Nov 2023 22:02:19 +0200 Subject: [PATCH] fixed hometask --- src/main/java/core/basesyntax/Application.java | 4 ++-- src/main/java/core/basesyntax/Ball.java | 5 +++++ src/main/java/core/basesyntax/Lottery.java | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/core/basesyntax/Application.java b/src/main/java/core/basesyntax/Application.java index 67a52bb79..b9242a550 100644 --- a/src/main/java/core/basesyntax/Application.java +++ b/src/main/java/core/basesyntax/Application.java @@ -2,8 +2,8 @@ public class Application { public static void main(String[] args) { - Lottery[] lotteries = {new Lottery(), new Lottery(), new Lottery()}; - for (Lottery lottery : lotteries) { + Lottery lottery = new Lottery(); + for (int i = 0; i < 3; i++) { System.out.println(lottery.getRandomBall()); } } diff --git a/src/main/java/core/basesyntax/Ball.java b/src/main/java/core/basesyntax/Ball.java index d8b82e978..221461ace 100644 --- a/src/main/java/core/basesyntax/Ball.java +++ b/src/main/java/core/basesyntax/Ball.java @@ -1,6 +1,7 @@ package core.basesyntax; public class Ball { + private static final int MAX_NUMBER = 100; private String color; private int number; @@ -9,6 +10,10 @@ public Ball(String color, int number) { this.number = number; } + public static int getMaxNumber() { + return MAX_NUMBER; + } + @Override public String toString() { return "{Color: " + color + ", number: " + number + "}"; diff --git a/src/main/java/core/basesyntax/Lottery.java b/src/main/java/core/basesyntax/Lottery.java index 8c02e957a..f4a14bb61 100644 --- a/src/main/java/core/basesyntax/Lottery.java +++ b/src/main/java/core/basesyntax/Lottery.java @@ -4,7 +4,10 @@ public class Lottery { public Ball getRandomBall() { - int randomNumber = new Random().nextInt(100); - return new Ball(new ColorSupplier().getRandomColor(), randomNumber); + int maxNumber = Ball.getMaxNumber(); + Random random = new Random(); + ColorSupplier colorSupplier = new ColorSupplier(); + int randomNumber = random.nextInt(maxNumber); + return new Ball(colorSupplier.getRandomColor(), randomNumber); } }