excluding maging numbers

Author: Antojkv

app/src/main/java/hexlet/code/games/Calculator.java

@@ -4,6 +4,7 @@
 import java.security.SecureRandom;
 
 public class Calculator {
+    static final int NUMBERS_COUNT = 100;
 
     public static int calculate(int operand1, int operand2, char operator) {
         switch (operator) {
@@ -25,10 +26,9 @@ public static void startGame() {
         SecureRandom random = new SecureRandom();
 
         for (int i = 0; i < Engine.getRoundsCount(); i++) {
-            int numbersCount = 100;
 
-            int number1 = random.nextInt(numbersCount) + 1;
-            int number2 = random.nextInt(numbersCount) + 1;
+            int number1 = random.nextInt(NUMBERS_COUNT) + 1;
+            int number2 = random.nextInt(NUMBERS_COUNT) + 1;
             char operator = operators[random.nextInt(operators.length)];
 
             String question = number1 + " " + operator + " " + number2;

app/src/main/java/hexlet/code/games/Even.java

@@ -4,16 +4,17 @@
 import java.security.SecureRandom;
 
 public class Even {
+    static final int NUMBERS_COUNT = 100;
+
     public static void startGame() {
         String description = "Answer 'yes' if the number is even, otherwise answer 'no'.";
         String[][] data = new String[Engine.getRoundsCount()][2];
         SecureRandom random = new SecureRandom();
 
 
         for (int i = 0; i < Engine.getRoundsCount(); i++) {
-            int numbersCount = 100;
 
-            int number = random.nextInt(numbersCount) + 1;
+            int number = random.nextInt(NUMBERS_COUNT) + 1;
             String question = String.valueOf(number);
             String correctAnswer = number % 2 == 0 ? "yes" : "no";
 

app/src/main/java/hexlet/code/games/Gcd.java

@@ -4,7 +4,7 @@
 import java.security.SecureRandom;
 
 public class Gcd {
-
+    static final int NUMBERS_COUNT = 100;
 
     private static int isGCD(int a, int b) {
         while (b != 0) {
@@ -21,10 +21,9 @@ public static void startGame() {
         SecureRandom random = new SecureRandom();
 
         for (int i = 0; i < Engine.getRoundsCount(); i++) {
-            int numbersCount = 100;
 
-            int number1 = random.nextInt(numbersCount) + 1;
-            int number2 = random.nextInt(numbersCount) + 1;
+            int number1 = random.nextInt(NUMBERS_COUNT) + 1;
+            int number2 = random.nextInt(NUMBERS_COUNT) + 1;
             String question = number1 + " " + number2;
             String correctAnswer = String.valueOf(isGCD(number1, number2));
 

app/src/main/java/hexlet/code/games/Prime.java

@@ -4,6 +4,8 @@
 import java.security.SecureRandom;
 
 public class Prime {
+    static final int NUMBERS_COUNT = 100;
+
     public static boolean isPrime(int number) {
         if (number < 2) {
             return false;
@@ -22,9 +24,8 @@ public static void startGame() {
         SecureRandom random = new SecureRandom();
 
         for (int i = 0; i < Engine.getRoundsCount(); i++) {
-            int numbersCount = 100;
 
-            int number = random.nextInt(numbersCount) + 1;
+            int number = random.nextInt(NUMBERS_COUNT) + 1;
             String question = String.valueOf(number);
             String correctAnswer = isPrime(number) ? "yes" : "no";
 

app/src/main/java/hexlet/code/games/Progression.java

@@ -4,6 +4,11 @@
 import java.security.SecureRandom;
 
 public class Progression {
+    static final int START_NUMBER = 60;
+    static final int STEP_NUMBER = 10;
+    static final int HIDDEN_NUMBER = 10;
+    static final int LENGTH = 10;
+
     public static String[] generateProgression(int start, int step, int length) {
         String[] progression = new String[length];
         for (int index = 0; index < length; index++) {
@@ -20,16 +25,12 @@ public static void startGame() {
 
 
         for (int i = 0; i < Engine.getRoundsCount(); i++) {
-            int startNumber = 60;
-            int stepNumber = 10;
-            int hiddenNumber = 10;
-            int length = 10;
 
-            int start = random.nextInt(startNumber) + 1;
-            int step = random.nextInt(stepNumber) + 1;
-            int hiddenIndex = random.nextInt(hiddenNumber);
+            int start = random.nextInt(START_NUMBER) + 1;
+            int step = random.nextInt(STEP_NUMBER) + 1;
+            int hiddenIndex = random.nextInt(HIDDEN_NUMBER);
 
-            String[] progression = generateProgression(start, step, length);
+            String[] progression = generateProgression(start, step, LENGTH);
             String correctAnswer = progression[hiddenIndex];
             progression[hiddenIndex] = "..";