Merge pull request #12 from liuziyang020319/master

Fetch method

docs/team/liuziyang.md

@@ -1,6 +1,7 @@
-# John Doe - Project Portfolio Page
+# Liu Ziyang - Project Portfolio Page
 
 ## Overview
-
+Responsible for all items in the User Guide.
 
 ### Summary of Contributions
+

src/main/java/seedu/duke/Duke.java

@@ -4,7 +4,7 @@
 import seedu.duke.parser.Parser;
 import seedu.duke.recipe.RecipeList;
 import seedu.duke.storage.Storage;
-import seedu.duke.ui.Ui;
+import seedu.duke.ui.UI;
 
 /**
  * Represents the Recipe Manager programme. A <code>Duke</code> object corresponds to
@@ -13,7 +13,7 @@
 public class Duke {
 
     private final RecipeList recipes;
-
+    private final UI ui = new UI();
     /**
      * Class constructor specifying filePath for saving data.
      *
@@ -24,10 +24,10 @@ public Duke(String filePath) {
         try {
             Storage.createSavedFile();
         } catch (Exception e) {
-            Ui.showLoadingErrorMessage(e);
+            ui.showLoadingErrorMessage(e);
         } finally {
             recipes = new RecipeList();
-            Ui.showLine();
+            ui.showLine();
         }
     }
 
@@ -36,20 +36,20 @@ public Duke(String filePath) {
      * it is terminated by the user.
      */
     public void run() {
-        Ui.showWelcome();
-        Ui.showLine();
+        ui.showWelcome();
+        ui.showLine();
         boolean isExit = false;
         while (!isExit) {
             try {
-                String fullCommand = Ui.readCommand();
-                Ui.showLine();
+                String fullCommand = ui.readCommand();
+                ui.showLine();
                 Command c = Parser.parseCommands(fullCommand);
-                c.execute(recipes);
+                c.execute(recipes,ui);
                 isExit = c.isExit();
             } catch (Exception e) {
-                Ui.showDudeMainError(e);
+                ui.showDudeMainError(e);
             } finally {
-                Ui.showLine();
+                ui.showLine();
             }
         }
     }

src/main/java/seedu/duke/command/Command.java

@@ -6,7 +6,7 @@
 import seedu.duke.recipe.IngredientList;
 import seedu.duke.recipe.Recipe;
 import seedu.duke.recipe.RecipeList;
-import seedu.duke.ui.Ui;
+import seedu.duke.ui.UI;
 
 import java.util.ArrayList;
 
@@ -48,13 +48,13 @@ public boolean isExit() {
      *
      * @param recipeList the current list of recipes to be modified or used.
      */
-    public void execute(RecipeList recipeList) {
+    public void execute(RecipeList recipeList, UI ui) {
 
         int recipeListIndex;
 
         switch (type) {
         case LIST:
-            Ui.showRecipeList(recipeList.getRecipeList());
+            ui.showRecipeList(recipeList.getRecipeList());
             break;
         case ADD:
             try {
@@ -67,9 +67,9 @@ public void execute(RecipeList recipeList) {
                 String recipeTag = parsed.get(2);
                 ArrayList<String> recipeSteps = new ArrayList<>();
                 recipeList.addNewRecipe(new Recipe(recipeName, recipeTag, ingredientLists, recipeSteps));
-                Ui.showRecipeAdded(recipeList.getNewestRecipe(), recipeList.getCurrRecipeNumber());
+                ui.showRecipeAdded(recipeList.getNewestRecipe(), recipeList.getCurrRecipeNumber());
             } catch (Exception e) {
-                Ui.showAddingRecipeErrorMessage(e);
+                ui.showAddingRecipeErrorMessage(e);
             }
             break;
         case DELETE:
@@ -79,10 +79,10 @@ public void execute(RecipeList recipeList) {
                 }
                 recipeListIndex = Integer.parseInt(fullDescription);
                 Recipe recipeToBeDeleted = recipeList.getRecipeFromList(recipeListIndex);
-                Ui.showRecipeDeleted(recipeToBeDeleted, recipeList.getCurrRecipeNumber() - 1);
+                ui.showRecipeDeleted(recipeToBeDeleted, recipeList.getCurrRecipeNumber() - 1);
                 recipeList.removeRecipe(recipeListIndex);
             } catch (Exception e) {
-                Ui.showDeletingTaskErrorMessage(e, type);
+                ui.showDeletingTaskErrorMessage(e, type);
             }
             break;
         case FIND:
@@ -97,22 +97,38 @@ public void execute(RecipeList recipeList) {
                         findRecipeResults.add(recipe);
                     }
                 }
-                Ui.showFindResults(findRecipeResults, keywords);
+                ui.showFindResults(findRecipeResults, keywords);
             } catch (Exception e) {
-                Ui.showFindingTaskErrorMessage(e);
+                ui.showFindingTaskErrorMessage(e);
+            }
+            break;
+        case CLEAR:
+            recipeList.clearRecipeList();
+            ui.showRecipeListCleared();
+            break;
+        case VIEW:
+            try {
+                if (fullDescription.isEmpty()) {
+                    throw new IncompleteInputException("The index of " + type + " cannot be empty.\n");
+                }
+                recipeListIndex = Integer.parseInt(fullDescription);
+                Recipe recipeToBeViewed = recipeList.getRecipeFromList(recipeListIndex);
+                ui.showRecipeViewed(recipeToBeViewed);
+            } catch (Exception e) {
+                ui.showViewingRecipeErrorMessage(e);
             }
             break;
         case HELP:
-            Ui.showHelp();
+            ui.showHelp();
             break;
         case EXIT:
-            Ui.showExit();
+            ui.showExit();
             break;
         case UNKNOWN:
-            Ui.showUnrecognizableErrorMessage();
+            ui.showUnrecognizableErrorMessage();
             break;
         default:
-            Ui.showUnrecognizableCommandErrorMessage();
+            ui.showUnrecognizableCommandErrorMessage();
         }
     }
 }

src/main/java/seedu/duke/command/CommandType.java

@@ -38,7 +38,11 @@ public enum CommandType {
      */
     HELP,
     /**
-     * Terminates the programme and exit with saving.
+     * Clear the current recipe list.
+     */
+    CLEAR,
+    /**
+     * Terminates the programme and exit without saving.
      */
     EXIT,
     /**

src/main/java/seedu/duke/parser/Parser.java

@@ -54,6 +54,9 @@ public static Command parseCommands(String line) {
         case "find":
             type = CommandType.FIND;
             break;
+        case "clear":
+            type = CommandType.CLEAR;
+            break;
         case "exit":
             type = CommandType.EXIT;
             break;

src/main/java/seedu/duke/recipe/Ingredient.java

@@ -6,4 +6,7 @@ public class Ingredient {
     public Ingredient(String inputName) {
         name = inputName;
     }
+    public String getName() {
+        return name;
+    }
 }

src/main/java/seedu/duke/recipe/IngredientList.java

@@ -49,4 +49,10 @@ private void removeIngredient(int index) {
         list.remove(index-1);
         currIngredientNumber--;
     }
+    public void showList() {
+        System.out.println("Here are " + currIngredientNumber + " ingredients in the list:");
+        for (int i = 0; i < currIngredientNumber; i++) {
+            System.out.println((i + 1) + ". " + list.get(i).getName());
+        }
+    }
 }

src/main/java/seedu/duke/recipe/Recipe.java

@@ -30,7 +30,6 @@ public String getName() {
     public String getTag() {
         return tag;
     }
-
     public String toString() {
         return '[' + tag + "] " + name;
     }

src/main/java/seedu/duke/recipe/RecipeList.java

@@ -23,6 +23,7 @@ public ArrayList<Recipe> getRecipeList() {
     }
 
     public int getCurrRecipeNumber() {
+        assert(currRecipeNumber == recipeList.size());
         return currRecipeNumber;
     }
 
@@ -46,4 +47,8 @@ public void removeRecipe(int index) throws RecipeListEmptyError {
         recipeList.remove(index-1);
         currRecipeNumber--;
     }
+    public void clearRecipeList() {
+        recipeList.clear();
+        currRecipeNumber = 0;
+    }
 }

src/main/java/seedu/duke/ui/StringLib.java

@@ -10,7 +10,7 @@ public interface StringLib {
             + "  \\_/\\__,_|___/\\__\\___|  \\___/|_|   \\_|  |_/\\___/|_| |_| |_| |___/  | |  \\_/  \\___/\\_|  |_/| |"
             + "\n"
             + "                                                                     \\_\\                  /_/\n";
-    String WELCOME_MESSAGE = "\nHELLLOO there! I am\n "
+    String WELCOME_MESSAGE = "\nHELLO there! I am\n "
             + LOGO + '\n'
             + "Your personal recipes assistant!\n"
             + "What can I do for you today?\n\n"
@@ -83,6 +83,8 @@ public interface StringLib {
             + "\nException occurred: ";
     String RECIPE_FINDING_DEFAULT_ERROR = "\nError in finding recipe!"
             + "\nException occurred: ";
+    String RECIPE_VIEWING_DEFAULT_ERROR = "\nError in viewing recipe!"
+            + "\nException occurred: ";
     String FORMAT_CONVERT_ERROR = "\nError in inputs!"
             + "\nException occurred: The number is too big to process or the inputs contains words when "
             + "it is supposed to be numbers."
@@ -106,5 +108,5 @@ public interface StringLib {
             + "i/<insert ingredients with \\\", \\\" separation> \"\n"
             + "\"t/<insert cuisine>\\\"\\n\"\n"
             + "\"Example use : \\\"add n/Hotpot i/Beef, Potatoes, Carrots t/Chinese\\\" \\n \\n\"";
-
+    String RECIPE_CLEARED_MESSAGE = "\nAll recipes have been cleared!";
 }