Merge pull request #140 from sheexiong/master

Add ListAmount and DeleteItem Command and Parser, adding new UI class to help format the output to CLI.

src/main/java/seedu/eylah/Eylah.java

@@ -1,6 +1,5 @@
 package seedu.eylah;
 
-import java.util.Scanner;
 import java.util.logging.Logger;
 
 import seedu.eylah.commons.core.LogsCenter;
@@ -12,6 +11,7 @@
 import seedu.eylah.diettracker.logic.parser.exceptions.ParseException;
 import seedu.eylah.diettracker.model.Model;
 import seedu.eylah.diettracker.model.ModelManager;
+import seedu.eylah.ui.Ui;
 
 /**
  * The main entry for the EYLAH.
@@ -27,8 +27,11 @@ public class Eylah {
     protected seedu.eylah.expensesplitter.logic.Logic splitterLogic;
     protected seedu.eylah.expensesplitter.model.Model splitterModel;
 
+    private Ui ui;
+
     public Eylah() {
         logger.info("=============================[ Initializing EYLAH ]===========================");
+        ui = new Ui();
     }
 
     /**
@@ -40,17 +43,17 @@ public Eylah() {
      */
     public void run() {
         boolean isExit = false;
-        Scanner scanner = new Scanner(System.in);
+        ui.showWelcome();
         System.out.println("Enter mode (diet/splitting): ");
-        String input = scanner.nextLine();
+        String input = ui.readCommand();
         if (input.equals("diet")) {
             // Diet mode
             logger.info("Entering Diet MODE.");
             dietModel = new ModelManager();
             dietLogic = new LogicManager(dietModel, null);
             while (!isExit) {
                 System.out.println("Enter Diet Command: ");
-                input = scanner.nextLine();
+                input = ui.readCommand();
                 try {
                     CommandResult commandResult = dietLogic.execute(input);
                     // Here will print out the respond to user
@@ -67,7 +70,7 @@ public void run() {
             splitterLogic = new seedu.eylah.expensesplitter.logic.LogicManager(splitterModel, null);
             while (!isExit) {
                 System.out.println("Enter Splitting Command: ");
-                input = scanner.nextLine();
+                input = ui.readCommand();
                 try {
                     seedu.eylah.expensesplitter.logic.commands.CommandResult commandResult =
                             splitterLogic.execute(input);

src/main/java/seedu/eylah/expensesplitter/logic/commands/AddItemCommand.java

@@ -45,7 +45,6 @@ public AddItemCommand(Item item, ArrayList<Person> persons) {
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
-
         model.addEntry(toBeAdded);
         return new CommandResult(String.format(MESSAGE_SUCCESS, toBeAdded));
     }

src/main/java/seedu/eylah/expensesplitter/logic/commands/DeleteItemCommand.java

@@ -1,7 +1,42 @@
 package seedu.eylah.expensesplitter.logic.commands;
 
+import static java.util.Objects.requireNonNull;
+
+import seedu.eylah.commons.core.index.Index;
+import seedu.eylah.expensesplitter.logic.commands.exceptions.CommandException;
+import seedu.eylah.expensesplitter.model.Model;
+
 /**
- * Delete item from the receipt.
+ * Deletes an item from the list of available items.
  */
-public class DeleteItemCommand {
+public class DeleteItemCommand extends Command {
+
+    public static final String COMMAND_WORD = "deleteItem";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Deletes the item identified by the index number used in the displayed item list.\n"
+            + "Parameters: INDEX (must be a positive integer)\n"
+            + "Example: " + COMMAND_WORD + " 1";
+
+    public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Person: %1$s";
+
+    private final Index targetIndex;
+
+    public DeleteItemCommand(Index targetIndex) {
+        this.targetIndex = targetIndex;
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        requireNonNull(model);
+        model.deleteEntry(targetIndex.getZeroBased());
+        return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, targetIndex.getOneBased()));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof DeleteItemCommand // instanceof handles nulls
+                && targetIndex.equals(((DeleteItemCommand) other).targetIndex)); // state check
+    }
 }

src/main/java/seedu/eylah/expensesplitter/logic/commands/ListAmountCommand.java

@@ -0,0 +1,23 @@
+package seedu.eylah.expensesplitter.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import seedu.eylah.expensesplitter.model.Model;
+
+/**
+ * Lists all users with their amount.
+ */
+public class ListAmountCommand extends Command {
+
+    public static final String COMMAND_WORD = "listamount";
+
+    public static final String MESSAGE_SUCCESS = "Listed all person with their amount.";
+
+    @Override
+    public CommandResult execute(Model model) {
+        requireNonNull(model);
+        model.listAmount();
+        return new CommandResult(MESSAGE_SUCCESS);
+    }
+
+}

src/main/java/seedu/eylah/expensesplitter/logic/parser/DeleteItemCommandParser.java

@@ -0,0 +1,28 @@
+package seedu.eylah.expensesplitter.logic.parser;
+
+import static seedu.eylah.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import seedu.eylah.commons.core.index.Index;
+import seedu.eylah.expensesplitter.logic.commands.DeleteItemCommand;
+import seedu.eylah.expensesplitter.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new DeleteItemCommand object
+ */
+public class DeleteItemCommandParser implements Parser<DeleteItemCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the DeleteCommand
+     * and returns a DeleteCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public DeleteItemCommand parse(String args) throws ParseException {
+        try {
+            Index index = ParserUtil.parseIndex(args);
+            return new DeleteItemCommand(index);
+        } catch (ParseException pe) {
+            throw new ParseException(
+                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteItemCommand.MESSAGE_USAGE), pe);
+        }
+    }
+}

src/main/java/seedu/eylah/expensesplitter/logic/parser/ListAmountCommandParser.java

@@ -0,0 +1,29 @@
+package seedu.eylah.expensesplitter.logic.parser;
+
+import static seedu.eylah.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import seedu.eylah.expensesplitter.logic.commands.ListAmountCommand;
+import seedu.eylah.expensesplitter.logic.commands.ListReceiptCommand;
+import seedu.eylah.expensesplitter.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new ListAmountCommand object.
+ */
+public class ListAmountCommandParser implements Parser<ListAmountCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the ListReceiptCommand
+     * and returns an ListReceiptCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    @Override
+    public ListAmountCommand parse(String args) throws ParseException {
+
+        if (args.equals("listamount")) {
+            return new ListAmountCommand();
+        } else {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, ListReceiptCommand.MESSAGE_USAGE));
+        }
+
+    }
+}

src/main/java/seedu/eylah/expensesplitter/model/Model.java

@@ -21,8 +21,17 @@ public interface Model {
      */
     void deleteEntry(int index);
 
+    /**
+     * Updates the amount the Person owes you. If amount is $0 then the Person is deleted.
+     *
+     * @param p the person to pay
+     */
     void paidPerson(Person p);
 
+    /**
+     * Command for listing all person with their amount.
+     */
+    void listAmount();
 
     /**
      * Command for listing all items in that receipt.

src/main/java/seedu/eylah/expensesplitter/model/ModelManager.java

@@ -5,9 +5,6 @@
 import seedu.eylah.commons.core.LogsCenter;
 import seedu.eylah.expensesplitter.model.person.Person;
 
-//import static java.util.Objects.requireNonNull;
-//import static seedu.eylah.commons.util.CollectionUtil.requireAllNonNull;
-
 /**
  * Represents the in-memory model of the address book data.
  */
@@ -64,6 +61,18 @@ public void listReceipt() {
 
     }
 
+    /**
+     * Command for listing all person with their amount.
+     */
+    @Override
+    public void listAmount() {
+
+    }
+
+    /**
+     * Intentionally left empty.
+     * To be implemented later.
+     */
     @Override
     public void paidPerson(Person p) {
 

src/main/java/seedu/eylah/ui/Ui.java

@@ -1,8 +1,39 @@
 package seedu.eylah.ui;
 
+import java.util.Scanner;
+
 /**
  * Main CLI Ui component for the application.
  */
 public class Ui {
 
+    private static final String WELCOME_MESSAGE = "Welcome to EYLAH, this is a debug version of interface :)";
+    private static final String USAGE = "To use the application, enter `diet` or "
+            + "`splitter` to enter the different mode.";
+    private static final String LS = System.lineSeparator();
+
+    private Scanner scanner;
+
+    public Ui() {
+        scanner = new Scanner(System.in);
+    }
+
+    private void showToUser(String... message) {
+        for (String m : message) {
+            System.out.println(m.replace("\n", LS));
+        }
+    }
+
+    public String readCommand() {
+        return scanner.nextLine();
+    }
+
+    public void showWelcome() {
+        showToUser(WELCOME_MESSAGE, USAGE);
+    }
+
+    public static String formatListAmount() {
+        return "";
+    }
+
 }