From e3df59ca143b3f4bce63356a6e59f6ae5c0d5674 Mon Sep 17 00:00:00 2001 From: Oleh Date: Thu, 16 Nov 2023 00:25:03 +0200 Subject: [PATCH 01/11] doneHomework --- src/main/java/core/basesyntax/Application.java | 8 +++++++- src/main/java/core/basesyntax/Ball.java | 17 +++++++++++++++++ .../java/core/basesyntax/ColorSupplier.java | 6 +++++- src/main/java/core/basesyntax/Colors.java | 12 ++++++++++++ src/main/java/core/basesyntax/Lottery.java | 11 +++++++++++ 5 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 src/main/java/core/basesyntax/Ball.java create mode 100644 src/main/java/core/basesyntax/Colors.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..246ed19c2 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 lottery1 = new Lottery(); + Lottery lottery2 = new Lottery(); + Lottery lottery3 = new Lottery(); + + System.out.println(lottery1.getRandomBall()); + System.out.println(lottery2.getRandomBall()); + System.out.println(lottery3.getRandomBall()); } } diff --git a/src/main/java/core/basesyntax/Ball.java b/src/main/java/core/basesyntax/Ball.java new file mode 100644 index 000000000..78b3bcd54 --- /dev/null +++ b/src/main/java/core/basesyntax/Ball.java @@ -0,0 +1,17 @@ +package core.basesyntax; + +public class Ball { + + private String color; + private int number; + + public Ball(String color, int number) { + this.color = color; + this.number = number; + } + + @Override + public String toString() { + return "{Color: " + color + ", number: " + number + "}"; + } +} diff --git a/src/main/java/core/basesyntax/ColorSupplier.java b/src/main/java/core/basesyntax/ColorSupplier.java index 25e8b23b1..5df8568a0 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(Colors.values().length); + return Colors.values()[index].toString(); } } diff --git a/src/main/java/core/basesyntax/Colors.java b/src/main/java/core/basesyntax/Colors.java new file mode 100644 index 000000000..94a1f5484 --- /dev/null +++ b/src/main/java/core/basesyntax/Colors.java @@ -0,0 +1,12 @@ +package core.basesyntax; + +public enum Colors { + RED, + GREEN, + WHITE, + BLACK, + PINK, + GREY, + BLUE, + PURPLE +} diff --git a/src/main/java/core/basesyntax/Lottery.java b/src/main/java/core/basesyntax/Lottery.java new file mode 100644 index 000000000..ea341136c --- /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() { + int randomNumber = new Random().nextInt(100); + return new Ball(new ColorSupplier().getRandomColor(), randomNumber); + } +} From 1bc6c25356bfdf335efc06a4230832b9c4235333 Mon Sep 17 00:00:00 2001 From: Oleh Date: Thu, 16 Nov 2023 14:52:50 +0200 Subject: [PATCH 02/11] doneHomework2 --- src/main/java/core/basesyntax/Application.java | 11 ++++------- src/main/java/core/basesyntax/Ball.java | 1 - 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/core/basesyntax/Application.java b/src/main/java/core/basesyntax/Application.java index 246ed19c2..67a52bb79 100644 --- a/src/main/java/core/basesyntax/Application.java +++ b/src/main/java/core/basesyntax/Application.java @@ -2,12 +2,9 @@ public class Application { public static void main(String[] args) { - Lottery lottery1 = new Lottery(); - Lottery lottery2 = new Lottery(); - Lottery lottery3 = new Lottery(); - - System.out.println(lottery1.getRandomBall()); - System.out.println(lottery2.getRandomBall()); - System.out.println(lottery3.getRandomBall()); + Lottery[] lotteries = {new Lottery(), new Lottery(), new Lottery()}; + for (Lottery lottery : lotteries) { + System.out.println(lottery.getRandomBall()); + } } } diff --git a/src/main/java/core/basesyntax/Ball.java b/src/main/java/core/basesyntax/Ball.java index 78b3bcd54..d8b82e978 100644 --- a/src/main/java/core/basesyntax/Ball.java +++ b/src/main/java/core/basesyntax/Ball.java @@ -1,7 +1,6 @@ package core.basesyntax; public class Ball { - private String color; private int number; From 3ec309d7fa485f598b88ce47fc09b2676912cce6 Mon Sep 17 00:00:00 2001 From: Oleh Date: Thu, 16 Nov 2023 18:27:37 +0200 Subject: [PATCH 03/11] doneHomework3 --- src/main/java/core/basesyntax/ColorSupplier.java | 1 - src/main/java/core/basesyntax/Lottery.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/java/core/basesyntax/ColorSupplier.java b/src/main/java/core/basesyntax/ColorSupplier.java index 5df8568a0..6aef5d463 100644 --- a/src/main/java/core/basesyntax/ColorSupplier.java +++ b/src/main/java/core/basesyntax/ColorSupplier.java @@ -3,7 +3,6 @@ import java.util.Random; public class ColorSupplier { - public String getRandomColor() { int index = new Random().nextInt(Colors.values().length); return Colors.values()[index].toString(); diff --git a/src/main/java/core/basesyntax/Lottery.java b/src/main/java/core/basesyntax/Lottery.java index ea341136c..8c02e957a 100644 --- a/src/main/java/core/basesyntax/Lottery.java +++ b/src/main/java/core/basesyntax/Lottery.java @@ -3,7 +3,6 @@ import java.util.Random; public class Lottery { - public Ball getRandomBall() { int randomNumber = new Random().nextInt(100); return new Ball(new ColorSupplier().getRandomColor(), randomNumber); From 9c5273f2af2682e0db0c1a66ce8e4aaf5262765c Mon Sep 17 00:00:00 2001 From: Oleh Date: Thu, 16 Nov 2023 22:02:19 +0200 Subject: [PATCH 04/11] 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); } } From 8c85d7e91398365850163b14a1752c3a532f5374 Mon Sep 17 00:00:00 2001 From: Oleh Date: Thu, 16 Nov 2023 22:03:35 +0200 Subject: [PATCH 05/11] fixed hometask --- src/main/java/core/basesyntax/{Colors.java => Color.java} | 2 +- src/main/java/core/basesyntax/ColorSupplier.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/main/java/core/basesyntax/{Colors.java => Color.java} (84%) diff --git a/src/main/java/core/basesyntax/Colors.java b/src/main/java/core/basesyntax/Color.java similarity index 84% rename from src/main/java/core/basesyntax/Colors.java rename to src/main/java/core/basesyntax/Color.java index 94a1f5484..8ac927a39 100644 --- a/src/main/java/core/basesyntax/Colors.java +++ b/src/main/java/core/basesyntax/Color.java @@ -1,6 +1,6 @@ package core.basesyntax; -public enum Colors { +public enum Color { RED, GREEN, WHITE, diff --git a/src/main/java/core/basesyntax/ColorSupplier.java b/src/main/java/core/basesyntax/ColorSupplier.java index 6aef5d463..2de4f270d 100644 --- a/src/main/java/core/basesyntax/ColorSupplier.java +++ b/src/main/java/core/basesyntax/ColorSupplier.java @@ -4,7 +4,7 @@ public class ColorSupplier { public String getRandomColor() { - int index = new Random().nextInt(Colors.values().length); - return Colors.values()[index].toString(); + int index = new Random().nextInt(Color.values().length); + return Color.values()[index].toString(); } } From 42acf42fd8e9aa08876035f5216533a83cb7c509 Mon Sep 17 00:00:00 2001 From: Oleh Date: Thu, 16 Nov 2023 22:05:30 +0200 Subject: [PATCH 06/11] fixed hometask2 --- src/main/java/core/basesyntax/Lottery.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/core/basesyntax/Lottery.java b/src/main/java/core/basesyntax/Lottery.java index f4a14bb61..73f0f7fcd 100644 --- a/src/main/java/core/basesyntax/Lottery.java +++ b/src/main/java/core/basesyntax/Lottery.java @@ -3,10 +3,11 @@ import java.util.Random; public class Lottery { + private Random random = new Random(); + private ColorSupplier colorSupplier = new ColorSupplier(); + public Ball getRandomBall() { int maxNumber = Ball.getMaxNumber(); - Random random = new Random(); - ColorSupplier colorSupplier = new ColorSupplier(); int randomNumber = random.nextInt(maxNumber); return new Ball(colorSupplier.getRandomColor(), randomNumber); } From a4dac18f8d94dd7030f90b1b46c2c1ae9a7df0b6 Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 17 Nov 2023 12:59:20 +0200 Subject: [PATCH 07/11] fixed ColorSupplier --- src/main/java/core/basesyntax/ColorSupplier.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/core/basesyntax/ColorSupplier.java b/src/main/java/core/basesyntax/ColorSupplier.java index 2de4f270d..1566280b0 100644 --- a/src/main/java/core/basesyntax/ColorSupplier.java +++ b/src/main/java/core/basesyntax/ColorSupplier.java @@ -3,8 +3,10 @@ import java.util.Random; public class ColorSupplier { + private Random random = new Random(); + public String getRandomColor() { - int index = new Random().nextInt(Color.values().length); - return Color.values()[index].toString(); + int index = random.nextInt(Color.values().length); + return Color.values()[index].name(); } } From 56f85c76b52b6b4ee034490c085cabdffd706535 Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 17 Nov 2023 13:21:20 +0200 Subject: [PATCH 08/11] added constant to Lottery --- src/main/java/core/basesyntax/Ball.java | 5 ----- src/main/java/core/basesyntax/Lottery.java | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/core/basesyntax/Ball.java b/src/main/java/core/basesyntax/Ball.java index 221461ace..d8b82e978 100644 --- a/src/main/java/core/basesyntax/Ball.java +++ b/src/main/java/core/basesyntax/Ball.java @@ -1,7 +1,6 @@ package core.basesyntax; public class Ball { - private static final int MAX_NUMBER = 100; private String color; private int number; @@ -10,10 +9,6 @@ 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 73f0f7fcd..b58f6fa1f 100644 --- a/src/main/java/core/basesyntax/Lottery.java +++ b/src/main/java/core/basesyntax/Lottery.java @@ -3,12 +3,12 @@ import java.util.Random; public class Lottery { + private static final int MAX_NUMBER = 100; private Random random = new Random(); private ColorSupplier colorSupplier = new ColorSupplier(); public Ball getRandomBall() { - int maxNumber = Ball.getMaxNumber(); - int randomNumber = random.nextInt(maxNumber); + int randomNumber = random.nextInt(Lottery.MAX_NUMBER); return new Ball(colorSupplier.getRandomColor(), randomNumber); } } From 8607865ffeff583463aa408ca4b856b044f3ee51 Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 17 Nov 2023 13:29:02 +0200 Subject: [PATCH 09/11] added constant to Lottery and get method for it --- src/main/java/core/basesyntax/Lottery.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/core/basesyntax/Lottery.java b/src/main/java/core/basesyntax/Lottery.java index b58f6fa1f..c6ce44f84 100644 --- a/src/main/java/core/basesyntax/Lottery.java +++ b/src/main/java/core/basesyntax/Lottery.java @@ -8,7 +8,12 @@ public class Lottery { private ColorSupplier colorSupplier = new ColorSupplier(); public Ball getRandomBall() { - int randomNumber = random.nextInt(Lottery.MAX_NUMBER); + int maxNumber = Lottery.getMaxNumber(); + int randomNumber = random.nextInt(maxNumber); return new Ball(colorSupplier.getRandomColor(), randomNumber); } + + public static int getMaxNumber() { + return MAX_NUMBER; + } } From 67300ae8d35e243cd8db1d0ebb4d261800f6c3ae Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 17 Nov 2023 15:13:42 +0200 Subject: [PATCH 10/11] removed get method for constant --- src/main/java/core/basesyntax/Lottery.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/core/basesyntax/Lottery.java b/src/main/java/core/basesyntax/Lottery.java index c6ce44f84..89adc6af4 100644 --- a/src/main/java/core/basesyntax/Lottery.java +++ b/src/main/java/core/basesyntax/Lottery.java @@ -8,12 +8,8 @@ public class Lottery { private ColorSupplier colorSupplier = new ColorSupplier(); public Ball getRandomBall() { - int maxNumber = Lottery.getMaxNumber(); + int maxNumber = Lottery.MAX_NUMBER; int randomNumber = random.nextInt(maxNumber); return new Ball(colorSupplier.getRandomColor(), randomNumber); } - - public static int getMaxNumber() { - return MAX_NUMBER; - } } From 728c43f37da3febfbe5d94cf3e74fb1245ac9ede Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 17 Nov 2023 15:21:27 +0200 Subject: [PATCH 11/11] removed int maxNumber from getRandomBall method --- src/main/java/core/basesyntax/Lottery.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/core/basesyntax/Lottery.java b/src/main/java/core/basesyntax/Lottery.java index 89adc6af4..b4ab165be 100644 --- a/src/main/java/core/basesyntax/Lottery.java +++ b/src/main/java/core/basesyntax/Lottery.java @@ -8,8 +8,7 @@ public class Lottery { private ColorSupplier colorSupplier = new ColorSupplier(); public Ball getRandomBall() { - int maxNumber = Lottery.MAX_NUMBER; - int randomNumber = random.nextInt(maxNumber); + int randomNumber = random.nextInt(MAX_NUMBER); return new Ball(colorSupplier.getRandomColor(), randomNumber); } }