Merge pull request #169 from HengFuYuen/PersonLogging

Change global variable to local
AY2021S1-CS2113-T14-4 · Nov 5, 2020 · 745ddfc · 745ddfc
2 parents 2c118e1 + d6b7f35
commit 745ddfc
Showing 1 changed file with 24 additions and 23 deletions.
diff --git a/src/main/java/seedu/dietbook/person/Person.java b/src/main/java/seedu/dietbook/person/Person.java
@@ -23,7 +23,7 @@ public class Person {
     private FitnessLevel fitnessLevel;
     private Gender gender;
     private String name;
-    private static final Logger LOGGER = Logger.getLogger(Person.class.getName());
+    private final Logger logger;
 
     /**
      * Constructs a <code>Person</code> with the given name, gender, age, height, fitness level, original,
@@ -44,27 +44,28 @@ public Person(String name, Gender gender, int age, int height, int originalWeigh
         performAssertionsForPerson(name, gender, age, height, originalWeight, currentWeight,
                 targetWeight, fitnessLevel);
 
+        logger = Logger.getLogger(Person.class.getName());
         initialiseLogger();
-        LOGGER.log(Level.FINE, "Start constructing a person");
-        LOGGER.log(Level.FINE, "Name: " + name);
-        LOGGER.log(Level.FINE, "Gender: " + gender.getDescription());
-        LOGGER.log(Level.FINE, "Age: " + age);
-        LOGGER.log(Level.FINE, "Height: " + height);
-        LOGGER.log(Level.FINE, "Original weight: " + originalWeight);
-        LOGGER.log(Level.FINE, "Current weight: " + currentWeight);
-        LOGGER.log(Level.FINE, "Target weight: " + targetWeight);
-        LOGGER.log(Level.FINE, "Fitness Level: " + fitnessLevel.getDescription());
+        logger.log(Level.FINE, "Start constructing a person");
+        logger.log(Level.FINE, "Name: " + name);
+        logger.log(Level.FINE, "Gender: " + gender.getDescription());
+        logger.log(Level.FINE, "Age: " + age);
+        logger.log(Level.FINE, "Height: " + height);
+        logger.log(Level.FINE, "Original weight: " + originalWeight);
+        logger.log(Level.FINE, "Current weight: " + currentWeight);
+        logger.log(Level.FINE, "Target weight: " + targetWeight);
+        logger.log(Level.FINE, "Fitness Level: " + fitnessLevel.getDescription());
 
         this.name = name.trim();
-        LOGGER.log(Level.FINE, "Trimmed Name: " + this.name);
+        logger.log(Level.FINE, "Trimmed Name: " + this.name);
         this.gender = gender;
         this.age = age;
         this.height = height;
         this.originalWeight = originalWeight;
         this.currentWeight = currentWeight;
         this.targetWeight = targetWeight;
         this.fitnessLevel = fitnessLevel;
-        LOGGER.log(Level.FINE, "Person constructed");
+        logger.log(Level.FINE, "Person constructed");
     }
 
     /**
@@ -73,8 +74,8 @@ public Person(String name, Gender gender, int age, int height, int originalWeigh
     private void initialiseLogger() {
         Handler consoleHandler = new ConsoleHandler();
         consoleHandler.setLevel(Level.WARNING);
-        LOGGER.addHandler(consoleHandler);
-        LOGGER.setLevel(Level.WARNING);
+        logger.addHandler(consoleHandler);
+        logger.setLevel(Level.WARNING);
     }
 
     /**
@@ -119,9 +120,9 @@ public String getName() {
      */
     public void setName(String newName) {
         performAssertionsForNameInput(newName);
-        LOGGER.log(Level.FINE, "New name: " + newName);
+        logger.log(Level.FINE, "New name: " + newName);
         name = newName.trim();
-        LOGGER.log(Level.FINE, "Trimmed new name: " + this.name);
+        logger.log(Level.FINE, "Trimmed new name: " + this.name);
     }
 
     /**
@@ -140,7 +141,7 @@ public Gender getGender() {
      */
     public void setGender(Gender newGender) {
         performAssertionsForGenderInput(newGender);
-        LOGGER.log(Level.FINE, "New gender: " + newGender.getDescription());
+        logger.log(Level.FINE, "New gender: " + newGender.getDescription());
         gender = newGender;
     }
 
@@ -160,7 +161,7 @@ public int getAge() {
      */
     public void setAge(int newAge) {
         performAssertionsForAgeInput(newAge);
-        LOGGER.log(Level.FINE, "New age: " + newAge);
+        logger.log(Level.FINE, "New age: " + newAge);
         age = newAge;
     }
 
@@ -180,7 +181,7 @@ public int getHeight() {
      */
     public void setHeight(int newHeight) {
         performAssertionsForHeight(newHeight);
-        LOGGER.log(Level.FINE, "New height: " + newHeight);
+        logger.log(Level.FINE, "New height: " + newHeight);
         height = newHeight;
     }
 
@@ -200,7 +201,7 @@ public int getOriginalWeight() {
      */
     public void setOriginalWeight(int newOriginalWeight) {
         performAssertionsForWeight(newOriginalWeight,"Original weight");
-        LOGGER.log(Level.FINE, "New original weight: " + newOriginalWeight);
+        logger.log(Level.FINE, "New original weight: " + newOriginalWeight);
         originalWeight = newOriginalWeight;
     }
 
@@ -220,7 +221,7 @@ public int getCurrentWeight() {
      */
     public void setCurrentWeight(int newCurrentWeight) {
         performAssertionsForWeight(newCurrentWeight, "Current weight");
-        LOGGER.log(Level.FINE, "New current weight: " + newCurrentWeight);
+        logger.log(Level.FINE, "New current weight: " + newCurrentWeight);
         currentWeight = newCurrentWeight;
     }
 
@@ -240,7 +241,7 @@ public int getTargetWeight() {
      */
     public void setTargetWeight(int newTargetWeight) {
         performAssertionsForWeight(newTargetWeight, "Target weight");
-        LOGGER.log(Level.FINE, "New target weight: " + newTargetWeight);
+        logger.log(Level.FINE, "New target weight: " + newTargetWeight);
         targetWeight = newTargetWeight;
     }
 
@@ -260,7 +261,7 @@ public FitnessLevel getFitnessLevel() {
      */
     public void setFitnessLevel(FitnessLevel newFitnessLevel) {
         performAssertionsForFitnessLevel(newFitnessLevel);
-        LOGGER.log(Level.FINE, "New fitness level: " + newFitnessLevel);
+        logger.log(Level.FINE, "New fitness level: " + newFitnessLevel);
         fitnessLevel = newFitnessLevel;
     }