refactoring #1

Author: vrvrab

app/src/main/java/hexlet/code/Engine.java

@@ -4,8 +4,8 @@
 
 public class Engine {
     private static String name = "";
-
-    public static void beginGame(String rules, int rounds, String[][] questionsAndAnswers) {
+    public static final int ROUNDS = 3;
+    public static void beginGame(String rules, String[][] questionsAndAnswers) {
         Scanner scanner = new Scanner(System.in);
         System.out.println("\nWelcome to the Brain Games!");
         System.out.print("May I have your name? ");
@@ -14,7 +14,7 @@ public static void beginGame(String rules, int rounds, String[][] questionsAndAn
         System.out.println(rules);
         int counterRightAnswers = 0;
 
-        for (int i = 0; counterRightAnswers < rounds; i++) {
+        for (int i = 0; counterRightAnswers < ROUNDS; i++) {
             System.out.println("Question: " + questionsAndAnswers[i][0]);
             System.out.print("Your answer: ");
             String userAnswer = scanner.next();
@@ -30,7 +30,7 @@ public static void beginGame(String rules, int rounds, String[][] questionsAndAn
                 System.exit(0);
             }
         }
-        if (counterRightAnswers == rounds) {
+        if (counterRightAnswers == ROUNDS) {
             System.out.println("Congratulations, " + name + "!");
             System.exit(0);
         }

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

@@ -5,11 +5,10 @@
 
 public class Calc {
     static final int MAX_RANDOM_INT = 100;
-    private static final int ROUNDS = 3;
     public static final String RULES = "What is the result of the expression?";
 
     public static void start() {
-        Engine.beginGame(RULES, ROUNDS, getQandA(ROUNDS));
+        Engine.beginGame(RULES, getQandA(Engine.ROUNDS));
     }
 
     private static char getRandomOperator() {
@@ -20,9 +19,7 @@ private static char getRandomOperator() {
 
     public static String[][] getQandA(int rounds) {
         String[][] qAndA = new String[rounds][rounds];
-
         for (int i = 0; i < rounds; i++) {
-
             int randomNumber1 = Utils.randomIntGenerator(MAX_RANDOM_INT);
             int randomNumber2 = Utils.randomIntGenerator(MAX_RANDOM_INT);
             char randomOperator = getRandomOperator();

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

@@ -4,13 +4,12 @@
 import hexlet.code.Utils;
 
 public class Even {
-    private static final int ROUNDS = 3;
     public static final int MIN_RANDOM_INT = 1;
     public static final int MAX_RANDOM_INT = 200;
     public static final String RULES = "Answer 'yes' if the number is even, otherwise answer 'no'.";
 
     public static void start() {
-        Engine.beginGame(RULES, ROUNDS, getQandA(ROUNDS));
+        Engine.beginGame(RULES, getQandA(Engine.ROUNDS));
     }
 
     public static String[][] getQandA(int rounds) {

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

@@ -5,11 +5,10 @@
 
 public class GCD {
     static final int MAX_RANDOM_INT = 100;
-    private static final int ROUNDS = 3;
     public static final String RULES = "Find the greatest common divisor of given numbers.";
 
     public static void start() {
-        Engine.beginGame(RULES, ROUNDS, getQandA(ROUNDS));
+        Engine.beginGame(RULES, getQandA(Engine.ROUNDS));
     }
 
     public static int getGCD(int a, int b) {

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

@@ -6,11 +6,10 @@
 public class Prime {
     public static final int MIN_RANDOM_INT = 1;
     public static final int MAX_RANDOM_INT = 200;
-    private static final int ROUNDS = 3;
     public static final String RULES = "Answer 'yes' if given number is prime. Otherwise answer 'no'.";
 
     public static void start() {
-        Engine.beginGame(RULES, ROUNDS, getQandA(ROUNDS));
+        Engine.beginGame(RULES, getQandA(Engine.ROUNDS));
     }
 
     public static boolean isPrime(int n) {

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

@@ -10,11 +10,11 @@ public class Progression {
     public static final int MAX_ADDITION_INT_BOUND = 50;
     public static final int MIN_HIDDEN_INDEX = 1;
     public static final int NUMBER_OF_ITEMS_IN_QUESTION = 10;
-    private static final int ROUNDS = 3;
     public static final String RULES = "What number is missing in the progression?";
 
     public static void start() {
-        Engine.beginGame(RULES, ROUNDS, getQandA(ROUNDS));    }
+        Engine.beginGame(RULES, getQandA(Engine.ROUNDS));
+    }
 
     public static String[][] getQandA(int rounds) {
         String[][] qAndA = new String[rounds][rounds];