Merge pull request #1 from ProgrammingMadeEasy-Community/fix/review

Code review

Author: sirDarey

Diff for: src/main/java/org/javatasks/agecomparism/AgeComparison.java

@@ -41,25 +41,25 @@ public static void writePerson(Person person) {
         };
 
         System.out.println("Name: " + person.name);
-        System.out.println("Birthday: " + monthNames[person.birthday.month - 1] + " " + person.birthday.day + ", " + person.birthday.year);
+        System.out.println("Birthday: " + monthNames[person.birthday.getMonth() - 1] + " " + person.birthday.getDay() + ", " + person.birthday.getYear());
     }
 
     public static void whoIsOlder(Person person1, Person person2) {
-        int yearDifference = person1.birthday.year - person2.birthday.year;
+        int yearDifference = person1.birthday.getYear() - person2.birthday.getYear();
 
         if (yearDifference < 0) {
             System.out.println(person1.name + " is younger than " + person2.name + " by " + (-yearDifference) + " years.");
         } else if (yearDifference > 0) {
             System.out.println(person1.name + " is older than " + person2.name + " by " + yearDifference + " years.");
         } else {
-            int monthDifference = person1.birthday.month - person2.birthday.month;
+            int monthDifference = person1.birthday.getMonth()  - person2.birthday.getMonth() ;
 
             if (monthDifference < 0) {
                 System.out.println(person1.name + " is younger than " + person2.name + " by a few months.");
             } else if (monthDifference > 0) {
                 System.out.println(person1.name + " is older than " + person2.name + " by a few months.");
             } else {
-                int dayDifference = person1.birthday.day - person2.birthday.day;
+                int dayDifference = person1.birthday.getDay() - person2.birthday.getDay();
 
                 if (dayDifference < 0) {
                     System.out.println(person1.name + " is younger than " + person2.name + " by a few days.");

Diff for: src/main/java/org/javatasks/agecomparism/Date.java

@@ -2,13 +2,25 @@
 
 
 public class Date {
-    int year;
-    int month;
-    int day;
+    private int year;
+    private int month;
+    private int day;
 
     Date(int year, int month, int day) {
         this.year = year;
         this.month = month;
         this.day = day;
     }
+
+    public int getYear() {
+        return year;
+    }
+
+    public int getMonth() {
+        return month;
+    }
+
+    public int getDay() {
+        return day;
+    }
 }

Diff for: src/main/java/org/javatasks/daysoftheweek/DaysOfTheWeekProgram.java

@@ -46,7 +46,7 @@ public static void DaysOfTheWeek(int dayNumber) {
     // Task 3: Method to store and count user inputs
     public static void DaysOfTheWeek(int... dayNumbers) {
         try {
-            Map<DayOfWeek, Integer> dayCountMap = new HashMap<>();
+            Map <DayOfWeek, Integer> dayCountMap = new HashMap<>();
             for (int dayNumber : dayNumbers) {
                 DayOfWeek day = DayOfWeek.values()[dayNumber - 1];
                 dayCountMap.put(day, dayCountMap.getOrDefault(day, 0) + 1);

Diff for: src/main/java/org/javatasks/simplecalculator/SimpleCalculator.java

@@ -10,65 +10,72 @@ public static void main(String[] args) {
         int attempts = 5;
 
         System.out.println("Simple Calculator");
-
-        double firstNumber = getUserInput("Enter the first number: ");
-        double secondNumber = getUserInput("Enter the second number: ");
-        int operationChoice;
-
-        while (true) {
-            System.out.println("Choose an operation:");
-            System.out.println("1. Addition");
-            System.out.println("2. Subtraction");
-            System.out.println("3. Multiplication");
-            System.out.println("4. Division");
-            System.out.print("Enter the number corresponding to the operation: ");
-
-            if (scanner.hasNextInt()) {
-                operationChoice = scanner.nextInt();
-                if (operationChoice >= 1 && operationChoice <= 4) {
-                    break;
+        char recur;
+
+        do {
+            double firstNumber = getUserInput("Enter the first number: ");
+            double secondNumber = getUserInput("Enter the second number: ");
+            int operationChoice;
+
+            while (true) {
+                System.out.println("Choose an operation:");
+                System.out.println("1. Addition");
+                System.out.println("2. Subtraction");
+                System.out.println("3. Multiplication");
+                System.out.println("4. Division");
+                System.out.print("Enter the number corresponding to the operation: ");
+
+                if (scanner.hasNextInt()) {
+                    operationChoice = scanner.nextInt();
+                    if (operationChoice >= 1 && operationChoice <= 4) {
+                        break;
+                    } else {
+                        System.out.println("Invalid operation choice. Please enter a number between 1 and 4.");
+                        scanner.nextLine(); // Clear the input buffer
+                    }
                 } else {
-                    System.out.println("Invalid operation choice. Please enter a number between 1 and 4.");
+                    System.out.println("Invalid input. Please enter a valid number.");
                     scanner.nextLine(); // Clear the input buffer
                 }
-            } else {
-                System.out.println("Invalid input. Please enter a valid number.");
-                scanner.nextLine(); // Clear the input buffer
+
+                attempts--;
+
+                if (attempts == 0) {
+                    System.out.println("You've reached the maximum number of attempts. Exiting the program.");
+                    System.exit(1);
+                }
             }
 
-            attempts--;
+            double result = 0.0;
 
-            if (attempts == 0) {
-                System.out.println("You've reached the maximum number of attempts. Exiting the program.");
-                System.exit(1);
+            switch (operationChoice) {
+                case 1:
+                    result = firstNumber + secondNumber;
+                    break;
+                case 2:
+                    result = firstNumber - secondNumber;
+                    break;
+                case 3:
+                    result = firstNumber * secondNumber;
+                    break;
+                case 4:
+                    if (secondNumber != 0) {
+                        result = firstNumber / secondNumber;
+                    } else {
+                        System.out.println("Error: Division by zero is not allowed.");
+                        System.exit(1);
+                    }
+                    break;
+                default:
+                    break;
             }
-        }
 
-        double result = 0.0;
-
-        switch (operationChoice) {
-            case 1:
-                result = firstNumber + secondNumber;
-                break;
-            case 2:
-                result = firstNumber - secondNumber;
-                break;
-            case 3:
-                result = firstNumber * secondNumber;
-                break;
-            case 4:
-                if (secondNumber != 0) {
-                    result = firstNumber / secondNumber;
-                } else {
-                    System.out.println("Error: Division by zero is not allowed.");
-                    System.exit(1);
-                }
-                break;
-            default:
-                break;
-        }
+            System.out.println("Result: " + result);
+
+            System.out.println("Do you wish to perform another operation? Enter y for YES; any other key means NO\n");
+            recur = scanner.next().charAt(0);
 
-        System.out.println("Result: " + result);
+        } while (recur == 'y');
     }
 
     private static double getUserInput(String prompt) {