Merge branch 'master' into branch-notes

Author: hengyiqun

src/main/java/seedu/address/commons/core/Messages.java

@@ -10,6 +10,5 @@ public class Messages {
     public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid";
     public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
     public static final String MESSAGE_INVALID_MEETING_DISPLAYED_INDEX = "The meeting index provided is invalid";
-
-
+    public static final String MESSAGE_INVALID_NOTE_DISPLAYED_INDEX = "The note index provided is invalid";
 }

src/main/java/seedu/address/logic/commands/notes/AddNoteCommand.java

@@ -24,7 +24,8 @@ public class AddNoteCommand extends Command {
             + "[" + PREFIX_PRIORITY + "PRIORITY]...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_NAME + "Complete CS2103 Tutorial "
-            + PREFIX_PRIORITY + "5 ";
+            + PREFIX_PRIORITY + "5 \n"
+            + "Default priority is 1";
 
     public static final String MESSAGE_SUCCESS = "New note added: %1$s";
     public static final String MESSAGE_DUPLICATE_NOTE = "This note already exists in the note book";

src/main/java/seedu/address/logic/commands/notes/DeleteNoteCommand.java

@@ -0,0 +1,56 @@
+package seedu.address.logic.commands.notes;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.Command;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.note.Note;
+
+/**
+ * Deletes a note identified using it's displayed index from the note book.
+ */
+public class DeleteNoteCommand extends Command {
+
+    public static final String COMMAND_WORD = "deleten";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Deletes the note identified by the index number used in the displayed note list.\n"
+            + "Parameters: INDEX (must be a positive integer)\n"
+            + "Example: " + COMMAND_WORD + " 1";
+
+    public static final String MESSAGE_DELETE_NOTE_SUCCESS = "Deleted Note: %1$s";
+
+    private final Index targetIndex;
+
+    public DeleteNoteCommand(Index targetIndex) {
+        this.targetIndex = targetIndex;
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        requireNonNull(model);
+        List<Note> lastShownList = model.getFilteredNoteList();
+
+        if (targetIndex.getZeroBased() >= lastShownList.size()) {
+            throw new CommandException(Messages.MESSAGE_INVALID_NOTE_DISPLAYED_INDEX);
+        }
+
+        Note noteToDelete = lastShownList.get(targetIndex.getZeroBased());
+        model.deleteNote(noteToDelete);
+        return new CommandResult(String.format(MESSAGE_DELETE_NOTE_SUCCESS, noteToDelete));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof seedu.address.logic.commands.notes.DeleteNoteCommand // instanceof handles nulls
+                && targetIndex.equals(((seedu.address.logic.commands.notes.DeleteNoteCommand) other).targetIndex)); // state check
+    }
+}
+

src/main/java/seedu/address/logic/parser/MeetBuddyParser.java

@@ -14,6 +14,7 @@
 import seedu.address.logic.commands.ListAllCommand;
 import seedu.address.logic.commands.meetings.*;
 import seedu.address.logic.commands.notes.AddNoteCommand;
+import seedu.address.logic.commands.notes.DeleteNoteCommand;
 import seedu.address.logic.commands.persons.AddPersonCommand;
 import seedu.address.logic.commands.persons.ClearPersonCommand;
 import seedu.address.logic.commands.persons.DeletePersonCommand;
@@ -29,6 +30,7 @@
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.logic.parser.meetings.*;
 import seedu.address.logic.parser.notes.AddNoteCommandParser;
+import seedu.address.logic.parser.notes.DeleteNoteCommandParser;
 import seedu.address.logic.parser.persons.AddPersonCommandParser;
 import seedu.address.logic.parser.persons.DeletePersonCommandParser;
 import seedu.address.logic.parser.persons.EditPersonCommandParser;
@@ -114,6 +116,9 @@ public Command parseCommand(String userInput) throws ParseException {
         case AddNoteCommand.COMMAND_WORD:
             return new AddNoteCommandParser().parse(arguments);
 
+        case DeleteNoteCommand.COMMAND_WORD:
+            return new DeleteNoteCommandParser().parse(arguments);
+
         //======================= Timetable =====================================
 
         case SetTimetableCommand.COMMAND_WORD:

src/main/java/seedu/address/logic/parser/notes/DeleteNoteCommandParser.java

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