From 5819e1be93d18213b7c400221469029e8412bc02 Mon Sep 17 00:00:00 2001 From: YarikNarozhnyi Date: Mon, 18 Nov 2024 20:01:26 +0000 Subject: [PATCH 1/5] Initial commit From f926c1e8b8593cce9d48c4a05f3b354f3321e039 Mon Sep 17 00:00:00 2001 From: YarikNarozhnyi Date: Mon, 18 Nov 2024 20:49:21 +0000 Subject: [PATCH 2/5] 1 --- src/main/java/core/basesyntax/Application.java | 8 +++++++- src/main/java/core/basesyntax/Ball.java | 16 ++++++++++++++++ src/main/java/core/basesyntax/Color.java | 9 +++++++++ src/main/java/core/basesyntax/ColorSupplier.java | 6 +++++- src/main/java/core/basesyntax/Lottery.java | 11 +++++++++++ 5 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 src/main/java/core/basesyntax/Ball.java create mode 100644 src/main/java/core/basesyntax/Color.java create mode 100644 src/main/java/core/basesyntax/Lottery.java diff --git a/src/main/java/core/basesyntax/Application.java b/src/main/java/core/basesyntax/Application.java index 42ed4ef86..174982fbd 100644 --- a/src/main/java/core/basesyntax/Application.java +++ b/src/main/java/core/basesyntax/Application.java @@ -2,6 +2,12 @@ public class Application { public static void main(String[] args) { - // create three balls using class Lottery and print information about them in console + Lottery lottery = new Lottery(); + Ball ball1 = lottery.getRandomBall(); + Ball ball2 = lottery.getRandomBall(); + Ball ball3 = lottery.getRandomBall(); + System.out.println(ball1); + System.out.println(ball2); + System.out.println(ball3); } } diff --git a/src/main/java/core/basesyntax/Ball.java b/src/main/java/core/basesyntax/Ball.java new file mode 100644 index 000000000..70f99fc72 --- /dev/null +++ b/src/main/java/core/basesyntax/Ball.java @@ -0,0 +1,16 @@ +package core.basesyntax; + +public class Ball { + String color; + int number; + +public Ball(String color, int number) { + this.color = color; + this.number = number; +} + + @Override + public String toString() { + System.out.println("Color :" + color + ", number :" + number); + } +} \ No newline at end of file diff --git a/src/main/java/core/basesyntax/Color.java b/src/main/java/core/basesyntax/Color.java new file mode 100644 index 000000000..82c4cdca9 --- /dev/null +++ b/src/main/java/core/basesyntax/Color.java @@ -0,0 +1,9 @@ +package core.basesyntax; + +public enum Color { + RED, + WHITE, + BROWN, + DARK, + GREY +} diff --git a/src/main/java/core/basesyntax/ColorSupplier.java b/src/main/java/core/basesyntax/ColorSupplier.java index 25e8b23b1..bed244da0 100644 --- a/src/main/java/core/basesyntax/ColorSupplier.java +++ b/src/main/java/core/basesyntax/ColorSupplier.java @@ -1,7 +1,11 @@ package core.basesyntax; +import java.util.Random; + public class ColorSupplier { public String getRandomColor() { - return null; + int index = new Random().nextInt(Color.values().length); + String randomColor = Color.values()[index].toString(); + return randomColor; } } diff --git a/src/main/java/core/basesyntax/Lottery.java b/src/main/java/core/basesyntax/Lottery.java new file mode 100644 index 000000000..47e88ec87 --- /dev/null +++ b/src/main/java/core/basesyntax/Lottery.java @@ -0,0 +1,11 @@ +package core.basesyntax; + +import java.util.Random; + +public class Lottery { + public Ball getRandomBall() { + String rmdclr = new ColorSupplier().getRandomColor(); + int randomIndex = new Random().nextInt(101); + return new Ball(rmdclr, randomIndex); + } +} From 872a74229eae4b09e0863f5bee106e42f4d18e2b Mon Sep 17 00:00:00 2001 From: YarikNarozhnyi Date: Mon, 18 Nov 2024 20:56:28 +0000 Subject: [PATCH 3/5] 2 --- src/main/java/core/basesyntax/Ball.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/core/basesyntax/Ball.java b/src/main/java/core/basesyntax/Ball.java index 70f99fc72..dd09f8e75 100644 --- a/src/main/java/core/basesyntax/Ball.java +++ b/src/main/java/core/basesyntax/Ball.java @@ -8,9 +8,8 @@ public Ball(String color, int number) { this.color = color; this.number = number; } - @Override public String toString() { System.out.println("Color :" + color + ", number :" + number); } -} \ No newline at end of file +} From 10e7294a22540a8ee5ba7366bf0a8336fc8ce75a Mon Sep 17 00:00:00 2001 From: YarikNarozhnyi Date: Mon, 18 Nov 2024 21:03:32 +0000 Subject: [PATCH 4/5] 3 --- src/main/java/core/basesyntax/Ball.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/core/basesyntax/Ball.java b/src/main/java/core/basesyntax/Ball.java index dd09f8e75..6eb5101b6 100644 --- a/src/main/java/core/basesyntax/Ball.java +++ b/src/main/java/core/basesyntax/Ball.java @@ -10,6 +10,6 @@ public Ball(String color, int number) { } @Override public String toString() { - System.out.println("Color :" + color + ", number :" + number); + return "Color :" + color + ", number :" + number; } } From d66d4b29150810c1eaa5cfa53a784c4d18497256 Mon Sep 17 00:00:00 2001 From: YarikNarozhnyi Date: Mon, 18 Nov 2024 21:13:42 +0000 Subject: [PATCH 5/5] final --- src/main/java/core/basesyntax/Ball.java | 15 ++++++++------- src/main/java/core/basesyntax/Lottery.java | 8 ++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/core/basesyntax/Ball.java b/src/main/java/core/basesyntax/Ball.java index 6eb5101b6..19eb5b005 100644 --- a/src/main/java/core/basesyntax/Ball.java +++ b/src/main/java/core/basesyntax/Ball.java @@ -1,15 +1,16 @@ package core.basesyntax; public class Ball { - String color; - int number; + private String color; + private int number; + + public Ball(String color, int number) { + this.color = color; + this.number = number; + } -public Ball(String color, int number) { - this.color = color; - this.number = number; -} @Override public String toString() { - return "Color :" + color + ", number :" + number; + return "Color: " + color + ", number: " + number; } } diff --git a/src/main/java/core/basesyntax/Lottery.java b/src/main/java/core/basesyntax/Lottery.java index 47e88ec87..008b7f677 100644 --- a/src/main/java/core/basesyntax/Lottery.java +++ b/src/main/java/core/basesyntax/Lottery.java @@ -4,8 +4,8 @@ public class Lottery { public Ball getRandomBall() { - String rmdclr = new ColorSupplier().getRandomColor(); - int randomIndex = new Random().nextInt(101); - return new Ball(rmdclr, randomIndex); - } + String rmdclr = new ColorSupplier().getRandomColor(); + int randomIndex = new Random().nextInt(101); + return new Ball(rmdclr, randomIndex); + } }