From 3e32932521714cd29104345f64219f8c0c74e791 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Mon, 1 Jan 2024 14:03:25 +0300 Subject: [PATCH] Fixed OOPBasic Java Core --- .../java/core/basesyntax/Application.java | 7 ------- src/main/java/core/basesyntax/Ball.java | 19 +++++++++++++++++ src/main/java/core/basesyntax/Color.java | 6 ++++++ .../java/core/basesyntax/ColorSupplier.java | 13 +++++++++--- src/main/java/core/basesyntax/Lottery.java | 15 +++++++++++++ src/main/java/core/basesyntax/Main.java | 21 +++++++++++++++++++ 6 files changed, 71 insertions(+), 10 deletions(-) delete mode 100644 src/main/java/core/basesyntax/Application.java 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 create mode 100644 src/main/java/core/basesyntax/Main.java diff --git a/src/main/java/core/basesyntax/Application.java b/src/main/java/core/basesyntax/Application.java deleted file mode 100644 index 42ed4ef86..000000000 --- a/src/main/java/core/basesyntax/Application.java +++ /dev/null @@ -1,7 +0,0 @@ -package core.basesyntax; - -public class Application { - public static void main(String[] args) { - // create three balls using class Lottery and print information about them in console - } -} diff --git a/src/main/java/core/basesyntax/Ball.java b/src/main/java/core/basesyntax/Ball.java new file mode 100644 index 000000000..aca0f3000 --- /dev/null +++ b/src/main/java/core/basesyntax/Ball.java @@ -0,0 +1,19 @@ +package org.example; + +public class Ball { + private Color color; + private int number; + + public Ball(Color color, int number) { + this.color = color; + this.number = number; + } + + @Override + public String toString() { + return "Ball{" + + "color=" + color + + ", number=" + number + + '}'; + } +} diff --git a/src/main/java/core/basesyntax/Color.java b/src/main/java/core/basesyntax/Color.java new file mode 100644 index 000000000..b062dc4bd --- /dev/null +++ b/src/main/java/core/basesyntax/Color.java @@ -0,0 +1,6 @@ +package org.example; + +public enum Color { + RED, BLUE, WHITE, GREEN, ORANGE, BLACK, PURPLE +} + diff --git a/src/main/java/core/basesyntax/ColorSupplier.java b/src/main/java/core/basesyntax/ColorSupplier.java index 25e8b23b1..dc5aa758e 100644 --- a/src/main/java/core/basesyntax/ColorSupplier.java +++ b/src/main/java/core/basesyntax/ColorSupplier.java @@ -1,7 +1,14 @@ -package core.basesyntax; +package org.example; + +import java.util.Random; public class ColorSupplier { - public String getRandomColor() { - return null; + + private final Color[] colors = Color.values(); + private final Random random = new Random(); + + public Color getRandomColor() { + + return colors[random.nextInt(colors.length)]; } } diff --git a/src/main/java/core/basesyntax/Lottery.java b/src/main/java/core/basesyntax/Lottery.java new file mode 100644 index 000000000..16d4c5e5d --- /dev/null +++ b/src/main/java/core/basesyntax/Lottery.java @@ -0,0 +1,15 @@ +package org.example; + +import java.util.Random; + +public class Lottery { + + private final ColorSupplier colorSupplier = new ColorSupplier(); + + private final Random random = new Random(); + + public Ball getRandomBall() { + + return new Ball(colorSupplier.getRandomColor(), random.nextInt(100)); + } +} diff --git a/src/main/java/core/basesyntax/Main.java b/src/main/java/core/basesyntax/Main.java new file mode 100644 index 000000000..1c545f18c --- /dev/null +++ b/src/main/java/core/basesyntax/Main.java @@ -0,0 +1,21 @@ +package org.example; + +public class Main { + public static void main(String[] args) { + + Lottery lottery = new Lottery(); + + for (int i = 1; i < 4; i++) + { + Ball ball = lottery.getRandomBall(); + if (i == 1) { + System.out.print(i + "st "); + } else if (i == 2) { + System.out.print(i + "nd "); + } else if (i == 3) { + System.out.print(i + "rd "); + } + System.out.println(ball); + } + } +} \ No newline at end of file