Merge pull request #59 from MustafaAH10/branch-Mustafa

Branch mustafa
AY2223S2-CS2113-W15-1 · Mar 14, 2023 · 555023b · 555023b
2 parents e712a2b + b1590c2
commit 555023b
Show file tree

Hide file tree

Showing 35 changed files with 160 additions and 125 deletions.
diff --git a/src/main/java/seedu/Commands/AddMealCommand.java b/src/main/java/seedu/Commands/AddMealCommand.java
@@ -1,14 +1,14 @@
-package seedu.Commands;
+package seedu.commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import seedu.Database.FoodStorage;
-import seedu.Database.MealStorage;
-import seedu.Database.UserStorage;
-import seedu.Entities.Food;
-import seedu.Entities.Meal;
-import seedu.Exceptions.LifeTrackerException;
-import seedu.Ui.GeneralUi;
+import seedu.database.FoodStorage;
+import seedu.database.MealStorage;
+import seedu.database.UserStorage;
+import seedu.entities.Food;
+import seedu.entities.Meal;
+import seedu.exceptions.LifeTrackerException;
+import seedu.ui.GeneralUi;
 
 public class AddMealCommand extends Command {
     @Override

diff --git a/src/main/java/seedu/Commands/Command.java b/src/main/java/seedu/Commands/Command.java
@@ -1,10 +1,10 @@
-package seedu.Commands;
+package seedu.commands;
 
-import seedu.Database.FoodStorage;
-import seedu.Database.MealStorage;
-import seedu.Database.UserStorage;
-import seedu.Exceptions.LifeTrackerException;
-import seedu.Ui.GeneralUi;
+import seedu.database.FoodStorage;
+import seedu.database.MealStorage;
+import seedu.database.UserStorage;
+import seedu.exceptions.LifeTrackerException;
+import seedu.ui.GeneralUi;
 
 public abstract class Command {
     private boolean isExit;

diff --git a/src/main/java/seedu/Commands/DeleteMealCommand.java b/src/main/java/seedu/Commands/DeleteMealCommand.java
@@ -1,12 +1,12 @@
-package seedu.Commands;
+package seedu.commands;
 
-import seedu.Database.FoodStorage;
-import seedu.Database.MealStorage;
-import seedu.Database.UserStorage;
-import seedu.Entities.Meal;
-import seedu.Exceptions.InvalidCommandException;
-import seedu.Exceptions.LifeTrackerException;
-import seedu.Ui.GeneralUi;
+import seedu.database.FoodStorage;
+import seedu.database.MealStorage;
+import seedu.database.UserStorage;
+import seedu.entities.Meal;
+import seedu.exceptions.InvalidCommandException;
+import seedu.exceptions.LifeTrackerException;
+import seedu.ui.GeneralUi;
 
 public class DeleteMealCommand extends Command{
     private int index;

diff --git a/src/main/java/seedu/Commands/ExitCommand.java b/src/main/java/seedu/Commands/ExitCommand.java
@@ -1,12 +1,12 @@
-package seedu.Commands;
+package seedu.commands;
 
 import java.io.IOException;
 
-import seedu.Database.FoodStorage;
-import seedu.Database.MealStorage;
-import seedu.Database.UserStorage;
-import seedu.Exceptions.LifeTrackerException;
-import seedu.Ui.GeneralUi;
+import seedu.database.FoodStorage;
+import seedu.database.MealStorage;
+import seedu.database.UserStorage;
+import seedu.exceptions.LifeTrackerException;
+import seedu.ui.GeneralUi;
 
 public class ExitCommand extends Command{
     @Override

diff --git a/src/main/java/seedu/Commands/ListCommand.java b/src/main/java/seedu/Commands/ListCommand.java
@@ -1,12 +1,12 @@
-package seedu.Commands;
+package seedu.commands;
 
-import seedu.Database.FoodStorage;
-import seedu.Database.MealStorage;
-import seedu.Database.UserStorage;
-import seedu.Exceptions.LifeTrackerException;
-import seedu.Exceptions.InvalidArgumentsException;
+import seedu.database.FoodStorage;
+import seedu.database.MealStorage;
+import seedu.database.UserStorage;
+import seedu.exceptions.LifeTrackerException;
+import seedu.exceptions.InvalidArgumentsException;
 //import seedu.Output.UI;
-import seedu.Ui.GeneralUi;
+import seedu.ui.GeneralUi;
 
 public class ListCommand extends Command {
     private String argument;

diff --git a/src/main/java/seedu/Commands/UpdateUserCommand.java b/src/main/java/seedu/Commands/UpdateUserCommand.java
@@ -1,11 +1,11 @@
-package seedu.Commands;
+package seedu.commands;
 
-import seedu.Database.FoodStorage;
-import seedu.Database.MealStorage;
-import seedu.Database.UserStorage;
-import seedu.Entities.User;
-import seedu.Exceptions.LifeTrackerException;
-import seedu.Ui.GeneralUi;
+import seedu.database.FoodStorage;
+import seedu.database.MealStorage;
+import seedu.database.UserStorage;
+import seedu.entities.User;
+import seedu.exceptions.LifeTrackerException;
+import seedu.ui.GeneralUi;
 
 public class UpdateUserCommand extends Command {
     public String updateName(GeneralUi ui) {

diff --git a/src/main/java/seedu/Commands/ViewUserCommand.java b/src/main/java/seedu/Commands/ViewUserCommand.java
@@ -1,13 +1,13 @@
-package seedu.Commands;
+package seedu.commands;
 
-import seedu.Database.FoodStorage;
-import seedu.Database.MealStorage;
-import seedu.Database.UserStorage;
-import seedu.Entities.CaloricIntake;
-import seedu.Entities.User;
-import seedu.Exceptions.LifeTrackerException;
-import seedu.Ui.GeneralUi;
-import seedu.Ui.CalorieUi;
+import seedu.database.FoodStorage;
+import seedu.database.MealStorage;
+import seedu.database.UserStorage;
+import seedu.entities.CaloricIntake;
+import seedu.entities.User;
+import seedu.exceptions.LifeTrackerException;
+import seedu.ui.GeneralUi;
+import seedu.ui.CalorieUi;
 
 
 public class ViewUserCommand extends Command {

diff --git a/src/main/java/seedu/Database/FileReadable.java b/src/main/java/seedu/Database/FileReadable.java
@@ -1,4 +1,4 @@
-package seedu.Database;
+package seedu.database;
 
 import java.io.IOException;
 

diff --git a/src/main/java/seedu/Database/FileWritable.java b/src/main/java/seedu/Database/FileWritable.java
@@ -1,4 +1,4 @@
-package seedu.Database;
+package seedu.database;
 
 import java.io.IOException;
 

diff --git a/src/main/java/seedu/Database/FoodStorage.java b/src/main/java/seedu/Database/FoodStorage.java
@@ -1,4 +1,4 @@
-package seedu.Database;
+package seedu.database;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -7,11 +7,11 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import seedu.Definitions.FoodTypes;
-import seedu.Entities.Dish;
-import seedu.Entities.Food;
-import seedu.Entities.Ingredient;
-import seedu.Entities.Side;
+import seedu.definitions.FoodTypes;
+import seedu.entities.Dish;
+import seedu.entities.Food;
+import seedu.entities.Ingredient;
+import seedu.entities.Side;
 
 public class FoodStorage extends Storage implements FileReadable {
     private static final String csvDelimiter = ",";

diff --git a/src/main/java/seedu/Database/MealStorage.java b/src/main/java/seedu/Database/MealStorage.java
@@ -1,12 +1,12 @@
-package seedu.Database;
+package seedu.database;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
-import seedu.Entities.Meal;
-import seedu.Entities.Food;
+import seedu.entities.Meal;
+import seedu.entities.Food;
 import com.opencsv.CSVWriter;
 
 public class MealStorage extends Storage implements FileReadable, FileWritable {
@@ -35,8 +35,7 @@ public void write() throws IOException {
                 CSVWriter.RFC4180_LINE_END);
         String[] header = { "Date", "Foods" };
         writer.writeNext(header);
-        for (Meal meal : meals)
-        {
+        for (Meal meal : meals) {
             writer.writeNext(meal.toWriteFormat(foodsDelimiter));
         }
         writer.close();

diff --git a/src/main/java/seedu/Database/Storage.java b/src/main/java/seedu/Database/Storage.java
@@ -1,4 +1,4 @@
-package seedu.Database;
+package seedu.database;
 
 public abstract class Storage {
     protected String filePath;

diff --git a/src/main/java/seedu/Database/UserStorage.java b/src/main/java/seedu/Database/UserStorage.java
@@ -1,4 +1,4 @@
-package seedu.Database;
+package seedu.database;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -8,7 +8,7 @@
 import java.io.IOException;
 
 import com.opencsv.CSVWriter;
-import seedu.Entities.User;
+import seedu.entities.User;
 
 public class UserStorage extends Storage implements FileReadable, FileWritable {
     private static final String csvDelimiter = ",";

diff --git a/src/main/java/seedu/Definitions/FoodTypes.java b/src/main/java/seedu/Definitions/FoodTypes.java
@@ -1,4 +1,4 @@
-package seedu.Definitions;
+package seedu.definitions;
 
 public enum FoodTypes {
     INGREDIENT("Ingredient"),

diff --git a/src/main/java/seedu/Entities/CaloricIntake.java b/src/main/java/seedu/Entities/CaloricIntake.java
@@ -1,30 +1,30 @@
-package seedu.Entities;
+package seedu.entities;
 
 import java.util.ArrayList;
 
 public class CaloricIntake {
-    private ArrayList<Meal> DailyCalories;
+    private ArrayList<Meal> dailyCalories;
     private float totalDailyCalories;
 
-    public CaloricIntake(ArrayList<Meal> DailyCalories) {
-        this.DailyCalories = DailyCalories;
+    public CaloricIntake(ArrayList<Meal> dailyCalories) {
+        this.dailyCalories = dailyCalories;
         calculateTotalCalories();
     }
 
     public ArrayList<Meal> getDailyCalories(){
-        return this.DailyCalories;
+        return this.dailyCalories;
     }
 
-    public void setDailyCalories(ArrayList<Meal> DailyCalories) {
-        this.DailyCalories = DailyCalories;
+    public void setDailyCalories(ArrayList<Meal> dailyCalories) {
+        this.dailyCalories = dailyCalories;
     }
 
     public float getTotalDailyCalories() {
         return this.totalDailyCalories;
     }
 
     public void calculateTotalCalories() {
-        for (Meal meal : DailyCalories ) {
+        for (Meal meal : dailyCalories) {
             this.totalDailyCalories += meal.getTotalCalories();
         }
     }

diff --git a/src/main/java/seedu/Entities/Dish.java b/src/main/java/seedu/Entities/Dish.java
@@ -1,4 +1,4 @@
-package seedu.Entities;
+package seedu.entities;
 
 public class Dish extends Food {
     public Dish(int id, String name, String storeName, int storeNumber, float calories) {

diff --git a/src/main/java/seedu/Entities/Food.java b/src/main/java/seedu/Entities/Food.java
@@ -1,4 +1,4 @@
-package seedu.Entities;
+package seedu.entities;
 
 public abstract class Food {
     protected int id;

diff --git a/src/main/java/seedu/Entities/Ingredient.java b/src/main/java/seedu/Entities/Ingredient.java
@@ -1,4 +1,4 @@
-package seedu.Entities;
+package seedu.entities;
 
 public class Ingredient extends Food {
     public Ingredient(int id, String name, String storeName, int storeNumber, float calories) {

diff --git a/src/main/java/seedu/Entities/Meal.java b/src/main/java/seedu/Entities/Meal.java
@@ -1,4 +1,4 @@
-package seedu.Entities;
+package seedu.entities;
 
 import java.util.ArrayList;
 
@@ -43,8 +43,7 @@ public String[] toWriteFormat(String delimiter) {
         String[] output = new String[2];
         output[0] = date;
         String[] foodArray = new String[foods.size()];
-        for (int i = 0; i < foods.size(); i++)
-        {
+        for (int i = 0; i < foods.size(); i++) {
             foodArray[i] = String.valueOf(foods.get(i).getId());
         }
         output[1] = String.join(delimiter, foodArray);
@@ -56,8 +55,7 @@ public String toString() {
         String output = "Meal was consumed on " + date + "\n";
         output += "Total Calories are: " + this.getTotalCalories() + "\n";
         output += "Here are the foods you ate:\n";
-        for (int i = 0; i < foods.size(); i++)
-        {
+        for (int i = 0; i < foods.size(); i++) {
             output += (i+1) + ") " + foods.get(i).toString() + "\n";
         }
         return output;

diff --git a/src/main/java/seedu/Entities/Side.java b/src/main/java/seedu/Entities/Side.java
@@ -1,4 +1,4 @@
-package seedu.Entities;
+package seedu.entities;
 
 public class Side extends Food {
     public Side(int id, String name, String storeName, int storeNumber, float calories) {

diff --git a/src/main/java/seedu/Entities/User.java b/src/main/java/seedu/Entities/User.java
@@ -1,4 +1,4 @@
-package seedu.Entities;
+package seedu.entities;
 public class User {
     private String name;
     private float weight;

diff --git a/src/main/java/seedu/Exceptions/InvalidArgumentsException.java b/src/main/java/seedu/Exceptions/InvalidArgumentsException.java
@@ -1,4 +1,4 @@
-package seedu.Exceptions;
+package seedu.exceptions;
 
 public class InvalidArgumentsException extends LifeTrackerException {
     public InvalidArgumentsException(String commandWord) {

diff --git a/src/main/java/seedu/Exceptions/InvalidCommandException.java b/src/main/java/seedu/Exceptions/InvalidCommandException.java
@@ -1,4 +1,4 @@
-package seedu.Exceptions;
+package seedu.exceptions;
 
 public class InvalidCommandException extends LifeTrackerException{
 

diff --git a/src/main/java/seedu/Exceptions/LifeTrackerException.java b/src/main/java/seedu/Exceptions/LifeTrackerException.java
@@ -1,4 +1,4 @@
-package seedu.Exceptions;
+package seedu.exceptions;
 
 public class LifeTrackerException extends Exception {
     public LifeTrackerException(String errorMessage) {

diff --git a/src/main/java/seedu/LifeTracker/LifeTracker.java b/src/main/java/seedu/LifeTracker/LifeTracker.java
@@ -1,12 +1,12 @@
-package seedu.LifeTracker;
+package seedu.lifetracker;
 
-import seedu.Commands.Command;
-import seedu.Database.FoodStorage;
-import seedu.Database.MealStorage;
-import seedu.Database.UserStorage;
-import seedu.Exceptions.LifeTrackerException;
-import seedu.Parser.CommandParser;
-import seedu.Ui.GeneralUi;
+import seedu.commands.Command;
+import seedu.database.FoodStorage;
+import seedu.database.MealStorage;
+import seedu.database.UserStorage;
+import seedu.exceptions.LifeTrackerException;
+import seedu.parser.CommandParser;
+import seedu.ui.GeneralUi;
 import java.nio.file.Paths;
 
 public class LifeTracker {

diff --git a/src/main/java/seedu/Output/UI.java b/src/main/java/seedu/Output/UI.java
@@ -1,7 +1,7 @@
-package seedu.Output;
+package seedu.output;
 
-import seedu.Database.FoodStorage;
-import seedu.Entities.Food;
+import seedu.database.FoodStorage;
+import seedu.entities.Food;
 
 import java.util.Scanner;
 

diff --git a/src/main/java/seedu/Parser/CommandParser.java b/src/main/java/seedu/Parser/CommandParser.java
@@ -1,14 +1,14 @@
-package seedu.Parser;
+package seedu.parser;
 
-import seedu.Commands.AddMealCommand;
-import seedu.Commands.UpdateUserCommand;
-import seedu.Commands.ViewUserCommand;
-import seedu.Commands.Command;
-import seedu.Commands.DeleteMealCommand;
-import seedu.Commands.ExitCommand;
-import seedu.Commands.ListCommand;
-import seedu.Exceptions.InvalidCommandException;
-import seedu.Exceptions.LifeTrackerException;
+import seedu.commands.AddMealCommand;
+import seedu.commands.UpdateUserCommand;
+import seedu.commands.ViewUserCommand;
+import seedu.commands.Command;
+import seedu.commands.DeleteMealCommand;
+import seedu.commands.ExitCommand;
+import seedu.commands.ListCommand;
+import seedu.exceptions.InvalidCommandException;
+import seedu.exceptions.LifeTrackerException;
 
 public class CommandParser {
     public static Command parse(String userInput) throws LifeTrackerException {