Merge pull request #80 from Khaleelur-Rahman/branch-delete-event

Add delete event feature

Author: rionshocker

src/main/java/seedu/address/logic/commands/CommandResult.java

@@ -6,6 +6,8 @@
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.commands.event.ViewEventsCommand;
+import seedu.address.logic.commands.person.ListCommand;
+import seedu.address.logic.commands.tag.ViewTagsCommand;
 import seedu.address.model.event.Event;
 
 /**

src/main/java/seedu/address/logic/commands/event/DeleteEventCommand.java

@@ -0,0 +1,65 @@
+package seedu.address.logic.commands.event;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.Messages;
+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.event.Event;
+
+/**
+ * Deletes an event from the event list.
+ */
+public class DeleteEventCommand extends Command {
+    public static final String COMMAND_WORD = "delete_event";
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Deletes the event identified by the index number used in the displayed events list.\n"
+            + "Parameters: INDEX (must be a positive integer)\n"
+            + "Example: " + COMMAND_WORD + " 1";
+
+    public static final String MESSAGE_DELETE_EVENT_SUCCESS = "Deleted Event: %1$s";
+    private final Index targetIndex;
+    public DeleteEventCommand(Index targetIndex) {
+        this.targetIndex = targetIndex;
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        requireNonNull(model);
+        List<Event> lastShownList = model.getFilteredEventList();
+        if (targetIndex.getZeroBased() >= lastShownList.size()) {
+            throw new CommandException(Messages.MESSAGE_INVALID_EVENT_DISPLAYED_INDEX);
+        }
+        Event eventToDelete = lastShownList.get(targetIndex.getZeroBased());
+        model.deleteEvent(eventToDelete);
+        return new CommandResult(String.format(MESSAGE_DELETE_EVENT_SUCCESS, Messages.format(eventToDelete)));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof DeleteEventCommand)) {
+            return false;
+        }
+
+        DeleteEventCommand otherDeleteCommand = (DeleteEventCommand) other;
+        return targetIndex.equals(otherDeleteCommand.targetIndex);
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .add("targetIndex", targetIndex)
+                .toString();
+    }
+}

…/address/logic/commands/LinkCommand.java …ss/logic/commands/event/LinkCommand.javasrc/main/java/seedu/address/logic/commands/LinkCommand.java renamed to src/main/java/seedu/address/logic/commands/event/LinkCommand.java src/main/java/seedu/address/logic/commands/LinkCommand.java renamed to src/main/java/seedu/address/logic/commands/event/LinkCommand.java

@@ -1,10 +1,12 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.event;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_CONTACT;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EVENT;
 
 import seedu.address.commons.util.ToStringBuilder;
+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.event.Event;

…u/address/logic/commands/AddCommand.java …ss/logic/commands/person/AddCommand.javasrc/main/java/seedu/address/logic/commands/AddCommand.java renamed to src/main/java/seedu/address/logic/commands/person/AddCommand.java src/main/java/seedu/address/logic/commands/AddCommand.java renamed to src/main/java/seedu/address/logic/commands/person/AddCommand.java

@@ -1,4 +1,4 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.person;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
@@ -9,6 +9,8 @@
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+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.person.Person;

…ddress/logic/commands/DeleteCommand.java …logic/commands/person/DeleteCommand.javasrc/main/java/seedu/address/logic/commands/DeleteCommand.java renamed to src/main/java/seedu/address/logic/commands/person/DeleteCommand.java src/main/java/seedu/address/logic/commands/DeleteCommand.java renamed to src/main/java/seedu/address/logic/commands/person/DeleteCommand.java

@@ -1,4 +1,4 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.person;
 
 import static java.util.Objects.requireNonNull;
 
@@ -7,6 +7,8 @@
 import seedu.address.commons.core.index.Index;
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+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.person.Person;

…/address/logic/commands/EditCommand.java …s/logic/commands/person/EditCommand.javasrc/main/java/seedu/address/logic/commands/EditCommand.java renamed to src/main/java/seedu/address/logic/commands/person/EditCommand.java src/main/java/seedu/address/logic/commands/EditCommand.java renamed to src/main/java/seedu/address/logic/commands/person/EditCommand.java

@@ -1,4 +1,4 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.person;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
@@ -19,6 +19,8 @@
 import seedu.address.commons.util.CollectionUtil;
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+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.person.Address;

…/address/logic/commands/FindCommand.java …s/logic/commands/person/FindCommand.javasrc/main/java/seedu/address/logic/commands/FindCommand.java renamed to src/main/java/seedu/address/logic/commands/person/FindCommand.java src/main/java/seedu/address/logic/commands/FindCommand.java renamed to src/main/java/seedu/address/logic/commands/person/FindCommand.java

@@ -1,9 +1,11 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.person;
 
 import static java.util.Objects.requireNonNull;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.Command;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.model.Model;
 import seedu.address.model.person.NameContainsKeywordsPredicate;
 

…/address/logic/commands/ListCommand.java …s/logic/commands/person/ListCommand.javasrc/main/java/seedu/address/logic/commands/ListCommand.java renamed to src/main/java/seedu/address/logic/commands/person/ListCommand.java src/main/java/seedu/address/logic/commands/ListCommand.java renamed to src/main/java/seedu/address/logic/commands/person/ListCommand.java

@@ -1,8 +1,10 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.person;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
 
+import seedu.address.logic.commands.Command;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.model.Model;
 
 /**

…ddress/logic/commands/AddTagCommand.java …ss/logic/commands/tag/AddTagCommand.javasrc/main/java/seedu/address/logic/commands/AddTagCommand.java renamed to src/main/java/seedu/address/logic/commands/tag/AddTagCommand.java src/main/java/seedu/address/logic/commands/AddTagCommand.java renamed to src/main/java/seedu/address/logic/commands/tag/AddTagCommand.java

@@ -1,9 +1,11 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.tag;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
 import seedu.address.commons.util.ToStringBuilder;
+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.tag.Tag;

…ess/logic/commands/DeleteTagCommand.java …logic/commands/tag/DeleteTagCommand.javasrc/main/java/seedu/address/logic/commands/DeleteTagCommand.java renamed to src/main/java/seedu/address/logic/commands/tag/DeleteTagCommand.java src/main/java/seedu/address/logic/commands/DeleteTagCommand.java renamed to src/main/java/seedu/address/logic/commands/tag/DeleteTagCommand.java

@@ -1,9 +1,11 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.tag;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
 import seedu.address.commons.util.ToStringBuilder;
+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.tag.Tag;