-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Done #1733
base: master
Are you sure you want to change the base?
Done #1733
Changes from 8 commits
a82956b
2997728
d85f4de
b885e9c
b2745b6
ea48988
4afc9bd
a373211
21d293e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package core.basesyntax; | ||
|
||
public class Ball { | ||
private Color color; | ||
private int number; | ||
|
||
public Ball(Color color, int number) { | ||
this.color = color; | ||
this.number = number; | ||
} | ||
|
||
public Color getColor() { | ||
return color; | ||
} | ||
|
||
public void setColor(Color color) { | ||
this.color = color; | ||
} | ||
|
||
public int getNumber() { | ||
return number; | ||
} | ||
|
||
public void setNumber(int number) { | ||
this.number = number; | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return "Ball \n" | ||
+ "color: " + this.color + "\n" | ||
+ "number: " + this.number; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package core.basesyntax; | ||
|
||
public enum Color { | ||
RED, | ||
GREEN, | ||
BLUE, | ||
BLACK, | ||
WHITE, | ||
PURPLE | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,11 @@ | ||
package core.basesyntax; | ||
|
||
import java.util.Random; | ||
|
||
public class ColorSupplier { | ||
public String getRandomColor() { | ||
return null; | ||
private static final Random picker = new Random(); | ||
|
||
public Color getRandomColor() { | ||
return Color.values()[picker.nextInt(Color.values().length)]; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,15 @@ | ||||||
package core.basesyntax; | ||||||
|
||||||
import java.util.Random; | ||||||
|
||||||
public class Lottery { | ||||||
private static final int maxNum = 101; | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
use the correct constant style |
||||||
private static final Random number = new Random(); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the same about Random |
||||||
|
||||||
public Ball getRandomBall() { | ||||||
ColorSupplier colorSupplier = new ColorSupplier(); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ColorSupplier also should make private final class-level variable |
||||||
Color color = colorSupplier.getRandomColor(); | ||||||
|
||||||
return new Ball(color, number.nextInt(maxNum)); | ||||||
} | ||||||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don’t make it a static field